From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 26CC83858D20; Tue, 20 Feb 2024 15:03:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26CC83858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708441405; bh=Jeu/MAk+A6wDGFhNV46TlLyaGgJheFnslFgLHAAkVVM=; h=From:To:Subject:Date:From; b=x+0Wnah+WRZfBrBqrBfKn0zlXJaLlnYQ+PurmttYRBZOnwCF+VEGidwnybRhBNGjO i8XvmUvZORbItnKeXw3uTCZpBCnnYQfO480sL7sRLDpVcndbcE9kN1lNKkz2ZCBfAH 1dX86bXbY8mlfi7eXT2jnSaPQsF5b7piHCy/Lwvg= 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 r14-9084] aarch64: Allow aarch64-linux-muscl for heap trampolines [PR113971]. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/master X-Git-Oldrev: 4238100cdd5f5eba10e71adbf60054d29a9a4480 X-Git-Newrev: 61ab046a3277c256867f596e73ce5b5ee9041a9d Message-Id: <20240220150325.26CC83858D20@sourceware.org> Date: Tue, 20 Feb 2024 15:03:25 +0000 (GMT) List-Id: https://gcc.gnu.org/g:61ab046a3277c256867f596e73ce5b5ee9041a9d commit r14-9084-g61ab046a3277c256867f596e73ce5b5ee9041a9d Author: Iain Sandoe Date: Sun Feb 18 06:49:26 2024 +0000 aarch64: Allow aarch64-linux-muscl for heap trampolines [PR113971]. This allows the same trampoline pattern to be used on all linux variants rather than restricting it to linux gnu. PR target/113971 libgcc/ChangeLog: * config/aarch64/heap-trampoline.c: Allow all linux variants. Signed-off-by: Iain Sandoe Diff: --- libgcc/config/aarch64/heap-trampoline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libgcc/config/aarch64/heap-trampoline.c b/libgcc/config/aarch64/heap-trampoline.c index 9d5b19983b1e..1e3460b1601d 100644 --- a/libgcc/config/aarch64/heap-trampoline.c +++ b/libgcc/config/aarch64/heap-trampoline.c @@ -29,7 +29,7 @@ void *allocate_trampoline_page (void); void __gcc_nested_func_ptr_created (void *chain, void *func, void *dst); void __gcc_nested_func_ptr_deleted (void); -#if defined(__gnu_linux__) +#if defined(__linux__) static const uint32_t aarch64_trampoline_insns[] = { 0xd503245f, /* hint 34 */ 0x580000b1, /* ldr x17, .+20 */ @@ -82,7 +82,7 @@ allocate_trampoline_page (void) { void *page; -#if defined(__gnu_linux__) +#if defined(__linux__) page = mmap (0, getpagesize (), PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, 0, 0); #elif __APPLE__