llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-driver Author: Daniil Kovalev (kovdan01) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/212446.diff 2 Files Affected: - (modified) clang/lib/Driver/ToolChains/Linux.cpp (+4) - (modified) clang/test/Driver/aarch64-ptrauth.c (+3-3) ``````````diff diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index a01442f3b23e2..1ab385a9ea001 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -538,6 +538,10 @@ static void handlePAuthABI(const Driver &D, const ArgList &DriverArgs, options::OPT_fno_ptrauth_init_fini_address_discrimination)) CC1Args.push_back("-fptrauth-init-fini-address-discrimination"); + if (!DriverArgs.hasArg(options::OPT_fptrauth_elf_got, + options::OPT_fno_ptrauth_elf_got)) + CC1Args.push_back("-fptrauth-elf-got"); + if (!DriverArgs.hasArg(options::OPT_faarch64_jump_table_hardening, options::OPT_fno_aarch64_jump_table_hardening)) CC1Args.push_back("-faarch64-jump-table-hardening"); diff --git a/clang/test/Driver/aarch64-ptrauth.c b/clang/test/Driver/aarch64-ptrauth.c index 44c1b21a7fca6..4b677585a5479 100644 --- a/clang/test/Driver/aarch64-ptrauth.c +++ b/clang/test/Driver/aarch64-ptrauth.c @@ -58,7 +58,7 @@ // RUN: %clang -### -c --target=aarch64-linux-pauthtest %s 2>&1 | \ // RUN: FileCheck %s --check-prefix=PAUTHABI1 --implicit-check-not='"-fptrauth-function-pointer-type-discrimination"' // PAUTHABI1: "-cc1"{{.*}} "-triple" "aarch64-unknown-linux-pauthtest" -// PAUTHABI1-SAME: "-fptrauth-intrinsics" "-fptrauth-calls" "-fptrauth-returns" "-fptrauth-auth-traps" "-fptrauth-vtable-pointer-address-discrimination" "-fptrauth-vtable-pointer-type-discrimination" "-fptrauth-type-info-vtable-pointer-discrimination" "-fptrauth-indirect-gotos" "-fptrauth-init-fini" "-fptrauth-init-fini-address-discrimination" "-faarch64-jump-table-hardening" +// PAUTHABI1-SAME: "-fptrauth-intrinsics" "-fptrauth-calls" "-fptrauth-returns" "-fptrauth-auth-traps" "-fptrauth-vtable-pointer-address-discrimination" "-fptrauth-vtable-pointer-type-discrimination" "-fptrauth-type-info-vtable-pointer-discrimination" "-fptrauth-indirect-gotos" "-fptrauth-init-fini" "-fptrauth-init-fini-address-discrimination" "-fptrauth-elf-got" "-faarch64-jump-table-hardening" // PAUTHABI1-SAME: "-target-abi" "pauthtest" // RUN: %clang -### -c --target=aarch64-linux -mabi=pauthtest -fno-ptrauth-intrinsics \ @@ -66,14 +66,14 @@ // RUN: -fno-ptrauth-vtable-pointer-address-discrimination -fno-ptrauth-vtable-pointer-type-discrimination \ // RUN: -fno-ptrauth-type-info-vtable-pointer-discrimination -fno-ptrauth-indirect-gotos \ // RUN: -fno-ptrauth-init-fini -fno-ptrauth-init-fini-address-discrimination \ -// RUN: -fno-aarch64-jump-table-hardening %s 2>&1 | \ +// RUN: -fno-ptrauth-elf-got -fno-aarch64-jump-table-hardening %s 2>&1 | \ // RUN: FileCheck %s --check-prefix=PAUTHABI2 --implicit-check-not='"-fptrauth-' --implicit-check-not='"-faarch64-jump-table-hardening"' // RUN: %clang -### -c --target=aarch64-linux-pauthtest -fno-ptrauth-intrinsics \ // RUN: -fno-ptrauth-calls -fno-ptrauth-returns -fno-ptrauth-auth-traps \ // RUN: -fno-ptrauth-vtable-pointer-address-discrimination -fno-ptrauth-vtable-pointer-type-discrimination \ // RUN: -fno-ptrauth-type-info-vtable-pointer-discrimination -fno-ptrauth-indirect-gotos \ // RUN: -fno-ptrauth-init-fini -fno-ptrauth-init-fini-address-discrimination \ -// RUN: -fno-aarch64-jump-table-hardening %s 2>&1 | \ +// RUN: -fno-ptrauth-elf-got -fno-aarch64-jump-table-hardening %s 2>&1 | \ // RUN: FileCheck %s --check-prefix=PAUTHABI2 --implicit-check-not='"-fptrauth-' --implicit-check-not='"-faarch64-jump-table-hardening"' //// Non-linux OS: pauthtest ABI has no effect in terms of passing ptrauth cc1 flags. `````````` </details> https://github.com/llvm/llvm-project/pull/212446 _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
