[5.9] [AArch64][MachO] Support ptrauth ABI version. #7055
Merged
+865
−20
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This introduces additional meaning to some of the high bits in the mach-o header "flags" byte of the cpusubtype field. Quoting: // arm64 reserves bits in the high byte for subtype-specific flags. // On arm64e, the 6 low bits represent the ptrauth ABI version. CPU_SUBTYPE_ARM64E_PTRAUTH_MASK = 0x3f000000, // On arm64e, the top bit tells whether the Mach-O is versioned. CPU_SUBTYPE_ARM64E_VERSIONED_PTRAUTH_ABI_MASK = 0x80000000, // On arm64e, the 2nd high bit tells whether the Mach-O is using kernel ABI. CPU_SUBTYPE_ARM64E_KERNEL_PTRAUTH_ABI_MASK = 0x40000000 rdar://110506296 (cherry picked from commit 49328b6)
|
@swift-ci test |
ahmedbougacha
deleted the
eng/abougacha/arm64e-ptrauth-abi-version-swift5.9
branch
NuriAmari
reviewed
Jul 11, 2023
| @@ -0,0 +1,16 @@ | |||
| // Check the ABI version support. | |||
|
|
|||
| // RUN: %clang -fptrauth-abi-version=5 -arch arm64e -c %s -### 2>&1 | FileCheck %s --check-prefix ABIVERSION --check-prefix NOKERNELABIVERSION | |||
There was a problem hiding this comment.
@ahmedbougacha This test and the defaults version above are failing on Linux:
warning: argument unused during compilation: '-fptrauth-abi-version=5' [-Wunused-command-line-argument]
warning: argument unused during compilation: '-arch arm64e' [-Wunused-command-line-argument]
The -arch flag seems to be Darwin specific: https://github.com/apple/llvm-project/blob/next/clang/docs/CommandGuide/clang.rst, and at a glance the new ptrauth ABI related flags are also only used on Darwin.
Can we gate these tests behind a REQUIRES: system-darwin or otherwise fix them?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This introduces additional meaning to some of the high bits in the mach-o header "flags" byte of the cpusubtype field. Quoting:
// arm64 reserves bits in the high byte for subtype-specific flags.
// On arm64e, the 6 low bits represent the ptrauth ABI version.
CPU_SUBTYPE_ARM64E_PTRAUTH_MASK = 0x3f000000,
// On arm64e, the top bit tells whether the Mach-O is versioned.
CPU_SUBTYPE_ARM64E_VERSIONED_PTRAUTH_ABI_MASK = 0x80000000,
// On arm64e, the 2nd high bit tells whether the Mach-O is using kernel ABI.
CPU_SUBTYPE_ARM64E_KERNEL_PTRAUTH_ABI_MASK = 0x40000000
rdar://110506296
(cherry picked from commit 49328b6)