Author: Un1q32 Date: 2025-06-09T20:56:08+08:00 New Revision: 251a43e19369b833bcf3b6eba7366b70d208668e
URL: https://github.com/llvm/llvm-project/commit/251a43e19369b833bcf3b6eba7366b70d208668e DIFF: https://github.com/llvm/llvm-project/commit/251a43e19369b833bcf3b6eba7366b70d208668e.diff LOG: [Clang] Link libgcc_s.1.dylib when building for macOS 10.5 and older (#141401) Added: Modified: clang/lib/Driver/ToolChains/Darwin.cpp clang/test/Driver/darwin-ld.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index 77d857b32d67e..59f423b633464 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -1642,14 +1642,16 @@ void DarwinClang::AddLinkRuntimeLibArgs(const ArgList &Args, CmdArgs.push_back("-lSystem"); // Select the dynamic runtime library and the target specific static library. - if (isTargetIOSBased()) { - // If we are compiling as iOS / simulator, don't attempt to link libgcc_s.1, - // it never went into the SDK. - // Linking against libgcc_s.1 isn't needed for iOS 5.0+ - if (isIPhoneOSVersionLT(5, 0) && !isTargetIOSSimulator() && - getTriple().getArch() != llvm::Triple::aarch64) - CmdArgs.push_back("-lgcc_s.1"); - } + // Some old Darwin versions put builtins, libunwind, and some other stuff in + // libgcc_s.1.dylib. MacOS X 10.6 and iOS 5 moved those functions to + // libSystem, and made libgcc_s.1.dylib a stub. We never link libgcc_s when + // building for aarch64 or iOS simulator, since libgcc_s was made obsolete + // before either existed. + if (getTriple().getArch() != llvm::Triple::aarch64 && + ((isTargetIOSBased() && isIPhoneOSVersionLT(5, 0) && + !isTargetIOSSimulator()) || + (isTargetMacOSBased() && isMacosxVersionLT(10, 6)))) + CmdArgs.push_back("-lgcc_s.1"); AddLinkRuntimeLib(Args, CmdArgs, "builtins"); } diff --git a/clang/test/Driver/darwin-ld.c b/clang/test/Driver/darwin-ld.c index f0ca411430cc7..9a8d98cdb9c2c 100644 --- a/clang/test/Driver/darwin-ld.c +++ b/clang/test/Driver/darwin-ld.c @@ -240,6 +240,15 @@ // RUN: FileCheck -check-prefix=LINK_NO_IOS_ARM64_LIBGCC_S %s < %t.log // LINK_NO_IOS_ARM64_LIBGCC_S-NOT: lgcc_s.1 +// Check that clang links with libgcc_s.1 for Mac OS X 10.5 and earlier, but not arm64 +// RUN: %clang -target x86_64-apple-macosx10.5 -mmacosx-version-min=10.5 -### %t.o 2> %t.log +// RUN: FileCheck -check-prefix=LINK_OSX_LIBGCC_S %s < %t.log +// LINK_OSX_LIBGCC_S: lgcc_s.1 + +// RUN: %clang -target arm64-apple-macosx10.5 -mmacosx-version-min=10.5 -### %t.o 2> %t.log +// RUN: FileCheck -check-prefix=LINK_NO_OSX_ARM64_LIBGCC_S %s < %t.log +// LINK_NO_OSX_ARM64_LIBGCC_S-NOT: lgcc_s.1 + // RUN: %clang -target x86_64-apple-darwin12 -rdynamic -### %t.o \ // RUN: -fuse-ld= -mlinker-version=100 2> %t.log // RUN: FileCheck -check-prefix=LINK_NO_EXPORT_DYNAMIC %s < %t.log @@ -385,4 +394,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" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
