From 754f54aa01975a8e2fa4e38850f90dcda7dd02ec Mon Sep 17 00:00:00 2001 From: Robin Dapp Date: Tue, 26 Nov 2019 09:00:26 +0000 Subject: [PATCH] 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 * config/s390/linux.h: Add undef for MUSL_DYNAMIC_LINKERxx. From-SVN: r278721 --- gcc/ChangeLog | 4 ++++ gcc/config/s390/linux.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 633836f..a3e7575 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2019-11-26 Robin Dapp + + * config/s390/linux.h: Add undef for MUSL_DYNAMIC_LINKERxx. + 2019-11-26 Jakub Jelinek PR tree-optimization/92644 diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h index 5f6b704..b7d4405 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 -- 2.7.4