From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2119) id 8B4FC385840C; Sat, 29 Jan 2022 04:39:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B4FC385840C Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jeff Law To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Finish this commit by prefixing HAVE_INITFINI_ARRAY and HAVE_INIT_FINI references in libgloss in the X-Act-Checkin: newlib-cygwin X-Git-Author: Jeff Law X-Git-Refname: refs/heads/master X-Git-Oldrev: 7a4bef590b37683b08ebaee384d0694b9afccc57 X-Git-Newrev: 063d67faf0266e5ba169bc5cfde8aed011b1d41b Message-Id: <20220129043920.8B4FC385840C@sourceware.org> Date: Sat, 29 Jan 2022 04:39:20 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jan 2022 04:39:20 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D063d67faf02= 66e5ba169bc5cfde8aed011b1d41b commit 063d67faf0266e5ba169bc5cfde8aed011b1d41b Author: Jeff Law Date: Fri Jan 28 21:26:18 2022 -0700 Finish this commit by prefixing HAVE_INITFINI_ARRAY and HAVE_INIT_FINI = references in libgloss in the same way. =20 Author: Mike Frysinger Date: Mon Jan 17 22:20:20 2022 -0500 =20 newlib: internalize HAVE_INITFINI_ARRAY =20 This define is only used by newlib internally, so stop exporting it as HAVE_INITFINI_ARRAY since this can conflict with defines packages use themselves. =20 We don't really need to add _ to HAVE_INIT_FINI too since it isn't exported in newlib.h, but might as well be consistent here. =20 We can't (easily) add this to newlib_cflags like HAVE_INIT_FINI is because this is based on a compile-time test in the top configure, not on plain shell code in configure.host. We'd have to replicate the test in every subdir in order to have it passed down. Diff: --- libgloss/aarch64/crt0.S | 4 ++-- libgloss/arm/crt0.S | 2 +- libgloss/cris/crt0.S | 2 +- libgloss/cris/lcrt0.c | 2 +- libgloss/or1k/crt0.S | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libgloss/aarch64/crt0.S b/libgloss/aarch64/crt0.S index f831be12e..78c5263dc 100644 --- a/libgloss/aarch64/crt0.S +++ b/libgloss/aarch64/crt0.S @@ -36,7 +36,7 @@ #error __USER_LABEL_PREFIX is not defined #endif =20 -#ifdef HAVE_INITFINI_ARRAY +#ifdef _HAVE_INITFINI_ARRAY #define _init __libc_init_array #define _fini __libc_fini_array #endif @@ -309,4 +309,4 @@ CommandLine: .space 256,0 /* Maximum length of 255 cha= rs handled. */ AngelSVCArgs: GEN_DWORD CommandLine .dword 255 -#endif \ No newline at end of file +#endif diff --git a/libgloss/arm/crt0.S b/libgloss/arm/crt0.S index 8490bde2f..78515180b 100644 --- a/libgloss/arm/crt0.S +++ b/libgloss/arm/crt0.S @@ -12,7 +12,7 @@ #error __USER_LABEL_PREFIX is not defined #endif =20 -#ifdef HAVE_INITFINI_ARRAY +#ifdef _HAVE_INITFINI_ARRAY #define _init __libc_init_array #define _fini __libc_fini_array #endif diff --git a/libgloss/cris/crt0.S b/libgloss/cris/crt0.S index 30419887e..6edaabf45 100644 --- a/libgloss/cris/crt0.S +++ b/libgloss/cris/crt0.S @@ -36,7 +36,7 @@ #define L(x) _ ## x #endif =20 -#ifdef HAVE_INITFINI_ARRAY +#ifdef _HAVE_INITFINI_ARRAY #define _init __libc_init_array #define _fini __libc_fini_array #endif diff --git a/libgloss/cris/lcrt0.c b/libgloss/cris/lcrt0.c index 8b8cc0bb0..48489edd3 100644 --- a/libgloss/cris/lcrt0.c +++ b/libgloss/cris/lcrt0.c @@ -29,7 +29,7 @@ #include "linunistd.h" #include "newlib.h" =20 -#ifdef HAVE_INITFINI_ARRAY +#ifdef _HAVE_INITFINI_ARRAY #define _init __libc_init_array #define _fini __libc_fini_array #endif diff --git a/libgloss/or1k/crt0.S b/libgloss/or1k/crt0.S index 03d732355..74a040981 100644 --- a/libgloss/or1k/crt0.S +++ b/libgloss/or1k/crt0.S @@ -97,7 +97,7 @@ _or1k_exception_stack_size: .word EXCEPTION_STACK_SIZE = */ /* -----------------------------------------------------------------------= --- */ =20 -#ifdef HAVE_INITFINI_ARRAY +#ifdef _HAVE_INITFINI_ARRAY #define _init __libc_init_array #define _fini __libc_fini_array #endif