Author: Sam Elliott Date: 2025-06-17T13:36:15-07:00 New Revision: a79186c1ea62bbe0579e0b1eed4ad507966cca41
URL: https://github.com/llvm/llvm-project/commit/a79186c1ea62bbe0579e0b1eed4ad507966cca41 DIFF: https://github.com/llvm/llvm-project/commit/a79186c1ea62bbe0579e0b1eed4ad507966cca41.diff LOG: [Driver] Fix Arm/AArch64 Link Argument tests (#144582) The openmp-offload-amdgpu-runtime-2 bot specifies default rtlib of compiler-rt, but default unwindlib of libgcc. Change the tests to accept that there may be `"--as-needed" "-lgcc_s" "--no-as-needed"` between `libclang_rt.builtins.a` and `-lc`. Relates to #121830 Added: Modified: clang/test/Driver/aarch64-toolchain.c clang/test/Driver/arm-toolchain.c Removed: ################################################################################ diff --git a/clang/test/Driver/aarch64-toolchain.c b/clang/test/Driver/aarch64-toolchain.c index e12107fa2c506..327161b81d9f6 100644 --- a/clang/test/Driver/aarch64-toolchain.c +++ b/clang/test/Driver/aarch64-toolchain.c @@ -135,7 +135,8 @@ // AARCH64-BAREMETAL-COMPILER-RT: "{{.*}}crt0.o" // AARCH64-BAREMETAL-COMPILER-RT: "{{.*}}clang_rt.crtbegin.o" -// AARCH64-BAREMETAL-COMPILER-RT: "--start-group" "{{.*}}libclang_rt.builtins.a" "-lc" "-lgloss" "--end-group" +// AARCH64-BAREMETAL-COMPILER-RT: "--start-group" "{{.*}}libclang_rt.builtins.a" +// AARCH64-BAREMETAL-COMPILER-RT: "-lc" "-lgloss" "--end-group" // AARCH64-BAREMETAL-COMPILER-RT: "{{.*}}clang_rt.crtend.o" // RUN: %clang -### %s -fuse-ld= \ diff --git a/clang/test/Driver/arm-toolchain.c b/clang/test/Driver/arm-toolchain.c index d4f9bf2aaf3d5..5368158cdeeda 100644 --- a/clang/test/Driver/arm-toolchain.c +++ b/clang/test/Driver/arm-toolchain.c @@ -136,7 +136,8 @@ // ARM-BAREMETAL-COMPILER-RT: "{{.*}}crt0.o" // ARM-BAREMETAL-COMPILER-RT: "{{.*}}clang_rt.crtbegin.o" -// ARM-BAREMETAL-COMPILER-RT: "--start-group" "{{.*}}libclang_rt.builtins.a" "-lc" "-lgloss" "--end-group" +// ARM-BAREMETAL-COMPILER-RT: "--start-group" "{{.*}}libclang_rt.builtins.a" +// ARM-BAREMETAL-COMPILER-RT: "-lc" "-lgloss" "--end-group" // ARM-BAREMETAL-COMPILER-RT: "{{.*}}clang_rt.crtend.o" // RUN: %clang -### %s -fuse-ld= \ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
