aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2015-07-01 16:18:59 -0400
committerDJ Delorie <dj@gcc.gnu.org>2015-07-01 16:18:59 -0400
commitb8a4094af19c053669a46780235464c894a72df9 (patch)
treed5f647e91d203d2937ed88e2659ae329034ebbba
parent36a85135b746a41cebcd738193c3e238f5d0399e (diff)
downloadgcc-b8a4094af19c053669a46780235464c894a72df9.zip
gcc-b8a4094af19c053669a46780235464c894a72df9.tar.gz
gcc-b8a4094af19c053669a46780235464c894a72df9.tar.bz2
tpf.h (LIBSTDCXX): Change to CPP1.
* config/s390/tpf.h (LIBSTDCXX): Change to CPP1. (LIB_SPEC): Add. (SUPPORTS_DISCRIMINATOR): Define. From-SVN: r225278
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/s390/tpf.h9
2 files changed, 14 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75df9c0..690c2cb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-01 DJ Delorie <dj@redhat.com>
+
+ * config/s390/tpf.h (LIBSTDCXX): Change to CPP1.
+ (LIB_SPEC): Add.
+ (SUPPORTS_DISCRIMINATOR): Define.
+
2015-07-01 Richard Sandiford <richard.sandiford@arm.com>
PR bootstrap/66685
diff --git a/gcc/config/s390/tpf.h b/gcc/config/s390/tpf.h
index 332fe76..b1ec9bd 100644
--- a/gcc/config/s390/tpf.h
+++ b/gcc/config/s390/tpf.h
@@ -94,6 +94,10 @@ along with GCC; see the file COPYING3. If not see
#define ASM_SPEC "%{m31&m64}%{mesa&mzarch}%{march=*} \
-alshd=%b.lst"
+#undef LIB_SPEC
+#define LIB_SPEC "-lCTIS -lCISO -lCLBM -lCTAL -lCFVS -lCTBX -lCTXO \
+ -lCJ00 -lCTDF -lCOMX -lCOMS -lCTHD -lCTAD -lTPFSTUB"
+
#define ENTRY_SPEC "%{mmain:-entry=_start} \
%{!mmain:-entry=0}"
@@ -110,9 +114,12 @@ along with GCC; see the file COPYING3. If not see
/* IBM copies these libraries over with these names. */
#define MATH_LIBRARY "CLBM"
-#define LIBSTDCXX "CPP2"
+#define LIBSTDCXX "CPP1"
#undef TARGET_LIBC_HAS_FUNCTION
#define TARGET_LIBC_HAS_FUNCTION gnu_libc_has_function
+/* GAS supports it, but the debuggers don't, so avoid it. */
+#define SUPPORTS_DISCRIMINATOR 0
+
#endif /* ! _TPF_H */