[clang] [flang] Ensure ToolChain::LibraryPaths is not empty for non-Darwin (PR #88661)
llvmbot wrote:
@llvm/pr-subscribers-clang-driver
Author: YunQiang Su (wzssyqa)
Changes
Follow-up to #81037.
ToolChain::LibraryPaths holds the new compiler-rt library directory (e.g.
`/tmp/Debug/lib/clang/19/lib/x86_64-unknown-linux-gnu`). However, it might be
empty when the directory does not exist (due to the `if (getVFS().exists(P))`
change in https://reviews.llvm.org/D158475).
If neither the old/new compiler-rt library directories exists, we would suggest
the undesired old compiler-rt file name:
```
% /tmp/Debug/bin/clang++ a.cc -fsanitize=memory -o a
ld.lld: error: cannot open
/tmp/Debug/lib/clang/19/lib/linux/libclang_rt.msan-x86_64.a: No such file or
directory
clang++: error: linker command failed with exit code 1 (use -v to see
invocation)
```
With this change, we will correctly suggest the new compiler-rt file name.
Fix #87150
Pull Request: https://github.com/llvm/llvm-project/pull/87866
---
Patch is 54.77 KiB, truncated to 20.00 KiB below, full version:
https://github.com/llvm/llvm-project/pull/88661.diff
21 Files Affected:
- (modified) clang/lib/Driver/ToolChain.cpp (+7-1)
- (modified) clang/test/Driver/arm-compiler-rt.c (+7-7)
- (modified) clang/test/Driver/cl-link.c (+8-8)
- (modified) clang/test/Driver/compiler-rt-unwind.c (+3-3)
- (modified) clang/test/Driver/coverage-ld.c (+4-4)
- (modified) clang/test/Driver/instrprof-ld.c (+8-8)
- (modified) clang/test/Driver/linux-ld.c (+5-3)
- (modified) clang/test/Driver/mingw-sanitizers.c (+8-8)
- (modified) clang/test/Driver/msp430-toolchain.c (+2-2)
- (modified) clang/test/Driver/print-libgcc-file-name-clangrt.c (+6-6)
- (modified) clang/test/Driver/print-runtime-dir.c (-6)
- (modified) clang/test/Driver/riscv32-toolchain-extra.c (+3-3)
- (modified) clang/test/Driver/riscv32-toolchain.c (+3-3)
- (modified) clang/test/Driver/riscv64-toolchain-extra.c (+3-3)
- (modified) clang/test/Driver/riscv64-toolchain.c (+3-3)
- (modified) clang/test/Driver/sanitizer-ld.c (+21-15)
- (modified) clang/test/Driver/wasm-toolchain.c (+9-9)
- (modified) clang/test/Driver/wasm-toolchain.cpp (+8-8)
- (modified) clang/test/Driver/windows-cross.c (+9-9)
- (modified) clang/test/Driver/zos-ld.c (+6-6)
- (modified) flang/test/Driver/msvc-dependent-lib-flags.f90 (+4-4)
``diff
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 03450fc0f57b93..237092ed07e5dc 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -796,7 +796,13 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
std::optional ToolChain::getRuntimePath() const {
SmallString<128> P(D.ResourceDir);
llvm::sys::path::append(P, "lib");
- return getTargetSubDirPath(P);
+ if (auto Ret = getTargetSubDirPath(P))
+return Ret;
+ // Darwin does not use per-target runtime directory.
+ if (Triple.isOSDarwin())
+return {};
+ llvm::sys::path::append(P, Triple.str());
+ return std::string(P);
}
std::optional ToolChain::getStdlibPath() const {
diff --git a/clang/test/Driver/arm-compiler-rt.c
b/clang/test/Driver/arm-compiler-rt.c
index 5e9e528400d08e..cb6c29f48a7814 100644
--- a/clang/test/Driver/arm-compiler-rt.c
+++ b/clang/test/Driver/arm-compiler-rt.c
@@ -10,47 +10,47 @@
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI
-// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins-arm.a"
+// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabi \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -mfloat-abi=hard -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI-ABI
-// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins-armhf.a"
+// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabihf \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF
-// ARM-GNUEABIHF: "{{.*[/\\]}}libclang_rt.builtins-armhf.a"
+// ARM-GNUEABIHF: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabihf \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -mfloat-abi=soft -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF-ABI
-// ARM-GNUEABIHF-ABI: "{{.*[/\\]}}libclang_rt.builtins-arm.a"
+// ARM-GNUEABIHF-ABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-windows-itanium \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt
[clang] [flang] Ensure ToolChain::LibraryPaths is not empty for non-Darwin (PR #88661)
llvmbot wrote:
@llvm/pr-subscribers-flang-driver
@llvm/pr-subscribers-backend-risc-v
Author: YunQiang Su (wzssyqa)
Changes
Follow-up to #81037.
ToolChain::LibraryPaths holds the new compiler-rt library directory (e.g.
`/tmp/Debug/lib/clang/19/lib/x86_64-unknown-linux-gnu`). However, it might be
empty when the directory does not exist (due to the `if (getVFS().exists(P))`
change in https://reviews.llvm.org/D158475).
If neither the old/new compiler-rt library directories exists, we would suggest
the undesired old compiler-rt file name:
```
% /tmp/Debug/bin/clang++ a.cc -fsanitize=memory -o a
ld.lld: error: cannot open
/tmp/Debug/lib/clang/19/lib/linux/libclang_rt.msan-x86_64.a: No such file or
directory
clang++: error: linker command failed with exit code 1 (use -v to see
invocation)
```
With this change, we will correctly suggest the new compiler-rt file name.
Fix #87150
Pull Request: https://github.com/llvm/llvm-project/pull/87866
---
Patch is 54.77 KiB, truncated to 20.00 KiB below, full version:
https://github.com/llvm/llvm-project/pull/88661.diff
21 Files Affected:
- (modified) clang/lib/Driver/ToolChain.cpp (+7-1)
- (modified) clang/test/Driver/arm-compiler-rt.c (+7-7)
- (modified) clang/test/Driver/cl-link.c (+8-8)
- (modified) clang/test/Driver/compiler-rt-unwind.c (+3-3)
- (modified) clang/test/Driver/coverage-ld.c (+4-4)
- (modified) clang/test/Driver/instrprof-ld.c (+8-8)
- (modified) clang/test/Driver/linux-ld.c (+5-3)
- (modified) clang/test/Driver/mingw-sanitizers.c (+8-8)
- (modified) clang/test/Driver/msp430-toolchain.c (+2-2)
- (modified) clang/test/Driver/print-libgcc-file-name-clangrt.c (+6-6)
- (modified) clang/test/Driver/print-runtime-dir.c (-6)
- (modified) clang/test/Driver/riscv32-toolchain-extra.c (+3-3)
- (modified) clang/test/Driver/riscv32-toolchain.c (+3-3)
- (modified) clang/test/Driver/riscv64-toolchain-extra.c (+3-3)
- (modified) clang/test/Driver/riscv64-toolchain.c (+3-3)
- (modified) clang/test/Driver/sanitizer-ld.c (+21-15)
- (modified) clang/test/Driver/wasm-toolchain.c (+9-9)
- (modified) clang/test/Driver/wasm-toolchain.cpp (+8-8)
- (modified) clang/test/Driver/windows-cross.c (+9-9)
- (modified) clang/test/Driver/zos-ld.c (+6-6)
- (modified) flang/test/Driver/msvc-dependent-lib-flags.f90 (+4-4)
``diff
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 03450fc0f57b93..237092ed07e5dc 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -796,7 +796,13 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
std::optional ToolChain::getRuntimePath() const {
SmallString<128> P(D.ResourceDir);
llvm::sys::path::append(P, "lib");
- return getTargetSubDirPath(P);
+ if (auto Ret = getTargetSubDirPath(P))
+return Ret;
+ // Darwin does not use per-target runtime directory.
+ if (Triple.isOSDarwin())
+return {};
+ llvm::sys::path::append(P, Triple.str());
+ return std::string(P);
}
std::optional ToolChain::getStdlibPath() const {
diff --git a/clang/test/Driver/arm-compiler-rt.c
b/clang/test/Driver/arm-compiler-rt.c
index 5e9e528400d08e..cb6c29f48a7814 100644
--- a/clang/test/Driver/arm-compiler-rt.c
+++ b/clang/test/Driver/arm-compiler-rt.c
@@ -10,47 +10,47 @@
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI
-// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins-arm.a"
+// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabi \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -mfloat-abi=hard -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI-ABI
-// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins-armhf.a"
+// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabihf \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF
-// ARM-GNUEABIHF: "{{.*[/\\]}}libclang_rt.builtins-armhf.a"
+// ARM-GNUEABIHF: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabihf \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -mfloat-abi=soft -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF-ABI
-// ARM-GNUEABIHF-ABI: "{{.*[/\\]}}libclang_rt.builtins-arm.a"
+// ARM-GNUEABIHF-ABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-windows-itanium \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir
[clang] [flang] Ensure ToolChain::LibraryPaths is not empty for non-Darwin (PR #88661)
llvmbot wrote:
@llvm/pr-subscribers-clang
Author: YunQiang Su (wzssyqa)
Changes
Follow-up to #81037.
ToolChain::LibraryPaths holds the new compiler-rt library directory (e.g.
`/tmp/Debug/lib/clang/19/lib/x86_64-unknown-linux-gnu`). However, it might be
empty when the directory does not exist (due to the `if (getVFS().exists(P))`
change in https://reviews.llvm.org/D158475).
If neither the old/new compiler-rt library directories exists, we would suggest
the undesired old compiler-rt file name:
```
% /tmp/Debug/bin/clang++ a.cc -fsanitize=memory -o a
ld.lld: error: cannot open
/tmp/Debug/lib/clang/19/lib/linux/libclang_rt.msan-x86_64.a: No such file or
directory
clang++: error: linker command failed with exit code 1 (use -v to see
invocation)
```
With this change, we will correctly suggest the new compiler-rt file name.
Fix #87150
Pull Request: https://github.com/llvm/llvm-project/pull/87866
---
Patch is 54.77 KiB, truncated to 20.00 KiB below, full version:
https://github.com/llvm/llvm-project/pull/88661.diff
21 Files Affected:
- (modified) clang/lib/Driver/ToolChain.cpp (+7-1)
- (modified) clang/test/Driver/arm-compiler-rt.c (+7-7)
- (modified) clang/test/Driver/cl-link.c (+8-8)
- (modified) clang/test/Driver/compiler-rt-unwind.c (+3-3)
- (modified) clang/test/Driver/coverage-ld.c (+4-4)
- (modified) clang/test/Driver/instrprof-ld.c (+8-8)
- (modified) clang/test/Driver/linux-ld.c (+5-3)
- (modified) clang/test/Driver/mingw-sanitizers.c (+8-8)
- (modified) clang/test/Driver/msp430-toolchain.c (+2-2)
- (modified) clang/test/Driver/print-libgcc-file-name-clangrt.c (+6-6)
- (modified) clang/test/Driver/print-runtime-dir.c (-6)
- (modified) clang/test/Driver/riscv32-toolchain-extra.c (+3-3)
- (modified) clang/test/Driver/riscv32-toolchain.c (+3-3)
- (modified) clang/test/Driver/riscv64-toolchain-extra.c (+3-3)
- (modified) clang/test/Driver/riscv64-toolchain.c (+3-3)
- (modified) clang/test/Driver/sanitizer-ld.c (+21-15)
- (modified) clang/test/Driver/wasm-toolchain.c (+9-9)
- (modified) clang/test/Driver/wasm-toolchain.cpp (+8-8)
- (modified) clang/test/Driver/windows-cross.c (+9-9)
- (modified) clang/test/Driver/zos-ld.c (+6-6)
- (modified) flang/test/Driver/msvc-dependent-lib-flags.f90 (+4-4)
``diff
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 03450fc0f57b93..237092ed07e5dc 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -796,7 +796,13 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
std::optional ToolChain::getRuntimePath() const {
SmallString<128> P(D.ResourceDir);
llvm::sys::path::append(P, "lib");
- return getTargetSubDirPath(P);
+ if (auto Ret = getTargetSubDirPath(P))
+return Ret;
+ // Darwin does not use per-target runtime directory.
+ if (Triple.isOSDarwin())
+return {};
+ llvm::sys::path::append(P, Triple.str());
+ return std::string(P);
}
std::optional ToolChain::getStdlibPath() const {
diff --git a/clang/test/Driver/arm-compiler-rt.c
b/clang/test/Driver/arm-compiler-rt.c
index 5e9e528400d08e..cb6c29f48a7814 100644
--- a/clang/test/Driver/arm-compiler-rt.c
+++ b/clang/test/Driver/arm-compiler-rt.c
@@ -10,47 +10,47 @@
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI
-// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins-arm.a"
+// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabi \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -mfloat-abi=hard -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI-ABI
-// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins-armhf.a"
+// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabihf \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF
-// ARM-GNUEABIHF: "{{.*[/\\]}}libclang_rt.builtins-armhf.a"
+// ARM-GNUEABIHF: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabihf \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -mfloat-abi=soft -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF-ABI
-// ARM-GNUEABIHF-ABI: "{{.*[/\\]}}libclang_rt.builtins-arm.a"
+// ARM-GNUEABIHF-ABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-windows-itanium \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -### %s
[clang] [flang] Ensure ToolChain::LibraryPaths is not empty for non-Darwin (PR #88661)
https://github.com/wzssyqa created
https://github.com/llvm/llvm-project/pull/88661
Follow-up to #81037.
ToolChain::LibraryPaths holds the new compiler-rt library directory (e.g.
`/tmp/Debug/lib/clang/19/lib/x86_64-unknown-linux-gnu`). However, it might be
empty when the directory does not exist (due to the `if (getVFS().exists(P))`
change in https://reviews.llvm.org/D158475).
If neither the old/new compiler-rt library directories exists, we would suggest
the undesired old compiler-rt file name:
```
% /tmp/Debug/bin/clang++ a.cc -fsanitize=memory -o a
ld.lld: error: cannot open
/tmp/Debug/lib/clang/19/lib/linux/libclang_rt.msan-x86_64.a: No such file or
directory
clang++: error: linker command failed with exit code 1 (use -v to see
invocation)
```
With this change, we will correctly suggest the new compiler-rt file name.
Fix #87150
Pull Request: https://github.com/llvm/llvm-project/pull/87866
>From b8b5c72fefe3e9cbd9782727df75c8bb6eaeec2f Mon Sep 17 00:00:00 2001
From: Fangrui Song
Date: Mon, 8 Apr 2024 16:51:34 -0700
Subject: [PATCH] Ensure ToolChain::LibraryPaths is not empty for non-Darwin
Follow-up to #81037.
ToolChain::LibraryPaths holds the new compiler-rt library directory
(e.g. `/tmp/Debug/lib/clang/19/lib/x86_64-unknown-linux-gnu`). However,
it might be empty when the directory does not exist (due to the `if
(getVFS().exists(P))` change in https://reviews.llvm.org/D158475).
If neither the old/new compiler-rt library directories exists, we would
suggest the undesired old compiler-rt file name:
```
% /tmp/Debug/bin/clang++ a.cc -fsanitize=memory -o a
ld.lld: error: cannot open
/tmp/Debug/lib/clang/19/lib/linux/libclang_rt.msan-x86_64.a: No such file or
directory
clang++: error: linker command failed with exit code 1 (use -v to see
invocation)
```
With this change, we will correctly suggest the new compiler-rt file name.
Fix #87150
Pull Request: https://github.com/llvm/llvm-project/pull/87866
---
clang/lib/Driver/ToolChain.cpp| 8 -
clang/test/Driver/arm-compiler-rt.c | 14
clang/test/Driver/cl-link.c | 16 -
clang/test/Driver/compiler-rt-unwind.c| 6 ++--
clang/test/Driver/coverage-ld.c | 8 ++---
clang/test/Driver/instrprof-ld.c | 16 -
clang/test/Driver/linux-ld.c | 8 +++--
clang/test/Driver/mingw-sanitizers.c | 16 -
clang/test/Driver/msp430-toolchain.c | 4 +--
.../Driver/print-libgcc-file-name-clangrt.c | 12 +++
clang/test/Driver/print-runtime-dir.c | 6
clang/test/Driver/riscv32-toolchain-extra.c | 6 ++--
clang/test/Driver/riscv32-toolchain.c | 6 ++--
clang/test/Driver/riscv64-toolchain-extra.c | 6 ++--
clang/test/Driver/riscv64-toolchain.c | 6 ++--
clang/test/Driver/sanitizer-ld.c | 36 +++
clang/test/Driver/wasm-toolchain.c| 18 +-
clang/test/Driver/wasm-toolchain.cpp | 16 -
clang/test/Driver/windows-cross.c | 18 +-
clang/test/Driver/zos-ld.c| 12 +++
.../test/Driver/msvc-dependent-lib-flags.f90 | 8 ++---
21 files changed, 127 insertions(+), 119 deletions(-)
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 03450fc0f57b93..237092ed07e5dc 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -796,7 +796,13 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
std::optional ToolChain::getRuntimePath() const {
SmallString<128> P(D.ResourceDir);
llvm::sys::path::append(P, "lib");
- return getTargetSubDirPath(P);
+ if (auto Ret = getTargetSubDirPath(P))
+return Ret;
+ // Darwin does not use per-target runtime directory.
+ if (Triple.isOSDarwin())
+return {};
+ llvm::sys::path::append(P, Triple.str());
+ return std::string(P);
}
std::optional ToolChain::getStdlibPath() const {
diff --git a/clang/test/Driver/arm-compiler-rt.c
b/clang/test/Driver/arm-compiler-rt.c
index 5e9e528400d08e..cb6c29f48a7814 100644
--- a/clang/test/Driver/arm-compiler-rt.c
+++ b/clang/test/Driver/arm-compiler-rt.c
@@ -10,47 +10,47 @@
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI
-// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins-arm.a"
+// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabi \
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
// RUN: -rtlib=compiler-rt -mfloat-abi=hard -### %s 2>&1 \
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI-ABI
-// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins-armhf.a"
+// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins.a"
// RUN: %clang -target arm-linux-gnueabihf \
// RUN:
