Merge pull request #85025 from 3405691582/nobtcfi_amd64

3405691582 · web-flow · commit 25543a56fcd9 · 2025-10-23T21:23:53.000-04:00
Supply -z,nobtcfi on x86_64 as well.
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -995,7 +995,7 @@ function(add_swift_host_tool executable)
   endif()
 
   # Opt-out of OpenBSD BTCFI if instructed where it is enforced by default.
-  if(SWIFT_HOST_VARIANT_SDK STREQUAL "OPENBSD" AND SWIFT_HOST_VARIANT_ARCH STREQUAL "aarch64" AND NOT SWIFT_OPENBSD_BTCFI)
+  if(SWIFT_HOST_VARIANT_SDK STREQUAL "OPENBSD" AND SWIFT_HOST_VARIANT_ARCH MATCHES "aarch64|x86_64" AND NOT SWIFT_OPENBSD_BTCFI)
     target_link_options(${executable} PRIVATE "LINKER:-z,nobtcfi")
   endif()
 
diff --git a/lib/Basic/Platform.cpp b/lib/Basic/Platform.cpp
@@ -150,7 +150,10 @@ bool swift::tripleRequiresRPathForSwiftLibrariesInOS(
 }
 
 bool swift::tripleBTCFIByDefaultInOpenBSD(const llvm::Triple &triple) {
-  return triple.isOSOpenBSD() && triple.getArch() == llvm::Triple::aarch64;
+  return triple.isOSOpenBSD() && (
+     triple.getArch() == llvm::Triple::aarch64 ||
+     triple.getArch() == llvm::Triple::x86_64);
+
 }
 
 DarwinPlatformKind swift::getDarwinPlatformKind(const llvm::Triple &triple) {

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,10 @@ bool swift::tripleRequiresRPathForSwiftLibrariesInOS(`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`bool swift::tripleBTCFIByDefaultInOpenBSD(const llvm::Triple &triple) {`
`153`		`- return triple.isOSOpenBSD() && triple.getArch() == llvm::Triple::aarch64;`
	`153`	`+ return triple.isOSOpenBSD() && (`
	`154`	`+ triple.getArch() == llvm::Triple::aarch64 \|\|`
	`155`	`+ triple.getArch() == llvm::Triple::x86_64);`
	`156`	`+`
`154`	`157`	`}`
`155`	`158`
`156`	`159`	`DarwinPlatformKind swift::getDarwinPlatformKind(const llvm::Triple &triple) {`