https://github.com/kovdan01 updated
https://github.com/llvm/llvm-project/pull/96160
>From 1ca6cf823585b03a6c580b23caafd1ff44d83aa7 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Tue, 6 Aug 2024 20:02:07 +0300
Subject: [PATCH 1/3] [PAC][clang][Driver] Add signed GOT flag
Depends on #96159
Add `-fptrauth-elf-got` clang driver flag and set `ptrauth_elf_got`
preprocessor feature and `PointerAuthELFGOT` LangOption correspondingly.
For non-ELF triples, the driver flag is ignored and a warning is emitted.
---
.../clang/Basic/DiagnosticDriverKinds.td | 4 +++
clang/include/clang/Basic/Features.def | 1 +
clang/include/clang/Driver/Options.td | 1 +
clang/lib/Driver/ToolChains/Clang.cpp | 8 +++++
clang/lib/Frontend/CompilerInvocation.cpp | 4 +++
clang/test/CodeGen/aarch64-elf-pauthabi.c | 13 ++++++--
clang/test/Driver/aarch64-ptrauth.c | 9 +++++-
clang/test/Preprocessor/ptrauth_feature.c | 31 +++++++++++++------
8 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td
b/clang/include/clang/Basic/DiagnosticDriverKinds.td
index 3d8240f8357b40..ff8e6dae8cf424 100644
--- a/clang/include/clang/Basic/DiagnosticDriverKinds.td
+++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -751,6 +751,10 @@ def warn_drv_fjmc_for_elf_only : Warning<
"-fjmc works only for ELF; option ignored">,
InGroup<OptionIgnored>;
+def warn_drv_ptrauth_elf_got_for_elf_only : Warning<
+ "-fptrauth-elf-got works only for ELF; option ignored">,
+ InGroup<OptionIgnored>;
+
def warn_target_override_arm64ec : Warning<
"/arm64EC has been overridden by specified target: %0; option ignored">,
InGroup<OptionIgnored>;
diff --git a/clang/include/clang/Basic/Features.def
b/clang/include/clang/Basic/Features.def
index 10538f555b418e..af847ca70381dd 100644
--- a/clang/include/clang/Basic/Features.def
+++ b/clang/include/clang/Basic/Features.def
@@ -114,6 +114,7 @@ FEATURE(ptrauth_function_pointer_type_discrimination,
LangOpts.PointerAuthFuncti
FEATURE(ptrauth_indirect_gotos, LangOpts.PointerAuthIndirectGotos)
FEATURE(ptrauth_init_fini, LangOpts.PointerAuthInitFini)
FEATURE(ptrauth_init_fini_address_discrimination,
LangOpts.PointerAuthInitFiniAddressDiscrimination)
+FEATURE(ptrauth_elf_got, LangOpts.PointerAuthELFGOT)
EXTENSION(swiftcc,
PP.getTargetInfo().checkCallingConvention(CC_Swift) ==
clang::TargetInfo::CCCR_OK)
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index 9bc84168c29608..552cb668661888 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -4263,6 +4263,7 @@ defm ptrauth_indirect_gotos :
OptInCC1FFlag<"ptrauth-indirect-gotos",
defm ptrauth_init_fini : OptInCC1FFlag<"ptrauth-init-fini", "Enable signing of
function pointers in init/fini arrays">;
defm ptrauth_init_fini_address_discrimination :
OptInCC1FFlag<"ptrauth-init-fini-address-discrimination",
"Enable address discrimination of function pointers in init/fini arrays">;
+defm ptrauth_elf_got : OptInCC1FFlag<"ptrauth-elf-got", "Enable authentication
of pointers from GOT (ELF only)">;
}
def fenable_matrix : Flag<["-"], "fenable-matrix">, Group<f_Group>,
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp
b/clang/lib/Driver/ToolChains/Clang.cpp
index 2054c8fe928e2e..bb1d5cc4f7171a 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -1858,6 +1858,14 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
Args.addOptInFlag(CmdArgs,
options::OPT_fptrauth_init_fini_address_discrimination,
options::OPT_fno_ptrauth_init_fini_address_discrimination);
+
+ Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_elf_got,
+ options::OPT_fno_ptrauth_elf_got);
+
+ if (Args.hasArg(options::OPT_fptrauth_elf_got) &&
+ Triple.getObjectFormat() != llvm::Triple::ELF)
+ getToolChain().getDriver().Diag(
+ diag::warn_drv_ptrauth_elf_got_for_elf_only);
}
void Clang::AddLoongArchTargetArgs(const ArgList &Args,
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp
b/clang/lib/Frontend/CompilerInvocation.cpp
index 225bd6416ce5fc..8f28408116501c 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -3437,6 +3437,8 @@ static void GeneratePointerAuthArgs(const LangOptions
&Opts,
GenerateArg(Consumer, OPT_fptrauth_init_fini);
if (Opts.PointerAuthInitFiniAddressDiscrimination)
GenerateArg(Consumer, OPT_fptrauth_init_fini_address_discrimination);
+ if (Opts.PointerAuthELFGOT)
+ GenerateArg(Consumer, OPT_fptrauth_elf_got);
}
static void ParsePointerAuthArgs(LangOptions &Opts, ArgList &Args,
@@ -3457,6 +3459,7 @@ static void ParsePointerAuthArgs(LangOptions &Opts,
ArgList &Args,
Opts.PointerAuthInitFini = Args.hasArg(OPT_fptrauth_init_fini);
Opts.PointerAuthInitFiniAddressDiscrimination =
Args.hasArg(OPT_fptrauth_init_fini_address_discrimination);
+ Opts.PointerAuthELFGOT = Args.hasArg(OPT_fptrauth_elf_got);
}
/// Check if input file kind and language standard are compatible.
@@ -4819,6 +4822,7 @@ bool CompilerInvocation::CreateFromArgsImpl(
ParseAPINotesArgs(Res.getAPINotesOpts(), Args, Diags);
ParsePointerAuthArgs(LangOpts, Args, Diags);
+ LangOpts.PointerAuthELFGOT &= T.isOSBinFormatELF();
ParseLangArgs(LangOpts, Args, DashX, T, Res.getPreprocessorOpts().Includes,
Diags);
diff --git a/clang/test/CodeGen/aarch64-elf-pauthabi.c
b/clang/test/CodeGen/aarch64-elf-pauthabi.c
index d60dcee3618887..9d8b9dd0609c64 100644
--- a/clang/test/CodeGen/aarch64-elf-pauthabi.c
+++ b/clang/test/CodeGen/aarch64-elf-pauthabi.c
@@ -5,8 +5,9 @@
// RUN: -fptrauth-auth-traps \
// RUN: -fptrauth-vtable-pointer-address-discrimination \
// RUN: -fptrauth-vtable-pointer-type-discrimination \
-// RUN: -fptrauth-init-fini %s \
-// RUN: -fptrauth-init-fini-address-discrimination %s | \
+// RUN: -fptrauth-init-fini \
+// RUN: -fptrauth-init-fini-address-discrimination \
+// RUN: -fptrauth-elf-got %s | \
// RUN: FileCheck %s --check-prefix=ALL
// RUN: %clang_cc1 -triple aarch64-linux -emit-llvm -o - \
@@ -37,8 +38,11 @@
// RUN: -fptrauth-calls -fptrauth-init-fini
-fptrauth-init-fini-address-discrimination %s | \
// RUN: FileCheck %s --check-prefix=INITFINIADDR
+// RUN: %clang_cc1 -triple aarch64-linux -emit-llvm -o - \
+// RUN: -fptrauth-elf-got %s | FileCheck %s --check-prefix=ELFGOT
+
// ALL: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458}
-// ALL: !{i32 1, !"aarch64-elf-pauthabi-version", i32 255}
+// ALL: !{i32 1, !"aarch64-elf-pauthabi-version", i32 511}
// INTRIN: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458}
// INTRIN: !{i32 1, !"aarch64-elf-pauthabi-version", i32 1}
@@ -64,4 +68,7 @@
// INITFINIADDR: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458}
// INITFINIADDR: !{i32 1, !"aarch64-elf-pauthabi-version", i32 194}
+// ELFGOT: !{i32 1, !"aarch64-elf-pauthabi-platform", i32 268435458}
+// ELFGOT: !{i32 1, !"aarch64-elf-pauthabi-version", i32 256}
+
void foo() {}
diff --git a/clang/test/Driver/aarch64-ptrauth.c
b/clang/test/Driver/aarch64-ptrauth.c
index 19eaa73b14d9ea..97e5a934bef700 100644
--- a/clang/test/Driver/aarch64-ptrauth.c
+++ b/clang/test/Driver/aarch64-ptrauth.c
@@ -18,6 +18,12 @@
// RUN: %s 2>&1 | FileCheck %s --check-prefix=ALL
// ALL: "-cc1"{{.*}} "-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"
+// RUN: %clang -### -c --target=aarch64-elf -fno-ptrauth-elf-got
-fptrauth-elf-got %s 2>&1 | FileCheck %s --check-prefix=ELFGOT
+// ELFGOT: "-cc1"{{.*}} "-fptrauth-elf-got"
+// ELFGOT-NOT: warning: -fptrauth-elf-got works only for ELF; option ignored
[-Woption-ignored]
+
+// RUN: %clang -### -c --target=aarch64-darwin -fptrauth-elf-got %s 2>&1 |
FileCheck %s --check-prefix=NOELFGOT
+// NOELFGOT: warning: -fptrauth-elf-got works only for ELF; option ignored
[-Woption-ignored]
// RUN: %clang -### -c --target=aarch64-linux -mabi=pauthtest %s 2>&1 |
FileCheck %s --check-prefix=PAUTHABI1
// RUN: %clang -### -c --target=aarch64-linux-pauthtest %s 2>&1 | FileCheck %s
--check-prefix=PAUTHABI1
// PAUTHABI1: "-cc1"{{.*}} "-triple" "aarch64-unknown-linux-pauthtest"
@@ -38,7 +44,7 @@
// RUN: not %clang -### -c --target=x86_64 -fptrauth-intrinsics
-fptrauth-calls -fptrauth-returns -fptrauth-auth-traps \
// RUN: -fptrauth-vtable-pointer-address-discrimination
-fptrauth-vtable-pointer-type-discrimination \
// RUN: -fptrauth-type-info-vtable-pointer-discrimination
-fptrauth-indirect-gotos -fptrauth-init-fini \
-// RUN: -fptrauth-init-fini-address-discrimination %s 2>&1 | FileCheck %s
--check-prefix=ERR1
+// RUN: -fptrauth-init-fini-address-discrimination -fptrauth-elf-got %s 2>&1
| FileCheck %s --check-prefix=ERR1
// ERR1: error: unsupported option '-fptrauth-intrinsics' for target
'{{.*}}'
// ERR1-NEXT: error: unsupported option '-fptrauth-calls' for target '{{.*}}'
// ERR1-NEXT: error: unsupported option '-fptrauth-returns' for target '{{.*}}'
@@ -49,6 +55,7 @@
// ERR1-NEXT: error: unsupported option '-fptrauth-indirect-gotos' for target
'{{.*}}'
// ERR1-NEXT: error: unsupported option '-fptrauth-init-fini' for target
'{{.*}}'
// ERR1-NEXT: error: unsupported option
'-fptrauth-init-fini-address-discrimination' for target '{{.*}}'
+// ERR1-NEXT: error: unsupported option '-fptrauth-elf-got' for target '{{.*}}'
//// Only support PAuth ABI for Linux as for now.
// RUN: not %clang -o /dev/null -c --target=aarch64-unknown -mabi=pauthtest %s
2>&1 | FileCheck %s --check-prefix=ERR2
diff --git a/clang/test/Preprocessor/ptrauth_feature.c
b/clang/test/Preprocessor/ptrauth_feature.c
index 2a3edc23f47532..a440791d6cc695 100644
--- a/clang/test/Preprocessor/ptrauth_feature.c
+++ b/clang/test/Preprocessor/ptrauth_feature.c
@@ -2,34 +2,37 @@
//// For example, -fptrauth-init-fini will not affect codegen without
-fptrauth-calls, but the preprocessor feature would be set anyway.
// RUN: %clang_cc1 -E %s -triple=aarch64 -fptrauth-intrinsics | \
-// RUN: FileCheck %s
--check-prefixes=INTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS
+// RUN: FileCheck %s
--check-prefixes=INTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS,NOELFGOT
// RUN: %clang_cc1 -E %s -triple=aarch64 -fptrauth-calls | \
-// RUN: FileCheck %s
--check-prefixes=NOINTRIN,CALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,CALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS,NOELFGOT
// RUN: %clang_cc1 -E %s -triple=aarch64 -fptrauth-returns | \
-// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,RETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,RETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS,NOELFGOT
// RUN: %clang_cc1 -E %s -triple=aarch64
-fptrauth-vtable-pointer-address-discrimination | \
-// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,VPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,VPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS,NOELFGOT
// RUN: %clang_cc1 -E %s -triple=aarch64
-fptrauth-vtable-pointer-type-discrimination | \
-// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,VPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,VPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS,NOELFGOT
// RUN: %clang_cc1 -E %s -triple=aarch64
-fptrauth-type-info-vtable-pointer-discrimination | \
-// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,TYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,TYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS,NOELFGOT
// RUN: %clang_cc1 -E %s -triple=aarch64
-fptrauth-function-pointer-type-discrimination | \
-// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,FUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,FUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS,NOELFGOT
// RUN: %clang_cc1 -E %s -triple=aarch64 -fptrauth-init-fini | \
-// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,INITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,INITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS,NOELFGOT
// RUN: %clang_cc1 -E %s -triple=aarch64
-fptrauth-init-fini-address-discrimination | \
-// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,INITFINI_ADDR_DISCR,NOGOTOS
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,INITFINI_ADDR_DISCR,NOGOTOS,NOELFGOT
// RUN: %clang_cc1 -E %s -triple=aarch64 -fptrauth-indirect-gotos | \
-// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,GOTOS
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,GOTOS,NOELFGOT
+
+// RUN: %clang_cc1 -E %s -triple=aarch64 -fptrauth-elf-got | \
+// RUN: FileCheck %s
--check-prefixes=NOINTRIN,NOCALLS,NORETS,NOVPTR_ADDR_DISCR,NOVPTR_TYPE_DISCR,NOTYPE_INFO_DISCR,NOFUNC,NOINITFINI,NOINITFINI_ADDR_DISCR,NOGOTOS,ELFGOT
#if __has_feature(ptrauth_intrinsics)
// INTRIN: has_ptrauth_intrinsics
@@ -119,3 +122,11 @@ void has_ptrauth_indirect_gotos() {}
// NOGOTOS: no_ptrauth_indirect_gotos
void no_ptrauth_indirect_gotos() {}
#endif
+
+#if __has_feature(ptrauth_elf_got)
+// ELFGOT: has_ptrauth_elf_got
+void has_ptrauth_elf_got() {}
+#else
+// NOELFGOT: no_ptrauth_elf_got
+void no_ptrauth_elf_got() {}
+#endif
>From eea105fe2b181b796ce56965883b8567cbb0c71a Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Tue, 6 Aug 2024 20:24:13 +0300
Subject: [PATCH 2/3] Add empty line between tests for readability
---
clang/test/Driver/aarch64-ptrauth.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/clang/test/Driver/aarch64-ptrauth.c
b/clang/test/Driver/aarch64-ptrauth.c
index 97e5a934bef700..6ee700becdac3e 100644
--- a/clang/test/Driver/aarch64-ptrauth.c
+++ b/clang/test/Driver/aarch64-ptrauth.c
@@ -24,6 +24,7 @@
// RUN: %clang -### -c --target=aarch64-darwin -fptrauth-elf-got %s 2>&1 |
FileCheck %s --check-prefix=NOELFGOT
// NOELFGOT: warning: -fptrauth-elf-got works only for ELF; option ignored
[-Woption-ignored]
+
// RUN: %clang -### -c --target=aarch64-linux -mabi=pauthtest %s 2>&1 |
FileCheck %s --check-prefix=PAUTHABI1
// RUN: %clang -### -c --target=aarch64-linux-pauthtest %s 2>&1 | FileCheck %s
--check-prefix=PAUTHABI1
// PAUTHABI1: "-cc1"{{.*}} "-triple" "aarch64-unknown-linux-pauthtest"
>From 6da08a29780461f3db7f23028a4c88e40969db1d Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Wed, 13 Nov 2024 06:27:03 +0300
Subject: [PATCH 3/3] Delete driver flag and only leave cc1 flag
---
clang/lib/Driver/ToolChains/Clang.cpp | 8 --------
clang/lib/Frontend/CompilerInvocation.cpp | 1 -
clang/test/Driver/aarch64-ptrauth.c | 10 +---------
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp
b/clang/lib/Driver/ToolChains/Clang.cpp
index 4ffc51bbc12597..0952262c360185 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -1874,14 +1874,6 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
Args.addOptInFlag(CmdArgs,
options::OPT_fptrauth_init_fini_address_discrimination,
options::OPT_fno_ptrauth_init_fini_address_discrimination);
-
- Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_elf_got,
- options::OPT_fno_ptrauth_elf_got);
-
- if (Args.hasArg(options::OPT_fptrauth_elf_got) &&
- Triple.getObjectFormat() != llvm::Triple::ELF)
- getToolChain().getDriver().Diag(
- diag::warn_drv_ptrauth_elf_got_for_elf_only);
}
void Clang::AddLoongArchTargetArgs(const ArgList &Args,
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp
b/clang/lib/Frontend/CompilerInvocation.cpp
index 5201da87b5fd2f..53283665373b56 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -4878,7 +4878,6 @@ bool CompilerInvocation::CreateFromArgsImpl(
ParseAPINotesArgs(Res.getAPINotesOpts(), Args, Diags);
ParsePointerAuthArgs(LangOpts, Args, Diags);
- LangOpts.PointerAuthELFGOT &= T.isOSBinFormatELF();
ParseLangArgs(LangOpts, Args, DashX, T, Res.getPreprocessorOpts().Includes,
Diags);
diff --git a/clang/test/Driver/aarch64-ptrauth.c
b/clang/test/Driver/aarch64-ptrauth.c
index 6ee700becdac3e..19eaa73b14d9ea 100644
--- a/clang/test/Driver/aarch64-ptrauth.c
+++ b/clang/test/Driver/aarch64-ptrauth.c
@@ -18,13 +18,6 @@
// RUN: %s 2>&1 | FileCheck %s --check-prefix=ALL
// ALL: "-cc1"{{.*}} "-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"
-// RUN: %clang -### -c --target=aarch64-elf -fno-ptrauth-elf-got
-fptrauth-elf-got %s 2>&1 | FileCheck %s --check-prefix=ELFGOT
-// ELFGOT: "-cc1"{{.*}} "-fptrauth-elf-got"
-// ELFGOT-NOT: warning: -fptrauth-elf-got works only for ELF; option ignored
[-Woption-ignored]
-
-// RUN: %clang -### -c --target=aarch64-darwin -fptrauth-elf-got %s 2>&1 |
FileCheck %s --check-prefix=NOELFGOT
-// NOELFGOT: warning: -fptrauth-elf-got works only for ELF; option ignored
[-Woption-ignored]
-
// RUN: %clang -### -c --target=aarch64-linux -mabi=pauthtest %s 2>&1 |
FileCheck %s --check-prefix=PAUTHABI1
// RUN: %clang -### -c --target=aarch64-linux-pauthtest %s 2>&1 | FileCheck %s
--check-prefix=PAUTHABI1
// PAUTHABI1: "-cc1"{{.*}} "-triple" "aarch64-unknown-linux-pauthtest"
@@ -45,7 +38,7 @@
// RUN: not %clang -### -c --target=x86_64 -fptrauth-intrinsics
-fptrauth-calls -fptrauth-returns -fptrauth-auth-traps \
// RUN: -fptrauth-vtable-pointer-address-discrimination
-fptrauth-vtable-pointer-type-discrimination \
// RUN: -fptrauth-type-info-vtable-pointer-discrimination
-fptrauth-indirect-gotos -fptrauth-init-fini \
-// RUN: -fptrauth-init-fini-address-discrimination -fptrauth-elf-got %s 2>&1
| FileCheck %s --check-prefix=ERR1
+// RUN: -fptrauth-init-fini-address-discrimination %s 2>&1 | FileCheck %s
--check-prefix=ERR1
// ERR1: error: unsupported option '-fptrauth-intrinsics' for target
'{{.*}}'
// ERR1-NEXT: error: unsupported option '-fptrauth-calls' for target '{{.*}}'
// ERR1-NEXT: error: unsupported option '-fptrauth-returns' for target '{{.*}}'
@@ -56,7 +49,6 @@
// ERR1-NEXT: error: unsupported option '-fptrauth-indirect-gotos' for target
'{{.*}}'
// ERR1-NEXT: error: unsupported option '-fptrauth-init-fini' for target
'{{.*}}'
// ERR1-NEXT: error: unsupported option
'-fptrauth-init-fini-address-discrimination' for target '{{.*}}'
-// ERR1-NEXT: error: unsupported option '-fptrauth-elf-got' for target '{{.*}}'
//// Only support PAuth ABI for Linux as for now.
// RUN: not %clang -o /dev/null -c --target=aarch64-unknown -mabi=pauthtest %s
2>&1 | FileCheck %s --check-prefix=ERR2
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
