https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/200577
>From 5973c8621c75c7161a3a9878c620a61535aedbcf Mon Sep 17 00:00:00 2001 From: Michael Kruse <[email protected]> Date: Sat, 30 May 2026 15:38:10 +0200 Subject: [PATCH 1/2] Use canonical linker line check --- clang/test/Driver/freebsd.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/clang/test/Driver/freebsd.c b/clang/test/Driver/freebsd.c index bb0558b9ceb3e..280f07d1704b5 100644 --- a/clang/test/Driver/freebsd.c +++ b/clang/test/Driver/freebsd.c @@ -99,33 +99,23 @@ // CHECK-LDFLAGS_HASH: --hash-style=both // CHECK-LDFLAGS_HASH: --enable-new-dtags // -// Check that we do not pass --hash-style=gnu and --hash-style=both to linker -// and provide correct path to the dynamic linker for MIPS platforms. -// Also verify that we tell the assembler to target the right ISA and ABI. +// Verify that we tell the assembler to target the right ISA and ABI. // RUN: %clang -### %s 2>&1 \ // RUN: --target=mips-unknown-freebsd10.0 \ // RUN: | FileCheck --check-prefix=CHECK-MIPS %s -// CHECK-MIPS: {{[/\\"]}}ld{{[^" ]*}}" -// CHECK-MIPS: "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" -// CHECK-MIPS-NOT: "--hash-style={{gnu|both}}" +// CHECK-MIPS: ld{{.*}}" {{.*}} "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" // RUN: %clang -### %s 2>&1 \ // RUN: --target=mipsel-unknown-freebsd10.0 \ // RUN: | FileCheck --check-prefix=CHECK-MIPSEL %s -// CHECK-MIPSEL: {{[/\\"]}}ld{{[^" ]*}}" -// CHECK-MIPSEL: "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" -// CHECK-MIPSEL-NOT: "--hash-style={{gnu|both}}" +// CHECK-MIPSEL: ld{{.*}}" {{.*}} "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" // RUN: %clang -### %s 2>&1 \ // RUN: --target=mips64-unknown-freebsd10.0 \ // RUN: | FileCheck --check-prefix=CHECK-MIPS64 %s -// CHECK-MIPS64: {{[/\\"]}}ld{{[^" ]*}}" -// CHECK-MIPS64: "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" -// CHECK-MIPS64-NOT: "--hash-style={{gnu|both}}" +// CHECK-MIPS64:ld{{.*}}" {{.*}} "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" // RUN: %clang -### %s 2>&1 \ // RUN: --target=mips64el-unknown-freebsd10.0 \ // RUN: | FileCheck --check-prefix=CHECK-MIPS64EL %s -// CHECK-MIPS64EL: {{[/\\"]}}ld{{[^" ]*}}" -// CHECK-MIPS64EL: "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" -// CHECK-MIPS64EL-NOT: "--hash-style={{gnu|both}}" +// CHECK-MIPS64EL: ld{{.*}}" {{.*}} "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" // RUN: %clang --target=x86_64-pc-freebsd -static %s \ // RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -### 2>&1 \ >From 9369b9dc542b24d1013245eef672ba54abf2dc79 Mon Sep 17 00:00:00 2001 From: Michael Kruse <[email protected]> Date: Sat, 30 May 2026 15:59:03 +0200 Subject: [PATCH 2/2] Hashtyle check --- clang/test/Driver/freebsd.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/clang/test/Driver/freebsd.c b/clang/test/Driver/freebsd.c index 280f07d1704b5..8a8c5c76fd819 100644 --- a/clang/test/Driver/freebsd.c +++ b/clang/test/Driver/freebsd.c @@ -99,23 +99,41 @@ // CHECK-LDFLAGS_HASH: --hash-style=both // CHECK-LDFLAGS_HASH: --enable-new-dtags // -// Verify that we tell the assembler to target the right ISA and ABI. +// Check that we do not pass --hash-style=gnu and --hash-style=both to linker +// and provide correct path to the dynamic linker for MIPS platforms. +// Also verify that we tell the assembler to target the right ISA and ABI. // RUN: %clang -### %s 2>&1 \ // RUN: --target=mips-unknown-freebsd10.0 \ // RUN: | FileCheck --check-prefix=CHECK-MIPS %s +// RUN: %clang -### %s 2>&1 \ +// RUN: --target=mips-unknown-freebsd10.0 \ +// RUN: | FileCheck --check-prefix=CHECK-MIPS_HASHSTYLE %s // CHECK-MIPS: ld{{.*}}" {{.*}} "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" +// CHECK-MIPS_HASHSTYLE-NOT: "--hash-style={{gnu|both}}" // RUN: %clang -### %s 2>&1 \ // RUN: --target=mipsel-unknown-freebsd10.0 \ // RUN: | FileCheck --check-prefix=CHECK-MIPSEL %s +// RUN: %clang -### %s 2>&1 \ +// RUN: --target=mipsel-unknown-freebsd10.0 \ +// RUN: | FileCheck --check-prefix=CHECK-MIPSEL_HASHSTYLE %s // CHECK-MIPSEL: ld{{.*}}" {{.*}} "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" +// CHECK-MIPSEL_HASHSTYLE-NOT: "--hash-style={{gnu|both}}" // RUN: %clang -### %s 2>&1 \ // RUN: --target=mips64-unknown-freebsd10.0 \ // RUN: | FileCheck --check-prefix=CHECK-MIPS64 %s +// RUN: %clang -### %s 2>&1 \ +// RUN: --target=mips64-unknown-freebsd10.0 \ +// RUN: | FileCheck --check-prefix=CHECK-MIPS64_HASHSTYLE %s // CHECK-MIPS64:ld{{.*}}" {{.*}} "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" +// CHECK-MIPS64_HASHSTYLE-NOT: "--hash-style={{gnu|both}}" // RUN: %clang -### %s 2>&1 \ // RUN: --target=mips64el-unknown-freebsd10.0 \ // RUN: | FileCheck --check-prefix=CHECK-MIPS64EL %s +// RUN: %clang -### %s 2>&1 \ +// RUN: --target=mips64el-unknown-freebsd10.0 \ +// RUN: | FileCheck --check-prefix=CHECK-MIPS64EL_HASHSTYLE %s // CHECK-MIPS64EL: ld{{.*}}" {{.*}} "-dynamic-linker" "{{.*}}/libexec/ld-elf.so.1" +// CHECK-MIPS64EL_HASHSTYLE-NOT: "--hash-style={{gnu|both}}" // RUN: %clang --target=x86_64-pc-freebsd -static %s \ // RUN: --sysroot=%S/Inputs/multiarch_freebsd64_tree -### 2>&1 \ _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
