S/390: Add undef for MUSL_DYNAMIC_LINKERxx

This fixes the s390 bootstrap by undefining existing defines before
redefining them.

gcc/ChangeLog:

2019-11-26  Robin Dapp  <rdapp@linux.ibm.com>

  * config/s390/linux.h: Add undef for MUSL_DYNAMIC_LINKERxx.

From-SVN: r278721

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 633836f410d397d6bd63cafe82a300870f6e54eb..a3e757502bdb460b100ee889020f40c427c16ca4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-11-26  Robin Dapp  <rdapp@linux.ibm.com>
+
+       * config/s390/linux.h: Add undef for MUSL_DYNAMIC_LINKERxx.
+
 2019-11-26  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/92644

diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
index 5f6b7041f0f5824f05267326141a7852ab40d2c8..b7d440543f7d4bb428414dd1e1211dc6546481cb 100644 (file)
--- a/gcc/config/s390/linux.h
+++ b/gcc/config/s390/linux.h
@@ -75,7 +75,9 @@ along with GCC; see the file COPYING3.  If not see
 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
 
+#undef MUSL_DYNAMIC_LINKER32
 #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390.so.1"
+#undef MUSL_DYNAMIC_LINKER64
 #define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1"
 
 #undef  LINK_SPEC