diff --git a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
index fa2bd8132..2d3e95bd6 100644
--- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
+++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift
@@ -128,7 +128,7 @@ extension GenericUnixToolchain {
         }
       }
 
-      if targetTriple.os == .openbsd && targetTriple.arch == .aarch64 {
+      if targetTriple.os == .openbsd && (targetTriple.arch == .aarch64 || targetTriple.arch == .x86_64) {
         let btcfiEnabled = targetInfo.target.openbsdBTCFIEnabled ?? false
         if !btcfiEnabled {
           commandLine.appendFlag("-Xlinker")
diff --git a/Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift b/Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift
index fc241bd96..6b55914c4 100644
--- a/Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift
+++ b/Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift
@@ -170,7 +170,7 @@ public final class GenericUnixToolchain: Toolchain {
       try commandLine.appendPath(VirtualPath(path: sysroot.pathString))
     }
 
-    if driver.targetTriple.os == .openbsd && driver.targetTriple.arch == .aarch64 {
+    if driver.targetTriple.os == .openbsd && (driver.targetTriple.arch == .aarch64 || driver.targetTriple.arch == .x86_64) {
       if frontendTargetInfo.target.openbsdBTCFIEnabled ?? false {
         commandLine.appendFlag(.Xcc)
         commandLine.appendFlag("-Xclang=-msign-return-address=non-leaf")