[clang] Make armv6 iOS by default instead of macOS when targeting Darwin (PR #117243)

via cfe-commits cfe-commits at lists.llvm.org
Tue Dec 3 18:02:39 PST 2024


https://github.com/Un1q32 updated https://github.com/llvm/llvm-project/pull/117243

>From 4a746cbe467f4ad22436dc206a8966ecaa77892f Mon Sep 17 00:00:00 2001
From: Un1q32 <joey.t.reinhart at gmail.com>
Date: Thu, 21 Nov 2024 17:31:07 -0500
Subject: [PATCH] make armv6-darwin iOS by default

---
 clang/lib/Driver/ToolChains/Darwin.cpp | 3 ++-
 clang/test/Driver/darwin-version.c     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index 87380869f6fdab..3b858577ce625b 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -2145,7 +2145,8 @@ inferDeploymentTargetFromArch(DerivedArgList &Args, const Darwin &Toolchain,
   StringRef MachOArchName = Toolchain.getMachOArchName(Args);
   if (MachOArchName == "arm64" || MachOArchName == "arm64e")
     OSTy = llvm::Triple::MacOSX;
-  else if (MachOArchName == "armv7" || MachOArchName == "armv7s")
+  else if (MachOArchName == "armv7" || MachOArchName == "armv7s" ||
+           MachOArchName == "armv6")
     OSTy = llvm::Triple::IOS;
   else if (MachOArchName == "armv7k" || MachOArchName == "arm64_32")
     OSTy = llvm::Triple::WatchOS;
diff --git a/clang/test/Driver/darwin-version.c b/clang/test/Driver/darwin-version.c
index ff05d4c10c4877..a00bd832dc8028 100644
--- a/clang/test/Driver/darwin-version.c
+++ b/clang/test/Driver/darwin-version.c
@@ -1,6 +1,6 @@
 // RUN: %clang -target armv6-apple-darwin9 -c %s -### 2>&1 | \
-// RUN:   FileCheck --check-prefix=CHECK-VERSION-OSX %s
-// CHECK-VERSION-OSX: "armv6k-apple-macosx10.5.0"
+// RUN:   FileCheck --check-prefix=CHECK-VERSION-IOS %s
+// CHECK-VERSION-IOS: "armv6k-apple-ios5.0.0"
 // RUN: %clang -target armv6-apple-darwin9 -miphoneos-version-min=2.0 -c %s -### 2>&1 | \
 // RUN:   FileCheck --check-prefix=CHECK-VERSION-IOS2 %s
 // CHECK-VERSION-IOS2: "armv6k-apple-ios2.0.0"



More information about the cfe-commits mailing list