From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12386 invoked by alias); 11 May 2011 12:55:39 -0000 Received: (qmail 12371 invoked by uid 22791); 11 May 2011 12:55:38 -0000 X-SWARE-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RFC_ABUSE_POST,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-fx0-f41.google.com (HELO mail-fx0-f41.google.com) (209.85.161.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 11 May 2011 12:55:20 +0000 Received: by fxm18 with SMTP id 18so429842fxm.0 for ; Wed, 11 May 2011 05:55:18 -0700 (PDT) Received: by 10.223.106.76 with SMTP id w12mr2796599fao.104.1305118518518; Wed, 11 May 2011 05:55:18 -0700 (PDT) Received: from richards-thinkpad (business-89-133-214-82.business.broadband.hu [89.133.214.82]) by mx.google.com with ESMTPS id t15sm65430fau.0.2011.05.11.05.55.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 May 2011 05:55:17 -0700 (PDT) From: Richard Sandiford To: binutils@sourceware.org Mail-Followup-To: binutils@sourceware.org, rdsandiford@googlemail.com Subject: [committed] Fix mipsisa32-linux-gnu linker failures Date: Wed, 11 May 2011 12:55:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00150.txt.bz2 Alan's nod in the direction of mipsisa32-linux-gnu made me look at the 3 linker failures there. They were caused by missing checks for $has_newabi. These tests passed on mipsel-linux-gnu because of the default "from-abi" architecture. One fix would therefore have been to force the architecture on the command line. I think it's better to test with the default architecture where possible though, so we'd need some machinery to conditionally add an architecture option only when one was needed. In the meantime, this patch makes the handling of these three tests consistent with all the other NewABI tests. Tested on mipsisa32-linux-gnu and applied. Richard ld/testsuite/ * ld-mips-elf/mips-elf.exp: Add missing $has_newabi tests. Index: ld/testsuite/ld-mips-elf/mips-elf.exp =================================================================== --- ld/testsuite/ld-mips-elf/mips-elf.exp 2011-01-17 15:58:41.000000000 +0000 +++ ld/testsuite/ld-mips-elf/mips-elf.exp 2011-05-11 13:47:02.000000000 +0100 @@ -160,8 +160,10 @@ if $has_newabi { if { $linux_gnu } { run_dump_test "rel32-o32" - run_dump_test "rel32-n32" - run_dump_test "rel64" + if { $has_newabi } { + run_dump_test "rel32-n32" + run_dump_test "rel64" + } # The first test checks that a mixed PIC/non-PIC relocatable link # will not introduce any stubs itself, but will flag PIC functions # for the final link. @@ -333,7 +335,9 @@ if {$has_newabi} { } if { $linux_gnu } { - run_dump_test "textrel-1" + if { $has_newabi } { + run_dump_test "textrel-1" + } run_dump_test "got-page-1" if $has_newabi { run_dump_test "got-page-2"