From ff0a1818526460fe71f612f26b231b15e80f746a Mon Sep 17 00:00:00 2001 From: KJ Tsanaktsidis Date: Mon, 19 Aug 2024 16:21:28 +1000 Subject: [PATCH] Fix typo in ELF note generation This wasn't looking at the right macro name for pac-ret support, so if Ruby was compiled with pac-ret but NOT BTI, then the ELF note would not be emitted. --- coroutine/arm64/Context.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coroutine/arm64/Context.S b/coroutine/arm64/Context.S index 41146e80f5..5101c3f75e 100644 --- a/coroutine/arm64/Context.S +++ b/coroutine/arm64/Context.S @@ -89,7 +89,7 @@ PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer): .section .note.GNU-stack,"",%progbits #endif -#if (defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT != 0) || (defined(____ARM_FEATURE_PAC_DEFAULT) && __ARM_FEATURE_PAC_DEFAULT != 0) +#if (defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT != 0) || (defined(__ARM_FEATURE_PAC_DEFAULT) && __ARM_FEATURE_PAC_DEFAULT != 0) /* See "ELF for the Arm 64-bit Architecture (AArch64)" https://github.com/ARM-software/abi-aa/blob/2023Q3/aaelf64/aaelf64.rst#program-property */ # define GNU_PROPERTY_AARCH64_FEATURE_1_BTI (1<<0)