From c8d45dbd0a05885f57e52f9b852bea4c84bf3062 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 6 Apr 2024 11:46:09 +1030 Subject: [PATCH] ld testsuite: Append NOSANITIZE_CFLAGS to CFLAGS_FOR_TARGET The idea here is build tests without sanitizer flags, so they don't fail due to many not using the compiler to link and thus result in undefined symbols, since libasan is not supplied. We definitely do not want a compiler to perform linking in most cases, and it's complicated to supply libasan (and would possibly disturb testcase output). * testsuite/config/default.exp (CFLAGS_FOR_TARGET), (CXXFLAGS_FOR_TARGET): Append NOSANITIZE_CFLAGS. * testsuite/ld-bootstrap/bootstrap.exp: Use CC_FOR_TARGET and CFLAGS_FOR_TARGET throughout. --- ld/testsuite/config/default.exp | 3 +++ ld/testsuite/ld-bootstrap/bootstrap.exp | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp index afaf4bcb1ff..8374920c775 100644 --- a/ld/testsuite/config/default.exp +++ b/ld/testsuite/config/default.exp @@ -481,6 +481,9 @@ if { ![info exists NOSANITIZE_CFLAGS] } then { } } +append CFLAGS_FOR_TARGET " $NOSANITIZE_CFLAGS" +append CXXFLAGS_FOR_TARGET " $NOSANITIZE_CFLAGS" + if { ![info exists NOLTO_CFLAGS] } then { set NOLTO_CFLAGS "" if [compiler_supports "-fno-lto"] { diff --git a/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp index 437a3bc6842..4b19a1283d3 100644 --- a/ld/testsuite/ld-bootstrap/bootstrap.exp +++ b/ld/testsuite/ld-bootstrap/bootstrap.exp @@ -190,7 +190,7 @@ foreach flags $test_flags { setup_xfail "mips*-*-irix5*" } - if ![ld_link $CC tmpdir/ld1 "$CFLAGS $flags tmpdir/ld-partial.o $CTFLIB $BFDLIB $LIBIBERTY $SFRAMELIB $extralibs"] { + if ![ld_link $CC_FOR_TARGET tmpdir/ld1 "$CFLAGS_FOR_TARGET $flags tmpdir/ld-partial.o $CTFLIB $BFDLIB $LIBIBERTY $SFRAMELIB $extralibs"] { fail $testname continue } @@ -207,13 +207,13 @@ foreach flags $test_flags { } regsub /tmpdir/ld/ $gcc_B_opt_save /tmpdir/gccld1/ gcc_B_opt - if ![ld_link $CC tmpdir/ld2 "$CFLAGS $flags $OFILES $CTFLIB $BFDLIB $LIBIBERTY $SFRAMELIB $extralibs"] { + if ![ld_link $CC_FOR_TARGET tmpdir/ld2 "$CFLAGS_FOR_TARGET $flags $OFILES $CTFLIB $BFDLIB $LIBIBERTY $SFRAMELIB $extralibs"] { fail $testname continue } regsub /tmpdir/ld/ $gcc_B_opt_save /tmpdir/gccld2/ gcc_B_opt - if ![ld_link $CC tmpdir/ld3 "$CFLAGS $flags $OFILES $CTFLIB $BFDLIB $LIBIBERTY $SFRAMELIB $extralibs"] { + if ![ld_link $CC_FOR_TARGET tmpdir/ld3 "$CFLAGS_FOR_TARGET $flags $OFILES $CTFLIB $BFDLIB $LIBIBERTY $SFRAMELIB $extralibs"] { fail $testname continue } @@ -226,7 +226,7 @@ foreach flags $test_flags { # generated by different linkers, tmpdir/ld1 and tmpdir/ld2. # So we rebuild tmpdir/ld2 with tmpdir/ld3. regsub /tmpdir/ld/ $gcc_B_opt_save /tmpdir/gccld3/ gcc_B_opt - if ![ld_link $CC tmpdir/ld2 "$CFLAGS $flags $OFILES $CTFLIB $BFDLIB $LIBIBERTY $SFRAMELIB $extralibs"] { + if ![ld_link $CC_FOR_TARGET tmpdir/ld2 "$CFLAGS_FOR_TARGET $flags $OFILES $CTFLIB $BFDLIB $LIBIBERTY $SFRAMELIB $extralibs"] { fail $testname continue } -- 2.47.3