[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 &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"

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

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

https://github.com/lelandjansen edited 
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 -macos_version_min (PR #88810)

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

lelandjansen wrote:

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

Good catch. Thank you.

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 -macos_version_min (PR #88810)

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

lelandjansen wrote:

Ping

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 -macos_version_min (PR #88810)

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

lelandjansen wrote:

@jryans Would you be able to approve this PR?

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 -macos_version_min (PR #88810)

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

lelandjansen wrote:

> How are we ending up in this code path?

@JDevlieghere We're trying to build a release on macOS following [these 
steps](https://github.com/llvm/llvm-project/blob/5e6bb1fb885abec2e8bc85422bbd83fe4ece6d3b/llvm/docs/ReleaseProcess.rst#L54)
 and are getting a linker warning for the outdated flag name.

E.g., (from test-release.sh)

```
/path/to/llvm-project/final/Phase2/Release/llvmCore-18.1.3-final.install/usr/local/bin/clang
  -fPIC -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra 
-Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers 
-pedantic -Wno-long-long -Wc++98-compat-extra-semi -Wimplicit-fallthrough 
-Wcovered-switch-default -Wstring-conversion -Wmisleading-indentation 
-Wctad-maybe-unsupported -Wall -fcolor-diagnostics -Wcast-qual 
-Wformat-pedantic -Wimplicit-fallthrough -Wsign-compare 
-Wno-enum-constexpr-conversion -Wno-extra -Wno-pedantic 
-fno-semantic-interposition -fdata-sections -O3 -DNDEBUG -arch arm64 -isysroot 
/Applications/Xcode-15.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk
 -mmacosx-version-min=10.15 -dynamiclib -Wl,-headerpad_max_install_names 
-current_version 5.0 -compatibility_version 5.0 -o ../../../../lib/libomp.dylib 
-install_name @rpath/libomp.dylib CMakeFiles/omp.dir/kmp_alloc.cpp.o 
CMakeFiles/omp.dir/kmp_atomic.cpp.o CMakeFiles/omp.dir/kmp_csupport.cpp.o 
CMakeFiles/omp.dir/kmp_debug.cpp.o CMakeFiles/omp.dir/kmp_itt.cpp.o 
CMakeFiles/omp.dir/kmp_environment.cpp.o CMakeFiles/omp.dir/kmp_error.cpp.o 
CMakeFiles/omp.dir/kmp_global.cpp.o CMakeFiles/omp.dir/kmp_i18n.cpp.o 
CMakeFiles/omp.dir/kmp_io.cpp.o CMakeFiles/omp.dir/kmp_runtime.cpp.o 
CMakeFiles/omp.dir/kmp_settings.cpp.o CMakeFiles/omp.dir/kmp_str.cpp.o 
CMakeFiles/omp.dir/kmp_tasking.cpp.o CMakeFiles/omp.dir/kmp_threadprivate.cpp.o 
CMakeFiles/omp.dir/kmp_utility.cpp.o CMakeFiles/omp.dir/kmp_barrier.cpp.o 
CMakeFiles/omp.dir/kmp_wait_release.cpp.o CMakeFiles/omp.dir/kmp_affinity.cpp.o 
CMakeFiles/omp.dir/kmp_dispatch.cpp.o CMakeFiles/omp.dir/kmp_lock.cpp.o 
CMakeFiles/omp.dir/kmp_sched.cpp.o CMakeFiles/omp.dir/kmp_collapse.cpp.o 
CMakeFiles/omp.dir/z_Linux_util.cpp.o CMakeFiles/omp.dir/kmp_gsupport.cpp.o 
CMakeFiles/omp.dir/thirdparty/ittnotify/ittnotify_static.cpp.o 
CMakeFiles/omp.dir/kmp_taskdeps.cpp.o CMakeFiles/omp.dir/kmp_cancel.cpp.o 
CMakeFiles/omp.dir/kmp_ftn_cdecl.cpp.o CMakeFiles/omp.dir/kmp_ftn_extra.cpp.o 
CMakeFiles/omp.dir/kmp_version.cpp.o "CMakeFiles/omp.dir/ompt-general.cpp.o" 
CMakeFiles/omp.dir/z_Linux_asm.S.o
```

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 -macos_version_min (PR #88810)

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

lelandjansen wrote:

`Host linker version: 1015.7`

I'm happy to close this PR and debug/reopen the issue if the warning becomes a 
problem.

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 -macos_version_min (PR #88810)

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

https://github.com/lelandjansen closed 
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