Skip to content

Commit 05ece20

Browse files
kovdan01Lukacma
kovdan01
authored and
Lukacma
committed
[PAC][clang] Handle pauthtest environment and ABI in Linux-specific code (llvm#113151)
Since pauthtest is a Linux-specific ABI, it should not be handled in common driver code.
1 parent 14b54c6 commit 05ece20

File tree

13 files changed

+150
-100
lines changed

13 files changed

+150
-100
lines changed

‎clang/lib/Basic/Targets/AArch64.cpp‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@ AArch64TargetInfo::AArch64TargetInfo(const llvm::Triple &Triple,
206206
StringRef AArch64TargetInfo::getABI() const { return ABI; }
207207

208208
bool AArch64TargetInfo::setABI(const std::string &Name) {
209-
if (Name != "aapcs" && Name != "aapcs-soft" && Name != "darwinpcs" &&
210-
Name != "pauthtest")
209+
if (Name != "aapcs" && Name != "aapcs-soft" && Name != "darwinpcs")
211210
return false;
212211

213212
ABI = Name;
@@ -221,12 +220,6 @@ bool AArch64TargetInfo::validateTarget(DiagnosticsEngine &Diags) const {
221220
Diags.Report(diag::err_target_unsupported_abi_with_fpu) << ABI;
222221
return false;
223222
}
224-
if (getTriple().getEnvironment() == llvm::Triple::PAuthTest &&
225-
getTriple().getOS() != llvm::Triple::Linux) {
226-
Diags.Report(diag::err_target_unsupported_abi_for_triple)
227-
<< getTriple().getEnvironmentName() << getTriple().getTriple();
228-
return false;
229-
}
230223
return true;
231224
}
232225

‎clang/lib/Basic/Targets/AArch64.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ class LLVM_LIBRARY_VISIBILITY AArch64TargetInfo : public TargetInfo {
135135

136136
const llvm::AArch64::ArchInfo *ArchInfo = &llvm::AArch64::ARMV8A;
137137

138+
protected:
138139
std::string ABI;
139140

140141
public:
@@ -279,6 +280,16 @@ class LLVM_LIBRARY_VISIBILITY AArch64leTargetInfo : public AArch64TargetInfo {
279280
void setDataLayout() override;
280281
};
281282

283+
template <>
284+
inline bool
285+
LinuxTargetInfo<AArch64leTargetInfo>::setABI(const std::string &Name) {
286+
if (Name == "pauthtest") {
287+
ABI = Name;
288+
return true;
289+
}
290+
return AArch64leTargetInfo::setABI(Name);
291+
}
292+
282293
class LLVM_LIBRARY_VISIBILITY WindowsARM64TargetInfo
283294
: public WindowsTargetInfo<AArch64leTargetInfo> {
284295
const llvm::Triple Triple;

‎clang/lib/Basic/Targets/OSTargets.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
//===----------------------------------------------------------------------===//
1111

1212
#include "OSTargets.h"
13+
#include "AArch64.h"
1314
#include "clang/Basic/MacroBuilder.h"
1415
#include "llvm/ADT/StringRef.h"
1516

‎clang/lib/Basic/Targets/OSTargets.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,12 @@ class LLVM_LIBRARY_VISIBILITY LinuxTargetInfo : public OSTargetInfo<Target> {
408408
const char *getStaticInitSectionSpecifier() const override {
409409
return ".text.startup";
410410
}
411+
412+
// This allows template specializations, see
413+
// LinuxTargetInfo<AArch64leTargetInfo>::setABI
414+
bool setABI(const std::string &Name) override {
415+
return OSTargetInfo<Target>::setABI(Name);
416+
}
411417
};
412418

413419
// Managarm Target

‎clang/lib/CodeGen/CodeGenModule.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ createTargetCodeGenInfo(CodeGenModule &CGM) {
146146
return createWindowsAArch64TargetCodeGenInfo(CGM, AArch64ABIKind::Win64);
147147
else if (Target.getABI() == "aapcs-soft")
148148
Kind = AArch64ABIKind::AAPCSSoft;
149-
else if (Target.getABI() == "pauthtest")
150-
Kind = AArch64ABIKind::PAuthTest;
151149

152150
return createAArch64TargetCodeGenInfo(CGM, Kind);
153151
}

‎clang/lib/CodeGen/TargetInfo.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ enum class AArch64ABIKind {
483483
DarwinPCS,
484484
Win64,
485485
AAPCSSoft,
486-
PAuthTest,
487486
};
488487

489488
std::unique_ptr<TargetCodeGenInfo>

‎clang/lib/Driver/ToolChain.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,6 @@ std::string ToolChain::ComputeLLVMTriple(const ArgList &Args,
12531253
}
12541254
case llvm::Triple::aarch64: {
12551255
llvm::Triple Triple = getTriple();
1256-
tools::aarch64::setPAuthABIInTriple(getDriver(), Args, Triple);
12571256
if (!Triple.isOSBinFormatMachO())
12581257
return Triple.getTriple();
12591258

‎clang/lib/Driver/ToolChains/Arch/AArch64.cpp‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -466,27 +466,6 @@ void aarch64::getAArch64TargetFeatures(const Driver &D,
466466
Features.push_back("+no-bti-at-return-twice");
467467
}
468468

469-
void aarch64::setPAuthABIInTriple(const Driver &D, const ArgList &Args,
470-
llvm::Triple &Triple) {
471-
Arg *ABIArg = Args.getLastArg(options::OPT_mabi_EQ);
472-
bool HasPAuthABI =
473-
ABIArg ? (StringRef(ABIArg->getValue()) == "pauthtest") : false;
474-
475-
switch (Triple.getEnvironment()) {
476-
case llvm::Triple::UnknownEnvironment:
477-
if (HasPAuthABI)
478-
Triple.setEnvironment(llvm::Triple::PAuthTest);
479-
break;
480-
case llvm::Triple::PAuthTest:
481-
break;
482-
default:
483-
if (HasPAuthABI)
484-
D.Diag(diag::err_drv_unsupported_opt_for_target)
485-
<< ABIArg->getAsString(Args) << Triple.getTriple();
486-
break;
487-
}
488-
}
489-
490469
/// Is the triple {aarch64.aarch64_be}-none-elf?
491470
bool aarch64::isAArch64BareMetal(const llvm::Triple &Triple) {
492471
if (Triple.getArch() != llvm::Triple::aarch64 &&

‎clang/lib/Driver/ToolChains/Arch/AArch64.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ void getAArch64TargetFeatures(const Driver &D, const llvm::Triple &Triple,
2828
std::string getAArch64TargetCPU(const llvm::opt::ArgList &Args,
2929
const llvm::Triple &Triple, llvm::opt::Arg *&A);
3030

31-
void setPAuthABIInTriple(const Driver &D, const llvm::opt::ArgList &Args,
32-
llvm::Triple &triple);
3331
bool isAArch64BareMetal(const llvm::Triple &Triple);
3432

3533
} // end namespace aarch64

‎clang/lib/Driver/ToolChains/Clang.cpp‎

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,59 +1348,6 @@ void AddUnalignedAccessWarning(ArgStringList &CmdArgs) {
13481348
}
13491349
}
13501350

1351-
// Each combination of options here forms a signing schema, and in most cases
1352-
// each signing schema is its own incompatible ABI. The default values of the
1353-
// options represent the default signing schema.
1354-
static void handlePAuthABI(const ArgList &DriverArgs, ArgStringList &CC1Args) {
1355-
if (!DriverArgs.hasArg(options::OPT_fptrauth_intrinsics,
1356-
options::OPT_fno_ptrauth_intrinsics))
1357-
CC1Args.push_back("-fptrauth-intrinsics");
1358-
1359-
if (!DriverArgs.hasArg(options::OPT_fptrauth_calls,
1360-
options::OPT_fno_ptrauth_calls))
1361-
CC1Args.push_back("-fptrauth-calls");
1362-
1363-
if (!DriverArgs.hasArg(options::OPT_fptrauth_returns,
1364-
options::OPT_fno_ptrauth_returns))
1365-
CC1Args.push_back("-fptrauth-returns");
1366-
1367-
if (!DriverArgs.hasArg(options::OPT_fptrauth_auth_traps,
1368-
options::OPT_fno_ptrauth_auth_traps))
1369-
CC1Args.push_back("-fptrauth-auth-traps");
1370-
1371-
if (!DriverArgs.hasArg(
1372-
options::OPT_fptrauth_vtable_pointer_address_discrimination,
1373-
options::OPT_fno_ptrauth_vtable_pointer_address_discrimination))
1374-
CC1Args.push_back("-fptrauth-vtable-pointer-address-discrimination");
1375-
1376-
if (!DriverArgs.hasArg(
1377-
options::OPT_fptrauth_vtable_pointer_type_discrimination,
1378-
options::OPT_fno_ptrauth_vtable_pointer_type_discrimination))
1379-
CC1Args.push_back("-fptrauth-vtable-pointer-type-discrimination");
1380-
1381-
if (!DriverArgs.hasArg(
1382-
options::OPT_fptrauth_type_info_vtable_pointer_discrimination,
1383-
options::OPT_fno_ptrauth_type_info_vtable_pointer_discrimination))
1384-
CC1Args.push_back("-fptrauth-type-info-vtable-pointer-discrimination");
1385-
1386-
if (!DriverArgs.hasArg(options::OPT_fptrauth_indirect_gotos,
1387-
options::OPT_fno_ptrauth_indirect_gotos))
1388-
CC1Args.push_back("-fptrauth-indirect-gotos");
1389-
1390-
if (!DriverArgs.hasArg(options::OPT_fptrauth_init_fini,
1391-
options::OPT_fno_ptrauth_init_fini))
1392-
CC1Args.push_back("-fptrauth-init-fini");
1393-
1394-
if (!DriverArgs.hasArg(
1395-
options::OPT_fptrauth_init_fini_address_discrimination,
1396-
options::OPT_fno_ptrauth_init_fini_address_discrimination))
1397-
CC1Args.push_back("-fptrauth-init-fini-address-discrimination");
1398-
1399-
if (!DriverArgs.hasArg(options::OPT_faarch64_jump_table_hardening,
1400-
options::OPT_fno_aarch64_jump_table_hardening))
1401-
CC1Args.push_back("-faarch64-jump-table-hardening");
1402-
}
1403-
14041351
static void CollectARMPACBTIOptions(const ToolChain &TC, const ArgList &Args,
14051352
ArgStringList &CmdArgs, bool isAArch64) {
14061353
const llvm::Triple &Triple = TC.getEffectiveTriple();
@@ -1638,7 +1585,9 @@ void RenderAArch64ABI(const llvm::Triple &Triple, const ArgList &Args,
16381585
ABIName = A->getValue();
16391586
else if (Triple.isOSDarwin())
16401587
ABIName = "darwinpcs";
1641-
else if (Triple.getEnvironment() == llvm::Triple::PAuthTest)
1588+
// TODO: we probably want to have some target hook here.
1589+
else if (Triple.isOSLinux() &&
1590+
Triple.getEnvironment() == llvm::Triple::PAuthTest)
16421591
ABIName = "pauthtest";
16431592
else
16441593
ABIName = "aapcs";
@@ -1758,8 +1707,6 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
17581707
options::OPT_fno_ptrauth_objc_interface_sel);
17591708
Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_objc_class_ro,
17601709
options::OPT_fno_ptrauth_objc_class_ro);
1761-
if (Triple.getEnvironment() == llvm::Triple::PAuthTest)
1762-
handlePAuthABI(Args, CmdArgs);
17631710

17641711
// Enable/disable return address signing and indirect branch targets.
17651712
CollectARMPACBTIOptions(getToolChain(), Args, CmdArgs, true /*isAArch64*/);

0 commit comments

Comments
 (0)