Skip to content

Commit 3f6eb13

Browse files
authored
[PAC][clang] Enable -fptrauth-indirect-gotos as part of pauthtest ABI (#100480)
1 parent b795686 commit 3f6eb13

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,6 +1512,10 @@ static void handlePAuthABI(const ArgList &DriverArgs, ArgStringList &CC1Args) {
15121512
options::OPT_fno_ptrauth_vtable_pointer_type_discrimination))
15131513
CC1Args.push_back("-fptrauth-vtable-pointer-type-discrimination");
15141514

1515+
if (!DriverArgs.hasArg(options::OPT_fptrauth_indirect_gotos,
1516+
options::OPT_fno_ptrauth_indirect_gotos))
1517+
CC1Args.push_back("-fptrauth-indirect-gotos");
1518+
15151519
if (!DriverArgs.hasArg(options::OPT_fptrauth_init_fini,
15161520
options::OPT_fno_ptrauth_init_fini))
15171521
CC1Args.push_back("-fptrauth-init-fini");

clang/test/Driver/aarch64-ptrauth.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
// RUN: %clang -### -c --target=aarch64-linux-pauthtest %s 2>&1 | FileCheck %s --check-prefix=PAUTHABI1
2222
// PAUTHABI1: "-cc1"{{.*}} "-triple" "aarch64-unknown-linux-pauthtest"
2323
// PAUTHABI1-SAME: "-target-abi" "pauthtest"
24-
// PAUTHABI1-SAME: "-fptrauth-intrinsics" "-fptrauth-calls" "-fptrauth-returns" "-fptrauth-auth-traps" "-fptrauth-vtable-pointer-address-discrimination" "-fptrauth-vtable-pointer-type-discrimination" "-fptrauth-init-fini"
24+
// PAUTHABI1-SAME: "-fptrauth-intrinsics" "-fptrauth-calls" "-fptrauth-returns" "-fptrauth-auth-traps" "-fptrauth-vtable-pointer-address-discrimination" "-fptrauth-vtable-pointer-type-discrimination" "-fptrauth-indirect-gotos" "-fptrauth-init-fini"
2525

2626
// RUN: %clang -### -c --target=aarch64 -mabi=pauthtest -fno-ptrauth-intrinsics \
2727
// RUN: -fno-ptrauth-calls -fno-ptrauth-returns -fno-ptrauth-auth-traps \
2828
// RUN: -fno-ptrauth-vtable-pointer-address-discrimination -fno-ptrauth-vtable-pointer-type-discrimination \
29-
// RUN: -fno-ptrauth-init-fini %s 2>&1 | FileCheck %s --check-prefix=PAUTHABI2
29+
// RUN: -fno-ptrauth-indirect-gotos -fno-ptrauth-init-fini %s 2>&1 | FileCheck %s --check-prefix=PAUTHABI2
3030
// RUN: %clang -### -c --target=aarch64-pauthtest -fno-ptrauth-intrinsics \
3131
// RUN: -fno-ptrauth-calls -fno-ptrauth-returns -fno-ptrauth-auth-traps \
3232
// RUN: -fno-ptrauth-vtable-pointer-address-discrimination -fno-ptrauth-vtable-pointer-type-discrimination \
33-
// RUN: -fno-ptrauth-init-fini %s 2>&1 | FileCheck %s --check-prefix=PAUTHABI2
33+
// RUN: -fno-ptrauth-indirect-gotos -fno-ptrauth-init-fini %s 2>&1 | FileCheck %s --check-prefix=PAUTHABI2
3434
// PAUTHABI2: "-cc1"
3535
// PAUTHABI2-NOT: "-fptrauth-
3636

0 commit comments

Comments
 (0)