S/390: Add undef for MUSL_DYNAMIC_LINKERxx

Message ID 47f9c717-94c7-6015-8707-aa41c300e378@linux.ibm.com
State New
Headers show
Series
  • S/390: Add undef for MUSL_DYNAMIC_LINKERxx
Related show

Commit Message

Robin Dapp Nov. 26, 2019, 9:01 a.m.
Hi,

I committed this patch (obvious). It fixes the s390 bootstrap by
undefining existing defines before redefining them.

Regards
 Robin

--

gcc/ChangeLog:

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

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

Comments

Szabolcs Nagy Nov. 26, 2019, 10:22 a.m. | #1
On 26/11/2019 09:01, Robin Dapp wrote:
> I committed this patch (obvious). It fixes the s390 bootstrap by

> undefining existing defines before redefining them.


thanks.
sorry for the trouble.

Patch

commit aa2879c029af2ae70067df23bc68081f62abb139
Author: Robin Dapp <rdapp@linux.ibm.com>
Date:   Mon Nov 25 12:26:18 2019 +0100

    S/390: Add undef before definition of MUSL_DYNAMIC_LINKER.
    
    Fix bootstrap by not defining symbols twice.

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