From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id 1360B3858D1E for ; Fri, 30 Sep 2022 14:05:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1360B3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wm1-x335.google.com with SMTP id ay7-20020a05600c1e0700b003b49861bf48so4995851wmb.0 for ; Fri, 30 Sep 2022 07:05:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=LwvDBpBZX8MtGm5/OuPvpzp2+h16pyqv5ydmUSu5KoU=; b=OnJGxJF8xrYCfvsead6Zxg+q7ITrDpPqs4CnBv9kGMf0mFtNfk4tkQ/1lHO1i+pZtJ yKl0RzMM7tpRx03cUxAi95ZKuCeBL+rQNvdRclZdvs5AX9UsDQmSVyqevE21tqvmintA bDNZpjOfk80ZuugncWuRq/vQ3yQss1PEJx5dH1cwdxD52bFDum55PPlzXmds1XKbW0dH b07blUbY6MBWWYIltSTjB8ITOe7mdNxsbScLMtSAicS5cHWM13JXGz09Uu5RSREz5u7G fO3J4OAUvVrj1yrf7nLbXe9p3G1+8ebs00vhCfPhQhjiXrXTqbJfBvQmNtvfnrbL1OS3 Ut1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=LwvDBpBZX8MtGm5/OuPvpzp2+h16pyqv5ydmUSu5KoU=; b=veSnsdDP/t+I+DfgO8lY7vYmnFO2E54H/YXZhUwFxquPODtQw4qDcIWG6Fp5SA2inT 3PzkiqL2A9xukRRwIj3y/Oh2qes+xRhNPnA8kH9EXvWIeJzp8GMpHmdbFcLCZsItF4t7 MQMZ8rR9oewF9r0Pf0bZTgucFeK/PKtsR8JN929RI8OEEQ00gG7vXQA3xo6JFph19NMI T11A+tcNL8hqdLdKHL87DZkTwmLVuvGMnUnHooiOOGWBAT18bemrFpGRcFqKDS3mQuLC GOi/gsR1AYyhjh4uXKEsWjGsPgCEHyvIUIvnglJN/LqMNqOk1yTYWDCUBwcBsUIO6YJZ /vfQ== X-Gm-Message-State: ACrzQf3+yYuDe/IcHpiDEKierFdZov+Cb2N3NLyqDei8D65YTZEvfsbc DK4vdX03xbUAAKusMxanQ23wLnIChsprrQ== X-Google-Smtp-Source: AMsMyM43n9EPr42/9Wp256yNX6xNXeqVReZ+a3nWFjrGLJXWHDiFvjDoncTR4cd0nRJgYbcQmGfong== X-Received: by 2002:a05:600c:354c:b0:3b4:a328:1412 with SMTP id i12-20020a05600c354c00b003b4a3281412mr13770885wmq.145.1664546715217; Fri, 30 Sep 2022 07:05:15 -0700 (PDT) Received: from chigot-Dell.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id e4-20020adfef04000000b0022cdb2950c9sm2118844wro.12.2022.09.30.07.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 07:05:14 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= To: binutils@sourceware.org Cc: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Subject: [PATCH] ld/testsuite: consistently add board_ldflags when linking with GCC Date: Fri, 30 Sep 2022 16:05:03 +0200 Message-Id: <20220930140503.38233-1-chigot@adacore.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Currently, the functions checking if the compiler is available or if a feature is available add both board_cflags and board_ldflags. However, functions running the tests only retrieve board_cflags. This can lead to unexpected errors when mandaratory flags are defined in board_ldflags and not board_cflags. ld/ChangeLog: * testsuite/ld-unique/unique.exp: Add board_ldflags when linking with GCC. * testsuite/lib/ld-lib.exp: Likewise. --- ld/testsuite/ld-unique/unique.exp | 8 +++++++- ld/testsuite/lib/ld-lib.exp | 22 ++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ld/testsuite/ld-unique/unique.exp b/ld/testsuite/ld-unique/unique.exp index f3d5a5a6b7d..ab24eef50c3 100644 --- a/ld/testsuite/ld-unique/unique.exp +++ b/ld/testsuite/ld-unique/unique.exp @@ -122,8 +122,14 @@ if [board_info [target_info name] exists cflags] { set board_cflags "" } +if [board_info [target_info name] exists ldflags] { + set board_ldflags " [board_info [target_info name] ldflags]" +} else { + set board_ldflags "" +} + # Create executable containing unique symbol. -if ![ld_link "$CC_FOR_TARGET $NOPIE_LDFLAGS $board_cflags" "tmpdir/unique_prog" "tmpdir/unique.o"] { +if ![ld_link "$CC_FOR_TARGET $NOPIE_LDFLAGS $board_cflags $board_ldflags" "tmpdir/unique_prog" "tmpdir/unique.o"] { fail "Could not link a unique executable" set fails [expr $fails + 1] } diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index ec27388a72e..2cd840c0169 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -690,6 +690,7 @@ proc run_ld_link_exec_tests { ldtests args } { global errcnt global exec_output global board_cflags + global board_ldflags global STATIC_LDFLAGS # When using GCC as the linker driver, we need to specify board cflags when @@ -702,6 +703,12 @@ proc run_ld_link_exec_tests { ldtests args } { set board_cflags "" } + if [board_info [target_info name] exists ldflags] { + set board_ldflags " [board_info [target_info name] ldflags]" + } else { + set board_ldflags "" + } + foreach testitem $ldtests { set testname [lindex $testitem 0] set ld_options [lindex $testitem 1] @@ -777,11 +784,11 @@ proc run_ld_link_exec_tests { ldtests args } { continue; } else { if { [string match "" $STATIC_LDFLAGS] \ - && [regexp -- ".* \[-\]+static .*" " $board_cflags $ld_options $objfiles $ld_after "] } { + && [regexp -- ".* \[-\]+static .*" " $board_cflags $board_ldflags $ld_options $objfiles $ld_after "] } { untested $testname continue } - if ![$link_proc $link_cmd $binfile "$board_cflags -L$srcdir/$subdir $ld_options $objfiles $ld_after"] { + if ![$link_proc $link_cmd $binfile "$board_cflags $board_ldflags -L$srcdir/$subdir $ld_options $objfiles $ld_after"] { set failed 1 } } @@ -858,6 +865,7 @@ proc run_cc_link_tests { ldtests } { global ar global exec_output global board_cflags + global board_ldflags global STATIC_LDFLAGS if [board_info [target_info name] exists cflags] { @@ -866,6 +874,12 @@ proc run_cc_link_tests { ldtests } { set board_cflags "" } + if [board_info [target_info name] exists ldflags] { + set board_ldflags " [board_info [target_info name] ldflags]" + } else { + set board_ldflags "" + } + foreach testitem $ldtests { set testname [lindex $testitem 0] set ldflags [lindex $testitem 1] @@ -968,11 +982,11 @@ proc run_cc_link_tests { ldtests } { } } else { if { [string match "" $STATIC_LDFLAGS] \ - && [regexp -- ".* \[-\]+static .*" " $board_cflags $ldflags $objfiles "] } { + && [regexp -- ".* \[-\]+static .*" " $board_cflags $board_ldflags $ldflags $objfiles "] } { untested $testname continue } - ld_link $cc_cmd $binfile "$board_cflags -L$srcdir/$subdir $ldflags $objfiles" + ld_link $cc_cmd $binfile "$board_cflags $board_ldflags -L$srcdir/$subdir $ldflags $objfiles" set ld_output "$exec_output" if { $check_ld(source) == "regexp" } then { -- 2.25.1