From: dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 1 Jul 2015 20:18:59 +0000 (+0000)
Subject: * config/s390/tpf.h (LIBSTDCXX): Change to CPP1.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=471788790907d4d1a3bcc0ba9b776a046d92e296;p=thirdparty%2Fgcc.git

* config/s390/tpf.h (LIBSTDCXX): Change to CPP1.
(LIB_SPEC): Add.
(SUPPORTS_DISCRIMINATOR): Define.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225278 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75df9c0dd063..690c2cb3d3cb 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 332fe76b82d6..b1ec9bdeab3d 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 */