Rename -macosx_version_min to -macos_version_min #88810
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be 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 If you have received no comments on your PR for a week, you can request a review If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
llvmbot
added
clang
|
@llvm/pr-subscribers-lld-macho @llvm/pr-subscribers-clang Author: Leland Jansen (lelandjansen) Changes
Full diff: https://github.com/llvm/llvm-project/pull/88810.diff 14 Files Affected:
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 &Args,
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 &Args,
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
// LINK_VERSION_MIN_MACABI-NOT: macos_version_min
// RUN: %clang -target x86_64-apple-darwin12 -### %t.o 2> %t.log
@@ -385,4 +385,4 @@
// RUN: %clang -target armv7em-apple-darwin -mno-outline -### %t.o 2> %t.log
// RUN: FileCheck -check-prefix=ARMV7EM-MNO_OUTLINE %s < %t.log
// ARMV7EM-MNO_OUTLINE: {{ld(.exe)?"}}
-// ARMV7EM-MNO_OUTLINE-SAME: "-mllvm" "-enable-machine-outliner=never" "-mllvm" "-enable-linkonceodr-outlining"
\ No newline at end of file
+// ARMV7EM-MNO_OUTLINE-SAME: "-mllvm" "-enable-machine-outliner=never" "-mllvm" "-enable-linkonceodr-outlining"
diff --git a/clang/test/Driver/darwin-sdkroot.c b/clang/test/Driver/darwin-sdkroot.c
index 9cb0265a9bfb91..5f38f78d15277e 100644
--- a/clang/test/Driver/darwin-sdkroot.c
+++ b/clang/test/Driver/darwin-sdkroot.c
@@ -73,4 +73,4 @@
// CHECK-MACOSX: "-cc1"
// CHECK-MACOSX: "-triple" "x86_64-apple-macosx10.10.0"
// CHECK-MACOSX: ld
-// CHECK-MACOSX: "-macosx_version_min" "10.10.0"
+// CHECK-MACOSX: "-macos_version_min" "10.10.0"
diff --git a/clang/test/Driver/darwin-zippered-target-version.c b/clang/test/Driver/darwin-zippered-target-version.c
index 0f739a44f4d4aa..4f28d78063e486 100644
--- a/clang/test/Driver/darwin-zippered-target-version.c
+++ b/clang/test/Driver/darwin-zippered-target-version.c
@@ -6,11 +6,11 @@
// RUN: -darwin-target-variant x86_64-apple-macos10.15 \
// RUN: %s -fuse-ld= -mlinker-version=400 -### 2>&1 | FileCheck --check-prefix=INVERTED %s
-// CHECK: "-arch" "x86_64" "-macosx_version_min" "10.15.0" "-maccatalyst_version_min" "13.1"
-// CHECK: "-arch" "x86_64h" "-macosx_version_min" "10.15.0" "-maccatalyst_version_min" "13.1"
-// CHECK: "-arch" "i386" "-macosx_version_min" "10.15.0"
+// CHECK: "-arch" "x86_64" "-macos_version_min" "10.15.0" "-maccatalyst_version_min" "13.1"
+// CHECK: "-arch" "x86_64h" "-macos_version_min" "10.15.0" "-maccatalyst_version_min" "13.1"
+// CHECK: "-arch" "i386" "-macos_version_min" "10.15.0"
// CHECK-NOT: maccatalyst_version_min
-// INVERTED: "-arch" "x86_64" "-maccatalyst_version_min" "13.1.0" "-macosx_version_min" "10.15"
+// INVERTED: "-arch" "x86_64" "-maccatalyst_version_min" "13.1.0" "-macos_version_min" "10.15"
// INVERTED: "-arch" "x86_64h" "-maccatalyst_version_min" "13.1.0"
-// INVERTED-NOT: macosx_version_min
+// INVERTED-NOT: macos_version_min
diff --git a/clang/test/Driver/target-triple-deployment.c b/clang/test/Driver/target-triple-deployment.c
index 2e29992502ed43..6301b1b568f091 100644
--- a/clang/test/Driver/target-triple-deployment.c
+++ b/clang/test/Driver/target-triple-deployment.c
@@ -15,13 +15,13 @@
// RUN: FileCheck %s < %t.log
// CHECK: {{ld(.exe)?"}}
-// CHECK: -macosx_version_min
+// CHECK: -macos_version_min
// CHECK: 10.4.0
// CHECK: {{ld(.exe)?"}}
-// CHECK: -macosx_version_min
+// CHECK: -macos_version_min
// CHECK: 10.5.0
// CHECK: {{ld(.exe)?"}}
-// CHECK: -macosx_version_min
+// CHECK: -macos_version_min
// CHECK: 10.7.0
// CHECK: {{ld(.exe)?"}}
// CHECK: -iphoneos_version_min
diff --git a/lld/test/MachO/silent-ignore.s b/lld/test/MachO/silent-ignore.s
index 58c3cc148f07b0..3351fa5141f6f1 100644
--- a/lld/test/MachO/silent-ignore.s
+++ b/lld/test/MachO/silent-ignore.s
@@ -7,7 +7,7 @@
# RUN: %lld --version \
# RUN: -dynamic \
# RUN: -lto_library /lib/foo \
-# RUN: -macosx_version_min 0 \
+# RUN: -macos_version_min 0 \
# RUN: -no_dtrace_dof \
# RUN: -dependency_info /path/to/dependency_info.dat \
# RUN: -lto_library ../lib/libLTO.dylib \
diff --git a/llvm/test/tools/dsymutil/X86/alias.test b/llvm/test/tools/dsymutil/X86/alias.test
index af6ebd52496a85..34e72c61f98927 100644
--- a/llvm/test/tools/dsymutil/X86/alias.test
+++ b/llvm/test/tools/dsymutil/X86/alias.test
@@ -20,4 +20,4 @@
# Compile with:
# $ clang -g -O0 bar.c -c -o bar.o
# $ clang -g -O0 foo.c -c -o foo.o
-# $ ld -arch x86_64 -macosx_version_min 10.13.0 foo.o bar.o -lSystem -alias _foo _bar -o foobar
+# $ ld -arch x86_64 -macos_version_min 10.13.0 foo.o bar.o -lSystem -alias _foo _bar -o foobar
diff --git a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
index bc59414a6ba7a8..4d29b11acba00e 100644
--- a/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
+++ b/llvm/test/tools/dsymutil/X86/swift-ast-x86_64.test
@@ -14,7 +14,7 @@ let x = 1
Compiled with:
swiftc /tmp/test.swift -Onone -target x86_64-apple-macosx10.9 -c
- ld swift-ast.o -add_ast_path Inputs/swift-ast.swiftmodule -arch x86_64 -lSystem -macosx_version_min 10.9.0
+ ld swift-ast.o -add_ast_path Inputs/swift-ast.swiftmodule -arch x86_64 -lSystem -macos_version_min 10.9.0
DSYMUTIL: filename:{{.*}}swift-ast.swiftmodule
DSYMUTIL-NOT: The file was not recognized as a valid object file
diff --git a/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test b/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test
index 3879f31e8ab0dd..dab3567ee619df 100644
--- a/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test
+++ b/llvm/test/tools/dsymutil/X86/swift-dwarf-loc.test
@@ -32,7 +32,7 @@ target triple = "x86_64-apple-macosx10.12"
!12 = !{i32 2, !"Debug Info Version", i32 3}
Compiled with: llc -filetype=obj %p/../Inputs/swift-dwarf-loc.ll -mtriple x86_64-apple-darwin
-Linked with: ld -dylib %T/swift-dwarf-loc.o -arch x86_64 -lSystem -macosx_version_min 10.9.0
+Linked with: ld -dylib %T/swift-dwarf-loc.o -arch x86_64 -lSystem -macos_version_min 10.9.0
CHECK: __var,
CHECK-NOT: __var,{{.*}}binAddr: 0x0000000000000000
diff --git a/llvm/test/tools/dsymutil/null-die.test b/llvm/test/tools/dsymutil/null-die.test
index f046c5a27968d3..21a42f7a0e9226 100644
--- a/llvm/test/tools/dsymutil/null-die.test
+++ b/llvm/test/tools/dsymutil/null-die.test
@@ -25,7 +25,7 @@
#
# To generate the debug map:
#
-# $ ld -arch x86_64 -macosx_version_min 10.13.0 -lSystem null_die.o -o null_die
+# $ ld -arch x86_64 -macos_version_min 10.13.0 -lSystem null_die.o -o null_die
# $ dsymutil -dump-debug-map null_die
---
diff --git a/llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test b/llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test
index 9314f1126cec6d..6cc49ffdea7fa4 100644
--- a/llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test
+++ b/llvm/test/tools/llvm-objdump/MachO/LLVM-bundle.test
@@ -23,7 +23,7 @@
# CHECK: </dylibs>
# CHECK: <link-options>
# CHECK: <option>-execute</option>
-# CHECK: <option>-macosx_version_min</option>
+# CHECK: <option>-macos_version_min</option>
# CHECK: <option>10.11.0</option>
# CHECK: <option>-e</option>
# CHECK: <option>_main</option>
diff --git a/llvm/test/tools/lto/hide-linkonce-odr.ll b/llvm/test/tools/lto/hide-linkonce-odr.ll
index 19d0fa75214d7b..475cbebe28b30e 100644
--- a/llvm/test/tools/lto/hide-linkonce-odr.ll
+++ b/llvm/test/tools/lto/hide-linkonce-odr.ll
@@ -1,5 +1,5 @@
; RUN: llvm-as %s -o %t.o
-; RUN: %ld64 -lto_library %llvmshlibdir/libLTO.dylib -dylib -arch x86_64 -macosx_version_min 10.10.0 -o %t.dylib %t.o -save-temps -undefined dynamic_lookup -exported_symbol _c -exported_symbol _b -exported_symbol _GlobLinkonce -lSystem
+; RUN: %ld64 -lto_library %llvmshlibdir/libLTO.dylib -dylib -arch x86_64 -macos_version_min 10.10.0 -o %t.dylib %t.o -save-temps -undefined dynamic_lookup -exported_symbol _c -exported_symbol _b -exported_symbol _GlobLinkonce -lSystem
; RUN: llvm-dis %t.dylib.lto.opt.bc -o - | FileCheck --check-prefix=IR %s
; check that @a is no longer a linkonce_odr definition
|
|
Perhaps good to edit the PR title, it mentions the same flag twice at the moment. |
lelandjansen
changed the title
Good catch. Thank you. |
|
Ping |
|
@jryans Would you be able to approve this PR? |
jryans
reviewed
Apr 24, 2024
There was a problem hiding this comment.
AIUI, this is straightforward case of updating tools to use new option names. I suppose there is a chance it triggers failures in e.g. older linkers that don't support the newer names, but I assume on Apple platforms there's less risk of that anyway.
Do you happen to know when the new name was first added to the linker?
JDevlieghere
requested changes
Apr 24, 2024
There was a problem hiding this comment.
We should be using -platform-version for newer versions of the linker.
if (Version >= VersionTuple(520) || LinkerIsLLD || UsePlatformVersion)
MachOTC.addPlatformVersionArgs(Args, CmdArgs);
else
MachOTC.addMinVersionArgs(Args, CmdArgs);
How are we ending up in this code path?
@JDevlieghere We're trying to build a release on macOS following these steps and are getting a linker warning for the outdated flag name. E.g., (from test-release.sh) |
|
Right, my point is that (I think) that doesn't make sense. AFAIK I'd start by debugging clang and seeing what the claimed version number is. The version is either passed in with |
|
I'm happy to close this PR and debug/reopen the issue if the warning becomes a problem. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
-macosx_version_minhas been renamed to-macos_version_min.