From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by sourceware.org (Postfix) with ESMTPS id 80CED398C82C for ; Thu, 17 Sep 2020 08:15:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 80CED398C82C Received: by mail-pg1-x532.google.com with SMTP id g29so929467pgl.2 for ; Thu, 17 Sep 2020 01:15:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=A3VMzRThyRaTuZmS1o2HrfS52m5WWoYHwcWq6DLgFT0=; b=SwgJ4hqPRH4g1HTtFmT13Ju65RwHiT+z3F6eLOS44QcZXwVJKfvL3S6J3yEWsy6ECu 1iJS6KUY5bFHyfuui1VvcSSnuZDvePQgWwxviEvycxqcp2I8uDW10ZdYpq83WIbGxtlA X2fHq3E98ImnYQ5JlApwpoZgWk7mTm8W4vZrT2libciVDevpcKTTBrEV6tZsptV/6Ijg F/jRLQSj2Nrzrp+7F15FVwS+s5lLFtXOSRis+YXBIYiqW2bRVNpfD43Lq5gsq80Kq0JI jrwwv7Tq1YY8omRg2FKr54c2XXtBBcQ2SvLNDE+KfrbWLx3jcO2jVGXFjlCtd012BXYQ LzPg== X-Gm-Message-State: AOAM532MtHrkYFH9GP5YLR79wdlmYEwG5jRktEDjUJsBmNFv0eST3K32 ET15F1/t0zecL8K9zL4b5I9BoHuWUew= X-Google-Smtp-Source: ABdhPJwARYkDdjCcowUolKD2bp4CaQFbN9h63klF+z65hKTJw37oUd1c4or4JwuwIVsFSoRB1w/kEA== X-Received: by 2002:a63:5d07:: with SMTP id r7mr8820747pgb.440.1600330514277; Thu, 17 Sep 2020 01:15:14 -0700 (PDT) Received: from bubble.grove.modra.org ([2406:3400:51d:8cc0:5d86:d351:6129:ba7f]) by smtp.gmail.com with ESMTPSA id g26sm6264997pfr.105.2020.09.17.01.15.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 01:15:13 -0700 (PDT) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id B6A53863B0; Thu, 17 Sep 2020 17:45:09 +0930 (ACST) Date: Thu, 17 Sep 2020 17:45:09 +0930 From: Alan Modra To: binutils@sourceware.org Subject: Tidy gas i386.exp Message-ID: <20200917081509.GQ5452@bubble.grove.modra.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2020 08:15:17 -0000 Possibly a quirk of my version of tcl, but I see "nm-new --help" being run on non-x86 targets. * testsuite/gas/i386/i386.exp: Return early if not x86. diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp index 0efcc8c7c2..132e5d7834 100644 --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -17,6 +17,10 @@ # # i386 tests # +if { ![istarget "i*86-*-*"] && ![istarget "x86_64-*-*"] } then { + return +} + proc gas_64_check { } { global NM global NMFLAGS @@ -40,8 +44,7 @@ proc gas_bfd64_check { } { return [regexp "32bit/64bit/x32" [lindex $status 1]]; } -if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_32_check]] then { - +if [gas_32_check] then { global ASFLAGS set old_ASFLAGS "$ASFLAGS" set ASFLAGS "$ASFLAGS --32" @@ -674,42 +677,39 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_32_check]] } # Common tests -if [expr [istarget "i*86-*-*"] || [istarget "x86_64-*-*"]] then { - if {![istarget "i*86-*-elfiamcu"] && [gas_64_check]} then { - run_dump_test "intel-expr" - run_dump_test "string-ok" - } - run_list_test "string-bad" "" - run_list_test "reg-bad" "" - run_list_test "space1" "-al" - run_list_test "xmmword" "" - run_dump_test rept - run_dump_test pr19498 - run_list_test "nop-bad-1" "" - run_list_test "unspec" "" - if {[is_elf_format] || [istarget "*-*-vxworks*"]} then { - run_list_test_stdin "list-1" "-al" - run_list_test_stdin "list-2" "-al" - run_list_test_stdin "list-3" "-al" - run_dump_test "dw2-compress-1" - run_dump_test "dw2-compress-3a" - run_dump_test "dw2-compress-3b" - run_dump_test "dw2-compressed-1" - run_dump_test "dw2-compressed-3a" - run_dump_test "dw2-compressed-3b" +if {![istarget "i*86-*-elfiamcu"] && [gas_64_check]} then { + run_dump_test "intel-expr" + run_dump_test "string-ok" +} +run_list_test "string-bad" "" +run_list_test "reg-bad" "" +run_list_test "space1" "-al" +run_list_test "xmmword" "" +run_dump_test rept +run_dump_test pr19498 +run_list_test "nop-bad-1" "" +run_list_test "unspec" "" +if {[is_elf_format] || [istarget "*-*-vxworks*"]} then { + run_list_test_stdin "list-1" "-al" + run_list_test_stdin "list-2" "-al" + run_list_test_stdin "list-3" "-al" + run_dump_test "dw2-compress-1" + run_dump_test "dw2-compress-3a" + run_dump_test "dw2-compress-3b" + run_dump_test "dw2-compressed-1" + run_dump_test "dw2-compressed-3a" + run_dump_test "dw2-compressed-3b" - if {![istarget "*-*-dragonfly*"] - && ![istarget "*-*-gnu*"] - && ![istarget "*-*-freebsd*"] - && ![istarget "*-*-linux*"] - && ![istarget "*-*-netbsd*"]} then { - run_dump_test "svr4" - } + if {![istarget "*-*-dragonfly*"] + && ![istarget "*-*-gnu*"] + && ![istarget "*-*-freebsd*"] + && ![istarget "*-*-linux*"] + && ![istarget "*-*-netbsd*"]} then { + run_dump_test "svr4" } } -if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] then { - +if [gas_64_check] then { global ASFLAGS set old_ASFLAGS "$ASFLAGS" set ASFLAGS "$ASFLAGS --64 --defsym x86_64=1 --strip-local-absolute" -- Alan Modra Australia Development Lab, IBM