From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 51BF03858D3C; Thu, 14 Apr 2022 05:24:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 51BF03858D3C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain D Sandoe To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-9864] libgcc, X86: Adjust guard for Mach-O code. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 3bf66ed6a51b1938b6974c473d2c39ebf7a1ac00 X-Git-Newrev: 70006868631198fe234d9e9724ccc607f818a7b1 Message-Id: <20220414052412.51BF03858D3C@sourceware.org> Date: Thu, 14 Apr 2022 05:24:12 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2022 05:24:12 -0000 https://gcc.gnu.org/g:70006868631198fe234d9e9724ccc607f818a7b1 commit r11-9864-g70006868631198fe234d9e9724ccc607f818a7b1 Author: Iain Sandoe Date: Wed Sep 22 07:42:21 2021 +0100 libgcc, X86: Adjust guard for Mach-O code. Existing code in the sfp-machine header has been using __MACH__ as a guard for Mach-O, where currently symbols aliases are not supported. __MACH__ is not a sufficient guard for this, since the define is also emitted for HURD, at least. Fixed by amending the guard to use __APPLE__ instead. Signed-off-by: Iain Sandoe libgcc/ChangeLog: * config/i386/sfp-machine.h: Guard Mach-O-specific code using __APPLE__. (cherry picked from commit 578b76873383784841f5478573f4ac5d251aa0ba) Diff: --- libgcc/config/i386/sfp-machine.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgcc/config/i386/sfp-machine.h b/libgcc/config/i386/sfp-machine.h index 478e61c5a27..fca7dddf616 100644 --- a/libgcc/config/i386/sfp-machine.h +++ b/libgcc/config/i386/sfp-machine.h @@ -73,7 +73,7 @@ void __sfp_handle_exceptions (int); #define __BYTE_ORDER __LITTLE_ENDIAN /* Define ALIASNAME as a strong alias for NAME. */ -#if defined __MACH__ +#if defined __APPLE__ /* Mach-O doesn't support aliasing, so we build a secondary function for the alias - we need to do a bit of a dance to find out what the type of the arguments is and then apply that to the secondary function.