https://github.com/dragon-archer created https://github.com/llvm/llvm-project/pull/219949
libmoldname has been empty and deprecated for a long time. See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=127135 >From 3ff699d26372e1ae628ba7d8420b177a9392f8f6 Mon Sep 17 00:00:00 2001 From: Zhongteng Gui <[email protected]> Date: Mon, 31 Aug 2026 19:43:37 +0800 Subject: [PATCH] [clang][mingw] Don't link to moldname libmoldname has been empty and deprecated for a long time. See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=127135 --- clang/lib/Driver/ToolChains/MinGW.cpp | 1 - clang/test/Driver/mingw.cpp | 1 - compiler-rt/cmake/config-ix.cmake | 4 ++-- compiler-rt/lib/builtins/CMakeLists.txt | 4 ++-- compiler-rt/test/builtins/Unit/lit.cfg.py | 2 +- libcxx/cmake/config-ix.cmake | 4 ++-- libcxxabi/cmake/config-ix.cmake | 4 ++-- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/clang/lib/Driver/ToolChains/MinGW.cpp b/clang/lib/Driver/ToolChains/MinGW.cpp index 65120931d8181..de179e37a5921 100644 --- a/clang/lib/Driver/ToolChains/MinGW.cpp +++ b/clang/lib/Driver/ToolChains/MinGW.cpp @@ -86,7 +86,6 @@ void tools::MinGW::Linker::AddLibGCC(const ArgList &Args, } if (!NoLibc) { - CmdArgs.push_back("-lmoldname"); CmdArgs.push_back("-lmingwex"); for (auto Lib : Args.getAllArgValues(options::OPT_l)) { if (StringRef(Lib).starts_with("msvcr") || diff --git a/clang/test/Driver/mingw.cpp b/clang/test/Driver/mingw.cpp index 9affd3ba6d5db..38859c4bcd844 100644 --- a/clang/test/Driver/mingw.cpp +++ b/clang/test/Driver/mingw.cpp @@ -102,7 +102,6 @@ // CHECK_MINGW_NOLIBC-NOT: "-lkernel32" // CHECK_MINGW_NOLIBC-NOT: "-lmingw32" // CHECK_MINGW_NOLIBC-NOT: "-lmingwex" -// CHECK_MINGW_NOLIBC-NOT: "-lmoldname" // CHECK_MINGW_NOLIBC-NOT: "-lmsvcrt" // CHECK_MINGW_NOLIBC-NOT: "-lshell32" // CHECK_MINGW_NOLIBC-NOT: "-luser32" diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 34a00a13f5dc0..fd51deb323184 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -61,9 +61,9 @@ if (C_SUPPORTS_NODEFAULTLIBS_FLAG) else () set(MINGW_RUNTIME gcc_s gcc) endif() - set(MINGW_LIBRARIES mingw32 ${MINGW_RUNTIME} moldname mingwex msvcrt advapi32 + set(MINGW_LIBRARIES mingw32 ${MINGW_RUNTIME} mingwex msvcrt advapi32 shell32 user32 kernel32 mingw32 ${MINGW_RUNTIME} - moldname mingwex msvcrt) + mingwex msvcrt) list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES}) endif() if (NOT TARGET unwind) diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index 12a3b068b3373..5c52481dc2290 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -42,8 +42,8 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if(MINGW) # Simplified version of what's set in cmake/config-ix.cmake; not including # builtins, which are linked separately. - set(MINGW_LIBRARIES mingw32 moldname mingwex msvcrt advapi32 shell32 - user32 kernel32 mingw32 moldname mingwex msvcrt) + set(MINGW_LIBRARIES mingw32 mingwex msvcrt advapi32 shell32 + user32 kernel32 mingw32 mingwex msvcrt) endif() endif() diff --git a/compiler-rt/test/builtins/Unit/lit.cfg.py b/compiler-rt/test/builtins/Unit/lit.cfg.py index 05f97844f5470..17377852dd1fd 100644 --- a/compiler-rt/test/builtins/Unit/lit.cfg.py +++ b/compiler-rt/test/builtins/Unit/lit.cfg.py @@ -70,7 +70,7 @@ def get_libgcc_file_name(): ( "%librt ", base_lib - + " -lmingw32 -lmoldname -lmingwex -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32 ", + + " -lmingw32 -lmingwex -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32 ", ) ) else: diff --git a/libcxx/cmake/config-ix.cmake b/libcxx/cmake/config-ix.cmake index 270d80575adcf..333c3f503af01 100644 --- a/libcxx/cmake/config-ix.cmake +++ b/libcxx/cmake/config-ix.cmake @@ -74,9 +74,9 @@ if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG AND C_SUPPORTS_NODEFAULTLIBS_FLAG) else () set(MINGW_RUNTIME gcc_s gcc) endif() - set(MINGW_LIBRARIES mingw32 ${MINGW_RUNTIME} moldname mingwex msvcrt advapi32 + set(MINGW_LIBRARIES mingw32 ${MINGW_RUNTIME} mingwex msvcrt advapi32 shell32 user32 kernel32 mingw32 ${MINGW_RUNTIME} - moldname mingwex msvcrt) + mingwex msvcrt) list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES}) endif() endif() diff --git a/libcxxabi/cmake/config-ix.cmake b/libcxxabi/cmake/config-ix.cmake index 10f2087c68c5e..1417aaf5893bb 100644 --- a/libcxxabi/cmake/config-ix.cmake +++ b/libcxxabi/cmake/config-ix.cmake @@ -64,9 +64,9 @@ if (NOT CXX_SUPPORTS_NOSTDLIBXX_FLAG AND C_SUPPORTS_NODEFAULTLIBS_FLAG) else () set(MINGW_RUNTIME gcc_s gcc) endif() - set(MINGW_LIBRARIES mingw32 ${MINGW_RUNTIME} moldname mingwex msvcrt advapi32 + set(MINGW_LIBRARIES mingw32 ${MINGW_RUNTIME} mingwex msvcrt advapi32 shell32 user32 kernel32 mingw32 ${MINGW_RUNTIME} - moldname mingwex msvcrt) + mingwex msvcrt) list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES}) endif() endif() _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
