Skip to content

Commit f88b2a9

Browse files
kovdan01kovdan01
committed
Address review comments
1 parent 8c37929 commit f88b2a9

File tree

5 files changed

+37
-50
lines changed

5 files changed

+37
-50
lines changed

‎clang/include/clang/Driver/ToolChain.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,6 @@ class ToolChain {
214214
FileType Type, bool AddArch,
215215
bool IsFortran = false) const;
216216

217-
virtual void addPointerAuthFlags(const llvm::opt::ArgList &DriverArgs,
218-
llvm::opt::ArgStringList &CC1Args) const;
219-
220217
/// Find the target-specific subdirectory for the current target triple under
221218
/// \p BaseDir, doing fallback triple searches as necessary.
222219
/// \return The subdirectory path if it exists.

‎clang/lib/Driver/ToolChain.cpp‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -781,32 +781,6 @@ std::string ToolChain::buildCompilerRTBasename(const llvm::opt::ArgList &Args,
781781
return (Prefix + Twine(LibName) + Component + ArchAndEnv + Suffix).str();
782782
}
783783

784-
void ToolChain::addPointerAuthFlags(const llvm::opt::ArgList &DriverArgs,
785-
llvm::opt::ArgStringList &CC1Args) const {
786-
DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_intrinsics,
787-
options::OPT_fno_ptrauth_intrinsics);
788-
DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_calls,
789-
options::OPT_fno_ptrauth_calls);
790-
DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_returns,
791-
options::OPT_fno_ptrauth_returns);
792-
DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_auth_traps,
793-
options::OPT_fno_ptrauth_auth_traps);
794-
DriverArgs.addOptInFlag(
795-
CC1Args, options::OPT_fptrauth_vtable_pointer_address_discrimination,
796-
options::OPT_fno_ptrauth_vtable_pointer_address_discrimination);
797-
DriverArgs.addOptInFlag(
798-
CC1Args, options::OPT_fptrauth_vtable_pointer_type_discrimination,
799-
options::OPT_fno_ptrauth_vtable_pointer_type_discrimination);
800-
DriverArgs.addOptInFlag(
801-
CC1Args, options::OPT_fptrauth_type_info_vtable_pointer_discrimination,
802-
options::OPT_fno_ptrauth_type_info_vtable_pointer_discrimination);
803-
DriverArgs.addOptInFlag(
804-
CC1Args, options::OPT_fptrauth_function_pointer_type_discrimination,
805-
options::OPT_fno_ptrauth_function_pointer_type_discrimination);
806-
DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_indirect_gotos,
807-
options::OPT_fno_ptrauth_indirect_gotos);
808-
}
809-
810784
std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component,
811785
FileType Type, bool IsFortran) const {
812786
// Check for runtime files in the new layout without the architecture first.

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,6 +1665,42 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
16651665

16661666
AddUnalignedAccessWarning(CmdArgs);
16671667

1668+
if (Triple.isOSDarwin() ||
1669+
(Triple.isOSLinux() &&
1670+
Triple.getEnvironment() == llvm::Triple::PAuthTest)) {
1671+
Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_intrinsics,
1672+
options::OPT_fno_ptrauth_intrinsics);
1673+
Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_calls,
1674+
options::OPT_fno_ptrauth_calls);
1675+
Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_returns,
1676+
options::OPT_fno_ptrauth_returns);
1677+
Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_auth_traps,
1678+
options::OPT_fno_ptrauth_auth_traps);
1679+
Args.addOptInFlag(
1680+
CmdArgs, options::OPT_fptrauth_vtable_pointer_address_discrimination,
1681+
options::OPT_fno_ptrauth_vtable_pointer_address_discrimination);
1682+
Args.addOptInFlag(
1683+
CmdArgs, options::OPT_fptrauth_vtable_pointer_type_discrimination,
1684+
options::OPT_fno_ptrauth_vtable_pointer_type_discrimination);
1685+
Args.addOptInFlag(
1686+
CmdArgs, options::OPT_fptrauth_type_info_vtable_pointer_discrimination,
1687+
options::OPT_fno_ptrauth_type_info_vtable_pointer_discrimination);
1688+
Args.addOptInFlag(
1689+
CmdArgs, options::OPT_fptrauth_function_pointer_type_discrimination,
1690+
options::OPT_fno_ptrauth_function_pointer_type_discrimination);
1691+
Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_indirect_gotos,
1692+
options::OPT_fno_ptrauth_indirect_gotos);
1693+
}
1694+
if (Triple.isOSLinux() &&
1695+
Triple.getEnvironment() == llvm::Triple::PAuthTest) {
1696+
Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_init_fini,
1697+
options::OPT_fno_ptrauth_init_fini);
1698+
Args.addOptInFlag(
1699+
CmdArgs, options::OPT_fptrauth_init_fini_address_discrimination,
1700+
options::OPT_fno_ptrauth_init_fini_address_discrimination);
1701+
Args.addOptInFlag(CmdArgs, options::OPT_fptrauth_elf_got,
1702+
options::OPT_fno_ptrauth_elf_got);
1703+
}
16681704
Args.addOptInFlag(CmdArgs, options::OPT_faarch64_jump_table_hardening,
16691705
options::OPT_fno_aarch64_jump_table_hardening);
16701706

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -533,30 +533,12 @@ static void handlePAuthABI(const Driver &D, const ArgList &DriverArgs,
533533
CC1Args.push_back("-faarch64-jump-table-hardening");
534534
}
535535

536-
void Linux::addPointerAuthFlags(const llvm::opt::ArgList &DriverArgs,
537-
llvm::opt::ArgStringList &CC1Args) const {
538-
ToolChain::addPointerAuthFlags(DriverArgs, CC1Args);
539-
540-
DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_init_fini,
541-
options::OPT_fno_ptrauth_init_fini);
542-
543-
DriverArgs.addOptInFlag(
544-
CC1Args, options::OPT_fptrauth_init_fini_address_discrimination,
545-
options::OPT_fno_ptrauth_init_fini_address_discrimination);
546-
547-
DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_elf_got,
548-
options::OPT_fno_ptrauth_elf_got);
549-
}
550-
551536
void Linux::addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
552537
llvm::opt::ArgStringList &CC1Args,
553538
Action::OffloadKind DeviceOffloadKind) const {
554539
llvm::Triple Triple(ComputeEffectiveClangTriple(DriverArgs));
555-
if (Triple.isAArch64() &&
556-
Triple.getEnvironment() == llvm::Triple::PAuthTest) {
557-
addPointerAuthFlags(DriverArgs, CC1Args);
540+
if (Triple.isAArch64() && Triple.getEnvironment() == llvm::Triple::PAuthTest)
558541
handlePAuthABI(getDriver(), DriverArgs, CC1Args);
559-
}
560542
Generic_ELF::addClangTargetOptions(DriverArgs, CC1Args, DeviceOffloadKind);
561543
}
562544

‎clang/lib/Driver/ToolChains/Linux.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ class LLVM_LIBRARY_VISIBILITY Linux : public Generic_ELF {
7474
Tool *buildAssembler() const override;
7575
Tool *buildLinker() const override;
7676
Tool *buildStaticLibTool() const override;
77-
void addPointerAuthFlags(const llvm::opt::ArgList &DriverArgs,
78-
llvm::opt::ArgStringList &CC1Args) const override;
7977
};
8078

8179
} // end namespace toolchains

0 commit comments

Comments
 (0)