From f57bc8a6d6a21219409c2142bdd208cc50a73f53 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Fri, 3 Jul 2020 14:09:25 +0100 Subject: [PATCH] aarch64: Fix noexecstack note in libitm sjlj.S only had the note on Linux, but it is supposed to have it on FreeBSD too. 2020-07-09 Szabolcs Nagy libitm/ChangeLog: * config/aarch64/sjlj.S: Add stack note if __FreeBSD__ is defined. (cherry picked from commit 463ba375f7b857995068403a4c63690d03162c00) --- libitm/config/aarch64/sjlj.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libitm/config/aarch64/sjlj.S b/libitm/config/aarch64/sjlj.S index 27626c1f3780..5b97b973e27c 100644 --- a/libitm/config/aarch64/sjlj.S +++ b/libitm/config/aarch64/sjlj.S @@ -87,6 +87,6 @@ GTM_longjmp: cfi_endproc .size GTM_longjmp, . - GTM_longjmp -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD__) .section .note.GNU-stack, "", %progbits #endif -- 2.47.2