IBM made changes to no longer require 2 versions of libstdc++, so this
patch changes things back to the previous (compatible) way.
Also, TPF debuggers don't support discriminators, despite what GAS
supports, so disable them.
Ok?
* config/s390/tpf.h (LIBSTDCXX): Change to CPP1.
(LIB_SPEC): Add.
(SUPPORTS_DISCRIMINATOR): Define.
Index: config/s390/tpf.h
===================================================================
--- config/s390/tpf.h (revision 224174)
+++ config/s390/tpf.h (working copy)
@@ -91,12 +91,16 @@ along with GCC; see the file COPYING3.
#define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
#undef ASM_SPEC
#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}"
/* All linking is done shared on TPF-OS. */
/* FIXME: When binutils patch for new emulation is committed
then change emulation to elf64_s390_tpf. */
@@ -107,12 +111,15 @@ along with GCC; see the file COPYING3.
%{shared: -shared} \
%{!shared:-shared} \
%(entry_spec)"
/* 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 */
