From b8a4094af19c053669a46780235464c894a72df9 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 1 Jul 2015 16:18:59 -0400 Subject: [PATCH] tpf.h (LIBSTDCXX): Change to CPP1. * config/s390/tpf.h (LIBSTDCXX): Change to CPP1. (LIB_SPEC): Add. (SUPPORTS_DISCRIMINATOR): Define. From-SVN: r225278 --- gcc/ChangeLog | 6 ++++++ gcc/config/s390/tpf.h | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 75df9c0dd06..690c2cb3d3c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-07-01 DJ Delorie + + * config/s390/tpf.h (LIBSTDCXX): Change to CPP1. + (LIB_SPEC): Add. + (SUPPORTS_DISCRIMINATOR): Define. + 2015-07-01 Richard Sandiford PR bootstrap/66685 diff --git a/gcc/config/s390/tpf.h b/gcc/config/s390/tpf.h index 332fe76b82d..b1ec9bdeab3 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 */ -- 2.30.2