aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Dapp <rdapp@linux.ibm.com>2019-11-26 09:00:26 +0000
committerRobin Dapp <rdapp@linux.ibm.com>2019-11-26 09:00:26 +0000
commit2b5a1a3baf3c4ddb071a078f0ce354b0dde479d9 (patch)
tree7887995c086a05909ad56d8fac890355f837d387
parente5bbd596fd0f392c434bf31603e163b6f6072ddc (diff)
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. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@278721 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/config/s390/linux.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 633836f410d..a3e757502bd 100644
--- 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 5f6b7041f0f..b7d440543f7 100644
--- 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