From patchwork Tue Jul 8 14:14:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 33225 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 57F752070A for ; Tue, 8 Jul 2014 14:15:17 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id eu11sf42256274pac.10 for ; Tue, 08 Jul 2014 07:15:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results; bh=KnQnew4qaZdWfZ/sE17TUc/KwQyDkkDbTERPnn8nbZY=; b=el9KkLXC2/XPqO6CCaWI2474rVI4swlPsggtb0c3eQeCyn5M9GYjn4wuahhiwB6IQe 4wJJ2h0fVXKDEHTlNS34Pp4sCPu6t8sjlx81v3t3VHNK37oXq7ibTkMvsn9Umg72Wmcu HBHM8p3ITfLjnERH/5CWZXhJv9nmjRfj8UQtM0Od+xvarjZqA9tOaDz+itjvIQlzU95b I5gFFjqmdcqHws2MpidqimPEsTdY0ex068pHUGFfun9+rMPGMYFNlcUNallEYQql5p0P 1tUC1EiBSi8YMp39jXCSCSvJr1xZJZbjmjrUnQqxpL+f8HbWg7bS+68W5ICEbsoAePSC jiBg== X-Gm-Message-State: ALoCoQn02yETHTrA6fP6eO+Phz2S8EOtWFxXDX9lCnexa9Yka9UMiLdGni4Lxv7KVX88+iJcU+gm X-Received: by 10.66.230.165 with SMTP id sz5mr17460895pac.33.1404828916303; Tue, 08 Jul 2014 07:15:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.199 with SMTP id x65ls585347qgx.23.gmail; Tue, 08 Jul 2014 07:15:16 -0700 (PDT) X-Received: by 10.52.118.99 with SMTP id kl3mr28614371vdb.18.1404828916115; Tue, 08 Jul 2014 07:15:16 -0700 (PDT) Received: from mail-ve0-x22c.google.com (mail-ve0-x22c.google.com [2607:f8b0:400c:c01::22c]) by mx.google.com with ESMTPS id g6si18107038vcn.29.2014.07.08.07.15.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Jul 2014 07:15:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::22c as permitted sender) client-ip=2607:f8b0:400c:c01::22c; Received: by mail-ve0-f172.google.com with SMTP id db12so1054956veb.31 for ; Tue, 08 Jul 2014 07:15:16 -0700 (PDT) X-Received: by 10.220.44.141 with SMTP id a13mr364423vcf.71.1404828916046; Tue, 08 Jul 2014 07:15:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp774218vcb; Tue, 8 Jul 2014 07:15:15 -0700 (PDT) X-Received: by 10.70.128.198 with SMTP id nq6mr5221471pdb.113.1404828915285; Tue, 08 Jul 2014 07:15:15 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id be7si6105605pdb.415.2014.07.08.07.15.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jul 2014 07:15:15 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-return-84244-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 27572 invoked by alias); 8 Jul 2014 14:14:23 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list List-Id: List-Unsubscribe: , List-Subscribe: List-Archive: List-Post: , List-Help: , Sender: binutils-owner@sourceware.org Delivered-To: mailing list binutils@sourceware.org Received: (qmail 27496 invoked by uid 89); 8 Jul 2014 14:14:22 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f169.google.com Received: from mail-we0-f169.google.com (HELO mail-we0-f169.google.com) (74.125.82.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 08 Jul 2014 14:14:19 +0000 Received: by mail-we0-f169.google.com with SMTP id t60so6084608wes.0 for ; Tue, 08 Jul 2014 07:14:16 -0700 (PDT) X-Received: by 10.194.200.37 with SMTP id jp5mr3925037wjc.120.1404828856475; Tue, 08 Jul 2014 07:14:16 -0700 (PDT) Received: from localhost.localdomain (cpc6-seac21-2-0-cust453.7-2.cable.virginm.net. [82.1.113.198]) by mx.google.com with ESMTPSA id rw4sm96656641wjb.44.2014.07.08.07.14.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jul 2014 07:14:15 -0700 (PDT) From: Will Newton To: binutils@sourceware.org Subject: [PATCH 4/4] gas/ARM: Fix testsuite failure for arm-elf Date: Tue, 8 Jul 2014 15:14:05 +0100 Message-Id: <1404828845-20737-4-git-send-email-will.newton@linaro.org> In-Reply-To: <1404828845-20737-1-git-send-email-will.newton@linaro.org> References: <1404828845-20737-1-git-send-email-will.newton@linaro.org> X-IsSubscribed: yes X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::22c as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 At some point the arm-elf output became the same as arm-eabi. Remove the special handling of arm-elf. gas/testsuite/ChangeLog: 2014-07-08 Will Newton * gas/elf/elf.exp: Remove special handling of arm-elf for section2 test. * gas/elf/section2.e-armeabi: Rename to... * gas/elf/section2.e-arm: ...here. * gas/elf/section2.e-armelf: Remove file. --- gas/testsuite/gas/elf/elf.exp | 10 +--------- gas/testsuite/gas/elf/section2.e-arm | 9 +++++++++ gas/testsuite/gas/elf/section2.e-armeabi | 9 --------- gas/testsuite/gas/elf/section2.e-armelf | 10 ---------- 4 files changed, 10 insertions(+), 28 deletions(-) create mode 100644 gas/testsuite/gas/elf/section2.e-arm delete mode 100644 gas/testsuite/gas/elf/section2.e-armeabi delete mode 100644 gas/testsuite/gas/elf/section2.e-armelf diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp index a967d2f..f17f7e0 100644 --- a/gas/testsuite/gas/elf/elf.exp +++ b/gas/testsuite/gas/elf/elf.exp @@ -77,15 +77,7 @@ if { [is_elf_format] } then { set target_machine -rx } if {[istarget "arm*-*-*"]} { - - if { ([istarget "*-*-*eabi"] - || [istarget "*-*-linux-*"] - || [istarget "*-*-nacl*"] - || [istarget "*-*-symbianelf"])} then { - set target_machine -armeabi - } else { - set target_machine -armelf - } + set target_machine -arm } # The MN10300 and Xtensa ports disable the assembler's call frame diff --git a/gas/testsuite/gas/elf/section2.e-arm b/gas/testsuite/gas/elf/section2.e-arm new file mode 100644 index 0000000..115bae2 --- /dev/null +++ b/gas/testsuite/gas/elf/section2.e-arm @@ -0,0 +1,9 @@ + +Symbol table '.symtab' contains 6 entries: + +Num: +Value +Size +Type +Bind +Vis +Ndx +Name + +0: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +UND + +1: 0+0 +0 +SECTION +LOCAL +DEFAULT +1 + +2: 0+0 +0 +SECTION +LOCAL +DEFAULT +2 + +3: 0+0 +0 +SECTION +LOCAL +DEFAULT +3 + +4: 0+0 +0 +SECTION +LOCAL +DEFAULT +4 + +5: 0+0 +0 +SECTION +LOCAL +DEFAULT +5 diff --git a/gas/testsuite/gas/elf/section2.e-armeabi b/gas/testsuite/gas/elf/section2.e-armeabi deleted file mode 100644 index 115bae2..0000000 --- a/gas/testsuite/gas/elf/section2.e-armeabi +++ /dev/null @@ -1,9 +0,0 @@ - -Symbol table '.symtab' contains 6 entries: - +Num: +Value +Size +Type +Bind +Vis +Ndx +Name - +0: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +UND - +1: 0+0 +0 +SECTION +LOCAL +DEFAULT +1 - +2: 0+0 +0 +SECTION +LOCAL +DEFAULT +2 - +3: 0+0 +0 +SECTION +LOCAL +DEFAULT +3 - +4: 0+0 +0 +SECTION +LOCAL +DEFAULT +4 - +5: 0+0 +0 +SECTION +LOCAL +DEFAULT +5 diff --git a/gas/testsuite/gas/elf/section2.e-armelf b/gas/testsuite/gas/elf/section2.e-armelf deleted file mode 100644 index de16912..0000000 --- a/gas/testsuite/gas/elf/section2.e-armelf +++ /dev/null @@ -1,10 +0,0 @@ - -Symbol table '.symtab' contains 7 entries: - +Num: +Value +Size +Type +Bind +Vis +Ndx +Name - +0: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +UND - +1: 0+0 +0 +SECTION +LOCAL +DEFAULT +1 - +2: 0+0 +0 +SECTION +LOCAL +DEFAULT +2 - +3: 0+0 +0 +SECTION +LOCAL +DEFAULT +3 - +4: 0+0 +0 +SECTION +LOCAL +DEFAULT +4 - +5: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +4 \$d - +6: 0+0 +0 +SECTION +LOCAL +DEFAULT +5