Make -mbranch-protection=bti the default on OpenBSD.

kettenis · kettenis · commit 990129f49dcc · 2023-04-17T18:10:26.000Z
ok deraadt@
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/Clang.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/Clang.cpp
@@ -1818,6 +1818,9 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
         Args.MakeArgString(Twine("-msign-return-address-key=") + Key));
     if (IndirectBranches)
       CmdArgs.push_back("-mbranch-target-enforce");
+  } else {
+    if (Triple.isOSOpenBSD())
+      CmdArgs.push_back("-mbranch-target-enforce");
   }
 
   // Handle -msve_vector_bits=<bits>

Original file line number	Diff line number	Diff line change
`@@ -1818,6 +1818,9 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,`
`1818`	`1818`	`Args.MakeArgString(Twine("-msign-return-address-key=") + Key));`
`1819`	`1819`	`if (IndirectBranches)`
`1820`	`1820`	`CmdArgs.push_back("-mbranch-target-enforce");`
	`1821`	`+ } else {`
	`1822`	`+ if (Triple.isOSOpenBSD())`
	`1823`	`+ CmdArgs.push_back("-mbranch-target-enforce");`
`1821`	`1824`	`}`
`1822`	`1825`
`1823`	`1826`	`// Handle -msve_vector_bits=<bits>`