subject:"\[clang\] \[lld\] \[llvm\] Rename \-macosx_version_min to \-macosx_version

[clang] [lld] [llvm] Rename -macosx_version_min to -macosx_version_min (PR #88810)

2024-04-15 Thread J. Ryan Stinnett via cfe-commits


jryans wrote:

Perhaps good to edit the PR title, it mentions the same flag twice at the 
moment.

https://github.com/llvm/llvm-project/pull/88810
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [lld] [llvm] Rename -macosx_version_min to -macosx_version_min (PR #88810)

2024-04-15 Thread via cfe-commits


llvmbot wrote:



@llvm/pr-subscribers-clang-driver

@llvm/pr-subscribers-clang

Author: Leland Jansen (lelandjansen)


Changes

`-macosx_version_min` has been renamed to `-macos_version_min`.



---
Full diff: https://github.com/llvm/llvm-project/pull/88810.diff


14 Files Affected:

- (modified) clang/lib/Driver/ToolChains/Darwin.cpp (+2-2) 
- (modified) clang/test/Driver/darwin-ld-platform-version-macos.c (+2-2) 
- (modified) clang/test/Driver/darwin-ld-platform-version-target-version.c 
(+2-2) 
- (modified) clang/test/Driver/darwin-ld.c (+4-4) 
- (modified) clang/test/Driver/darwin-sdkroot.c (+1-1) 
- (modified) clang/test/Driver/darwin-zippered-target-version.c (+5-5) 
- (modified) clang/test/Driver/target-triple-deployment.c (+3-3) 
- (modified) lld/test/MachO/silent-ignore.s (+1-1) 
- (modified) llvm/test/tools/dsymutil/X86/alias.test (+1-1) 
- (modified) llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test (+1-1) 
- (modified) llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test (+1-1) 
- (modified) llvm/test/tools/dsymutil/null-die.test (+1-1) 
- (modified) llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test (+1-1) 
- (modified) llvm/test/tools/lto/hide-linkonce-odr.ll (+1-1) 


``diff
diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp 
b/clang/lib/Driver/ToolChains/Darwin.cpp
index caf6c4a444fdce..a42a31337304f8 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -3143,7 +3143,7 @@ void Darwin::addMinVersionArgs(const ArgList ,
 CmdArgs.push_back("-maccatalyst_version_min");
   else {
 assert(isTargetMacOS() && "unexpected target");
-CmdArgs.push_back("-macosx_version_min");
+CmdArgs.push_back("-macos_version_min");
   }
 
   VersionTuple MinTgtVers = 
getEffectiveTriple().getMinimumSupportedOSVersion();
@@ -3154,7 +3154,7 @@ void Darwin::addMinVersionArgs(const ArgList ,
 assert(isTargetMacOSBased() && "unexpected target");
 VersionTuple VariantTargetVersion;
 if (TargetVariantTriple->isMacOSX()) {
-  CmdArgs.push_back("-macosx_version_min");
+  CmdArgs.push_back("-macos_version_min");
   TargetVariantTriple->getMacOSXVersion(VariantTargetVersion);
 } else {
   assert(TargetVariantTriple->isiOS() &&
diff --git a/clang/test/Driver/darwin-ld-platform-version-macos.c 
b/clang/test/Driver/darwin-ld-platform-version-macos.c
index 355df8dfc1bc20..41636a50111e99 100644
--- a/clang/test/Driver/darwin-ld-platform-version-macos.c
+++ b/clang/test/Driver/darwin-ld-platform-version-macos.c
@@ -34,12 +34,12 @@
 // RUN:   -### %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=ARM64_NEW_1 %s
 
-// LINKER-OLD: "-macosx_version_min" "10.13.0"
+// LINKER-OLD: "-macos_version_min" "10.13.0"
 // LINKER-NEW: "-platform_version" "macos" "10.13.0" "10.14"
 
 // ARM64_NEW: "-platform_version" "macos" "11.0.0" "10.14"
 // ARM64_NEW_1: "-platform_version" "macos" "11.1.0" "10.14"
-// ARM64_OLD: "-macosx_version_min" "11.0.0"
+// ARM64_OLD: "-macos_version_min" "11.0.0"
 
 // RUN: %clang -target x86_64-apple-macos10.13 -mlinker-version=520 \
 // RUN:   -### %t.o 2>&1 \
diff --git a/clang/test/Driver/darwin-ld-platform-version-target-version.c 
b/clang/test/Driver/darwin-ld-platform-version-target-version.c
index cc88e015f82c5b..0728af8a9785c1 100644
--- a/clang/test/Driver/darwin-ld-platform-version-target-version.c
+++ b/clang/test/Driver/darwin-ld-platform-version-target-version.c
@@ -26,5 +26,5 @@
 // ARM64_NEW-INV: "-platform_version" "macos" "11.0.0" "10.15"
 // ARM64_NEW-INV-SAME: "-platform_version" "mac catalyst" "14.0.0" "13.1"
 
-// ARM64_OLD: "-maccatalyst_version_min" "14.0.0" "-macosx_version_min" 
"11.0.0"
-// ARM64_OLD-INV:  "-macosx_version_min" "11.0.0" "-maccatalyst_version_min" 
"14.0.0"
+// ARM64_OLD: "-maccatalyst_version_min" "14.0.0" "-macos_version_min" "11.0.0"
+// ARM64_OLD-INV:  "-macos_version_min" "11.0.0" "-maccatalyst_version_min" 
"14.0.0"
diff --git a/clang/test/Driver/darwin-ld.c b/clang/test/Driver/darwin-ld.c
index f0ca411430cc78..716041429aca5c 100644
--- a/clang/test/Driver/darwin-ld.c
+++ b/clang/test/Driver/darwin-ld.c
@@ -140,15 +140,15 @@
 // RUN: %clang -target x86_64-apple-macosx10.7 -fuse-ld= -mlinker-version=400 
-### %t.o 2>> %t.log
 // RUN: FileCheck -check-prefix=LINK_VERSION_MIN %s < %t.log
 // LINK_VERSION_MIN: {{ld(.exe)?"}}
-// LINK_VERSION_MIN: "-macosx_version_min" "10.6.0"
+// LINK_VERSION_MIN: "-macos_version_min" "10.6.0"
 // LINK_VERSION_MIN: {{ld(.exe)?"}}
-// LINK_VERSION_MIN: "-macosx_version_min" "10.7.0"
+// LINK_VERSION_MIN: "-macos_version_min" "10.7.0"
 
 // RUN: %clang -target x86_64-apple-ios13.1-macabi -fuse-ld= 
-mlinker-version=400 -### %t.o 2>> %t.log
 // RUN: FileCheck -check-prefix=LINK_VERSION_MIN_MACABI %s < %t.log
 // LINK_VERSION_MIN_MACABI: {{ld(.exe)?"}}
 // LINK_VERSION_MIN_MACABI: "-maccatalyst_version_min" "13.1.0"
-// LINK_VERSION_MIN_MACABI-NOT: macosx_version_min
+// LINK_VERSION_MIN_MACABI-NOT: macos_version_min
 //

[clang] [lld] [llvm] Rename -macosx_version_min to -macosx_version_min (PR #88810)

2024-04-15 Thread via cfe-commits


github-actions[bot] wrote:



Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be
notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this 
page.

If this is not working for you, it is probably because you do not have write
permissions for the repository. In which case you can instead tag reviewers by
name in a comment by using `@` followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review
by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate
is once a week. Please remember that you are asking for valuable time from 
other developers.

If you have further questions, they may be answered by the [LLVM GitHub User 
Guide](https://llvm.org/docs/GitHub.html).

You can also ask questions in a comment on this PR, on the [LLVM 
Discord](https://discord.com/invite/xS7Z362) or on the 
[forums](https://discourse.llvm.org/).

https://github.com/llvm/llvm-project/pull/88810
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [lld] [llvm] Rename -macosx_version_min to -macosx_version_min (PR #88810)

2024-04-15 Thread Leland Jansen via cfe-commits


https://github.com/lelandjansen created 
https://github.com/llvm/llvm-project/pull/88810

`-macosx_version_min` has been renamed to `-macos_version_min`.



>From 9635f7deb47e7989383a6c01bdd445cba3e9670a Mon Sep 17 00:00:00 2001
From: Leland Jansen 
Date: Mon, 15 Apr 2024 15:05:56 -0700
Subject: [PATCH] Rename -macosx_version_min to -macosx_version_min

---
 clang/lib/Driver/ToolChains/Darwin.cpp |  4 ++--
 clang/test/Driver/darwin-ld-platform-version-macos.c   |  4 ++--
 .../Driver/darwin-ld-platform-version-target-version.c |  4 ++--
 clang/test/Driver/darwin-ld.c  |  8 
 clang/test/Driver/darwin-sdkroot.c |  2 +-
 clang/test/Driver/darwin-zippered-target-version.c | 10 +-
 clang/test/Driver/target-triple-deployment.c   |  6 +++---
 lld/test/MachO/silent-ignore.s |  2 +-
 llvm/test/tools/dsymutil/X86/alias.test|  2 +-
 llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test |  2 +-
 llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test  |  2 +-
 llvm/test/tools/dsymutil/null-die.test |  2 +-
 llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test|  2 +-
 llvm/test/tools/lto/hide-linkonce-odr.ll   |  2 +-
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp 
b/clang/lib/Driver/ToolChains/Darwin.cpp
index caf6c4a444fdce..a42a31337304f8 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -3143,7 +3143,7 @@ void Darwin::addMinVersionArgs(const ArgList ,
 CmdArgs.push_back("-maccatalyst_version_min");
   else {
 assert(isTargetMacOS() && "unexpected target");
-CmdArgs.push_back("-macosx_version_min");
+CmdArgs.push_back("-macos_version_min");
   }
 
   VersionTuple MinTgtVers = 
getEffectiveTriple().getMinimumSupportedOSVersion();
@@ -3154,7 +3154,7 @@ void Darwin::addMinVersionArgs(const ArgList ,
 assert(isTargetMacOSBased() && "unexpected target");
 VersionTuple VariantTargetVersion;
 if (TargetVariantTriple->isMacOSX()) {
-  CmdArgs.push_back("-macosx_version_min");
+  CmdArgs.push_back("-macos_version_min");
   TargetVariantTriple->getMacOSXVersion(VariantTargetVersion);
 } else {
   assert(TargetVariantTriple->isiOS() &&
diff --git a/clang/test/Driver/darwin-ld-platform-version-macos.c 
b/clang/test/Driver/darwin-ld-platform-version-macos.c
index 355df8dfc1bc20..41636a50111e99 100644
--- a/clang/test/Driver/darwin-ld-platform-version-macos.c
+++ b/clang/test/Driver/darwin-ld-platform-version-macos.c
@@ -34,12 +34,12 @@
 // RUN:   -### %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=ARM64_NEW_1 %s
 
-// LINKER-OLD: "-macosx_version_min" "10.13.0"
+// LINKER-OLD: "-macos_version_min" "10.13.0"
 // LINKER-NEW: "-platform_version" "macos" "10.13.0" "10.14"
 
 // ARM64_NEW: "-platform_version" "macos" "11.0.0" "10.14"
 // ARM64_NEW_1: "-platform_version" "macos" "11.1.0" "10.14"
-// ARM64_OLD: "-macosx_version_min" "11.0.0"
+// ARM64_OLD: "-macos_version_min" "11.0.0"
 
 // RUN: %clang -target x86_64-apple-macos10.13 -mlinker-version=520 \
 // RUN:   -### %t.o 2>&1 \
diff --git a/clang/test/Driver/darwin-ld-platform-version-target-version.c 
b/clang/test/Driver/darwin-ld-platform-version-target-version.c
index cc88e015f82c5b..0728af8a9785c1 100644
--- a/clang/test/Driver/darwin-ld-platform-version-target-version.c
+++ b/clang/test/Driver/darwin-ld-platform-version-target-version.c
@@ -26,5 +26,5 @@
 // ARM64_NEW-INV: "-platform_version" "macos" "11.0.0" "10.15"
 // ARM64_NEW-INV-SAME: "-platform_version" "mac catalyst" "14.0.0" "13.1"
 
-// ARM64_OLD: "-maccatalyst_version_min" "14.0.0" "-macosx_version_min" 
"11.0.0"
-// ARM64_OLD-INV:  "-macosx_version_min" "11.0.0" "-maccatalyst_version_min" 
"14.0.0"
+// ARM64_OLD: "-maccatalyst_version_min" "14.0.0" "-macos_version_min" "11.0.0"
+// ARM64_OLD-INV:  "-macos_version_min" "11.0.0" "-maccatalyst_version_min" 
"14.0.0"
diff --git a/clang/test/Driver/darwin-ld.c b/clang/test/Driver/darwin-ld.c
index f0ca411430cc78..716041429aca5c 100644
--- a/clang/test/Driver/darwin-ld.c
+++ b/clang/test/Driver/darwin-ld.c
@@ -140,15 +140,15 @@
 // RUN: %clang -target x86_64-apple-macosx10.7 -fuse-ld= -mlinker-version=400 
-### %t.o 2>> %t.log
 // RUN: FileCheck -check-prefix=LINK_VERSION_MIN %s < %t.log
 // LINK_VERSION_MIN: {{ld(.exe)?"}}
-// LINK_VERSION_MIN: "-macosx_version_min" "10.6.0"
+// LINK_VERSION_MIN: "-macos_version_min" "10.6.0"
 // LINK_VERSION_MIN: {{ld(.exe)?"}}
-// LINK_VERSION_MIN: "-macosx_version_min" "10.7.0"
+// LINK_VERSION_MIN: "-macos_version_min" "10.7.0"
 
 // RUN: %clang -target x86_64-apple-ios13.1-macabi -fuse-ld= 
-mlinker-version=400 -### %t.o 2>> %t.log
 // RUN: FileCheck -check-prefix=LINK_VERSION_MIN_MACABI %s < %t.log
 // LINK_VERSION_MIN_MACABI: {{ld(.exe)?"}}
 // LINK_VERSION_MIN_MACABI: "-maccatalyst_version_min" "13.1.0"
-//

[clang] [lld] [llvm] Rename -macosx_version_min to -macosx_version_min (PR #88810)

[clang] [lld] [llvm] Rename -macosx_version_min to -macosx_version_min (PR #88810)

[clang] [lld] [llvm] Rename -macosx_version_min to -macosx_version_min (PR #88810)

[clang] [lld] [llvm] Rename -macosx_version_min to -macosx_version_min (PR #88810)

4 matches

Site Navigation

Mail list logo

Footer information