[clang] 3731f41 - [Clang][Driver][MIPS] Fix musl dynamic linker path (#240826)

via cfe-commits cfe-commits at lists.llvm.org
Tue Nov 10 19:47:00 PST 2026


Author: Pepper Gray
Date: 2026-11-11T04:46:55+01:00
New Revision: 3731f4119f461c3b8f9e910831516f509c09a500

URL: https://github.com/llvm/llvm-project/commit/3731f4119f461c3b8f9e910831516f509c09a500
DIFF: https://github.com/llvm/llvm-project/commit/3731f4119f461c3b8f9e910831516f509c09a500.diff

LOG: [Clang][Driver][MIPS] Fix musl dynamic linker path (#240826)

Clang's Linux driver selects an incorrect dynamic linker for several
MIPS musl configurations.

- select the correct musl dynamic linker for MIPS targets
- add driver tests

Closes: #240798

Signed-off-by: Pepper Gray <hello at peppergray.xyz>

Added: 
    

Modified: 
    clang/lib/Driver/ToolChains/Linux.cpp
    clang/test/Driver/linux-ld.c

Removed: 
    


################################################################################
diff  --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index 3e1a81aec74ab..bc42a04f7ae02 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -601,6 +601,29 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
     case llvm::Triple::x86_64:
       ArchName = Triple.isX32() ? "x32" : Triple.getArchName().str();
       break;
+    case llvm::Triple::mips:
+    case llvm::Triple::mipsel:
+    case llvm::Triple::mips64:
+    case llvm::Triple::mips64el: {
+      StringRef CPUName, ABIName;
+      tools::mips::getMipsCPUAndABI(Args, Triple, CPUName, ABIName);
+      if (ABIName == "n32")
+        ArchName = "mipsn32";
+      else if (ABIName == "n64")
+        ArchName = "mips64";
+      else
+        ArchName = "mips";
+      // CPUNames as defined in MipsTargetInfo::getISARev()
+      if (CPUName == "mips32r6" || CPUName == "mips64r6" ||
+          CPUName == "i6400" || CPUName == "i6500")
+        ArchName += "r6";
+      if (Triple.isLittleEndian())
+        ArchName += "el";
+      if (tools::mips::getMipsFloatABI(getDriver(), Args, Triple) ==
+          tools::mips::FloatABI::Soft)
+        ArchName += "-sf";
+      break;
+    }
     default:
       ArchName = Triple.getArchName().str();
     }

diff  --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
index 922adf7a43115..75d7f923fa4a5 100644
--- a/clang/test/Driver/linux-ld.c
+++ b/clang/test/Driver/linux-ld.c
@@ -1636,6 +1636,39 @@
 // RUN:     --target=mips64el-pc-linux-musl \
 // RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPS64EL %s
 // RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mips-pc-linux-musl -msoft-float \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPS-SF %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mipsel-pc-linux-musl -mfloat-abi=soft \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPSEL-SF %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mips64-pc-linux-musl -msoft-float \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPS64-SF %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mips64el-pc-linux-musl -mabi=n32 \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPSN32EL %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mips64-pc-linux-muslabin32 \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPSN32 %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mipsisa32r6el-pc-linux-musl \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPSR6EL %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mips-pc-linux-musl -march=mips32r6 \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPSR6 %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mips64el-pc-linux-musl -march=i6400 \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPS64R6EL %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mips64el-pc-linux-musl -march=mips64r6 -mabi=n32 -msoft-float \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-MIPSN32R6EL-SF %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mips64el-pc-linux-musl -mabi=32 \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-O32-OVERRIDE %s
+// RUN: %clang -### %s -no-pie 2>&1 \
+// RUN:     --target=mipsisa64r6el-pc-linux-musl -march=mips64r2 \
+// RUN:   | FileCheck --check-prefix=CHECK-MUSL-R2-OVERRIDE %s
+// RUN: %clang -### %s -no-pie 2>&1 \
 // RUN:     --target=powerpc-pc-linux-musl \
 // RUN:   | FileCheck --check-prefix=CHECK-MUSL-PPC %s
 // RUN: %clang -### %s -no-pie 2>&1 \
@@ -1704,6 +1737,17 @@
 // CHECK-MUSL-MIPSEL:     "-dynamic-linker" "/lib/ld-musl-mipsel.so.1"
 // CHECK-MUSL-MIPS64:     "-dynamic-linker" "/lib/ld-musl-mips64.so.1"
 // CHECK-MUSL-MIPS64EL:   "-dynamic-linker" "/lib/ld-musl-mips64el.so.1"
+// CHECK-MUSL-MIPS-SF:    "-dynamic-linker" "/lib/ld-musl-mips-sf.so.1"
+// CHECK-MUSL-MIPSEL-SF:  "-dynamic-linker" "/lib/ld-musl-mipsel-sf.so.1"
+// CHECK-MUSL-MIPS64-SF:  "-dynamic-linker" "/lib/ld-musl-mips64-sf.so.1"
+// CHECK-MUSL-MIPSN32EL:  "-dynamic-linker" "/lib/ld-musl-mipsn32el.so.1"
+// CHECK-MUSL-MIPSN32:    "-dynamic-linker" "/lib/ld-musl-mipsn32.so.1"
+// CHECK-MUSL-MIPSR6EL:   "-dynamic-linker" "/lib/ld-musl-mipsr6el.so.1"
+// CHECK-MUSL-MIPSR6:     "-dynamic-linker" "/lib/ld-musl-mipsr6.so.1"
+// CHECK-MUSL-MIPS64R6EL: "-dynamic-linker" "/lib/ld-musl-mips64r6el.so.1"
+// CHECK-MUSL-MIPSN32R6EL-SF: "-dynamic-linker" "/lib/ld-musl-mipsn32r6el-sf.so.1"
+// CHECK-MUSL-O32-OVERRIDE:   "-dynamic-linker" "/lib/ld-musl-mipsel.so.1"
+// CHECK-MUSL-R2-OVERRIDE:    "-dynamic-linker" "/lib/ld-musl-mips64el.so.1"
 // CHECK-MUSL-PPC:        "-dynamic-linker" "/lib/ld-musl-powerpc.so.1"
 // CHECK-MUSL-PPC64:      "-dynamic-linker" "/lib/ld-musl-powerpc64.so.1"
 // CHECK-MUSL-PPCSPE:     "-dynamic-linker" "/lib/ld-musl-powerpc-sf.so.1"


        


More information about the cfe-commits mailing list