From patchwork Tue Feb 7 22:33:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John David Anglin X-Patchwork-Id: 140026 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 53336B6F62 for ; Wed, 8 Feb 2012 09:33:35 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1329258817; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Date: From:To:Cc:Subject:Message-ID:Reply-To:MIME-Version:Content-Type: Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=3rTBFLxXYea8rAo47HvGko4YYyw=; b=f80JW8vN5hz1+Im ne5TE36I5qtczYjCV8bmuEPTxWkdKeDKM2fnZnUgURQkWBajBo8e28med5d4vvOi uV5XemTjF60sfwjPRs8z0dj+qZ/B1aHs2f2DNhfOIK9TN/ubrwD8GjOsz0Mno5Fx iPlAQQAw9fa77Z3UB6gVQXTlbzbc= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To:MIME-Version:Content-Type:Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=yYREFv8YS0mzzsd6vGw/IOiv3mp/jKalSfb0b4rdVuMYkVVnDQuRfdB3A6q3IY KWjdsHj1dtNuIsNG1d33lNhWEDwy+kSgjzDIkXLwmU99+TDvs8xti3lkhpL6RGfX 9lzpfS0Uv/qYXaPdpGqLUCSl0trqPmglCXodNQDBdkTwk=; Received: (qmail 18263 invoked by alias); 7 Feb 2012 22:33:31 -0000 Received: (qmail 18252 invoked by uid 22791); 7 Feb 2012 22:33:29 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, T_FRT_FREE, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from hiauly1.hia.nrc.ca (HELO hiauly1.hia.nrc.ca) (132.246.10.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 07 Feb 2012 22:33:15 +0000 Received: by hiauly1.hia.nrc.ca (Postfix, from userid 1000) id 080034ED8; Tue, 7 Feb 2012 17:33:12 -0500 (EST) Date: Tue, 7 Feb 2012 17:33:12 -0500 From: John David Anglin To: gcc-patches@gcc.gnu.org Cc: schwab@linux-m68k.org Subject: [committed] hppa testsuite cleanups Message-ID: <20120207223311.GA188@hiauly1.hia.nrc.ca> Reply-To: John David Anglin MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-09) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org The patch implements suggestions made by Andreas Schwab. Tested on hppa2.0w-hp-hpux11.11 and hppa64-hp-hpux11.11. Committed to trunk. Dave Index: gfortran.dg/guality/pr41558.f90 =================================================================== --- gfortran.dg/guality/pr41558.f90 (revision 183951) +++ gfortran.dg/guality/pr41558.f90 (working copy) @@ -1,6 +1,6 @@ ! PR debug/41558 ! { dg-do run } -! { dg-skip-if "PR testsuite/51875" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } +! { dg-skip-if "PR testsuite/51875" { { hppa*-*-hpux* } && { ! lp64 } } { "*" } { "" } } ! { dg-options "-g" } subroutine f (s) Index: gcc.dg/special/weak-1.c =================================================================== --- gcc.dg/special/weak-1.c (revision 183951) +++ gcc.dg/special/weak-1.c (working copy) @@ -1,4 +1,4 @@ -/* { dg-do run { xfail { hppa*-*-hpux* && { ! hppa*64*-*-* } } } } */ +/* { dg-do run { xfail { hppa*-*-hpux* && { ! lp64 } } } } */ /* { dg-require-weak "" } */ /* { dg-additional-sources weak-1a.c } */ /* See PR target/23387 for hppa xfail details. */ Index: gcc.dg/ucnid-12.c =================================================================== --- gcc.dg/ucnid-12.c (revision 183951) +++ gcc.dg/ucnid-12.c (working copy) @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-xfail-if "" { powerpc-ibm-aix* } { "*" } { "" } } */ /* { dg-skip-if "" { ! ucn } { "*" } { "" } } */ -/* { dg-skip-if "-ffunction-sections not supported" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */ +/* { dg-skip-if "-ffunction-sections not supported" { { hppa*-*-hpux* } && { ! lp64 } } { "*" } { "" } } */ /* { dg-options "-std=c99 -fextended-identifiers -ffunction-sections" } */ #include "ucnid-4.c" Index: gcc.dg/torture/pr45678-1.c =================================================================== --- gcc.dg/torture/pr45678-1.c (revision 183951) +++ gcc.dg/torture/pr45678-1.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */ +/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! lp64 } } } } */ typedef float V __attribute__ ((vector_size (16))); V g; Index: gcc.dg/torture/pr45678-2.c =================================================================== --- gcc.dg/torture/pr45678-2.c (revision 183951) +++ gcc.dg/torture/pr45678-2.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */ +/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! lp64 } } } } */ typedef float V __attribute__ ((vector_size (16))); V g; Index: gcc.dg/tree-ssa/ssa-fre-31.c =================================================================== --- gcc.dg/tree-ssa/ssa-fre-31.c (revision 183951) +++ gcc.dg/tree-ssa/ssa-fre-31.c (working copy) @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O -fdump-tree-fre1-details" } */ -/* { dg-options "-O -fdump-tree-fre1-details -fno-common" { target hppa*-*-hpux* } } */ +/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */ typedef double d128 __attribute__((vector_size(16))); typedef float f128 __attribute__((vector_size(16))); Index: gcc.dg/tree-ssa/ssa-fre-33.c =================================================================== --- gcc.dg/tree-ssa/ssa-fre-33.c (revision 183951) +++ gcc.dg/tree-ssa/ssa-fre-33.c (working copy) @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O -fdump-tree-fre1-details" } */ -/* { dg-options "-O -fdump-tree-fre1-details -fno-common" { target hppa*-*-hpux* } } */ +/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */ #define vector __attribute__((vector_size(16) )) Index: gcc.dg/tree-ssa/ssa-fre-34.c =================================================================== --- gcc.dg/tree-ssa/ssa-fre-34.c (revision 183951) +++ gcc.dg/tree-ssa/ssa-fre-34.c (working copy) @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O -fdump-tree-fre1-details" } */ -/* { dg-options "-O -fdump-tree-fre1-details -fno-common" { target hppa*-*-hpux* } } */ +/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */ #define vector __attribute__((vector_size(16) )) Index: gcc.dg/pr48616.c =================================================================== --- gcc.dg/pr48616.c (revision 183951) +++ gcc.dg/pr48616.c (working copy) @@ -1,7 +1,7 @@ /* PR tree-optimization/48616 */ /* { dg-do run } */ /* { dg-options "-O2 -ftree-vectorize" } */ -/* { dg-options "-O2 -ftree-vectorize -fno-common" { target alpha*-dec-osf* hppa*-*-hpux* } } */ +/* { dg-additional-options "-fno-common" { target alpha*-dec-osf* hppa*-*-hpux* } } */ extern void abort (void); int a[4] __attribute__((aligned (32))); Index: gcc.dg/vector-4.c =================================================================== --- gcc.dg/vector-4.c (revision 183951) +++ gcc.dg/vector-4.c (working copy) @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */ +/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! lp64 } } } } */ #define vector __attribute__((vector_size(4*sizeof(int)) )) vector int a, b, c; Index: gcc.dg/pr17957.c =================================================================== --- gcc.dg/pr17957.c (revision 183951) +++ gcc.dg/pr17957.c (working copy) @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "--param ggc-min-expand=0 --param ggc-min-heapsize=0" } */ -/* { dg-options "-fno-common --param ggc-min-expand=0 --param ggc-min-heapsize=0" { target hppa*-*-hpux* } } */ +/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */ __attribute__ ((vector_size (64))) unsigned char v1, v2, v3; void vadd (void) Index: gcc.dg/ipa/inline-5.c =================================================================== --- gcc.dg/ipa/inline-5.c (revision 183951) +++ gcc.dg/ipa/inline-5.c (working copy) @@ -31,6 +31,6 @@ /* Will be eliminated by inlining */ } -/* { dg-final { scan-ipa-dump-times "Will be eliminated" 4 "inline" { xfail { { hppa*-*-* } && { ! hppa*64*-*-* } } } } } */ +/* { dg-final { scan-ipa-dump-times "Will be eliminated" 4 "inline" { xfail { { hppa*-*-* } && { ! lp64 } } } } } */ /* { dg-final { scan-ipa-dump-times "50. will be eliminated" 1 "inline" } } */ /* { dg-final { cleanup-ipa-dump "inline" } } */ Index: gcc.dg/ucnid-11.c =================================================================== --- gcc.dg/ucnid-11.c (revision 183951) +++ gcc.dg/ucnid-11.c (working copy) @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-xfail-if "" { powerpc-ibm-aix* } { "*" } { "" } } */ /* { dg-skip-if "" { ! ucn } { "*" } { "" } } */ -/* { dg-skip-if "-fdata-sections not supported" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */ +/* { dg-skip-if "-fdata-sections not supported" { { hppa*-*-hpux* } && { ! lp64 } } { "*" } { "" } } */ /* { dg-options "-std=c99 -fextended-identifiers -fdata-sections" } */ #include "ucnid-3.c" Index: gcc.dg/pr17055-1.c =================================================================== --- gcc.dg/pr17055-1.c (revision 183951) +++ gcc.dg/pr17055-1.c (working copy) @@ -1,7 +1,7 @@ /* PR middle-end/17055. */ /* { dg-do compile } */ /* { dg-options "-O2 -ffast-math" } */ -/* { dg-options "-O2 -ffast-math -fno-common" { target hppa*-*-hpux* } } */ +/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */ /* This test used to abort, beacuse we do an "integer" fold to zero, i.e. x - x = (T)0 where T is the type of x. Unfortunately, fold_convert Index: gcc.dg/pr32912-1.c =================================================================== --- gcc.dg/pr32912-1.c (revision 183951) +++ gcc.dg/pr32912-1.c (working copy) @@ -1,8 +1,8 @@ /* PR middle-end/32912 */ /* { dg-do run } */ /* { dg-options "-O2 -w" } */ -/* { dg-options "-O2 -w -fno-common" { target hppa*-*-hpux* } } */ -/* { dg-options "-O2 -w -msse" { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */ +/* { dg-additional-options "-msse" { target { i?86-*-* x86_64-*-* } } } */ /* { dg-require-effective-target sse_runtime { target { i?86-*-* x86_64-*-* } } } */ extern void abort (void); Index: gcc.dg/tm/pr51472.c =================================================================== --- gcc.dg/tm/pr51472.c (revision 183951) +++ gcc.dg/tm/pr51472.c (working copy) @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-fgnu-tm -O --param tm-max-aggregate-size=32" } */ -/* { dg-options "-fgnu-tm -fno-common -O --param tm-max-aggregate-size=32" { target hppa*-*-hpux* } } */ +/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */ typedef int __attribute__ ((vector_size (16))) vectype; vectype v; Index: gcc.misc-tests/gcov-13.c =================================================================== --- gcc.misc-tests/gcov-13.c (revision 183951) +++ gcc.misc-tests/gcov-13.c (working copy) @@ -4,7 +4,7 @@ /* { dg-require-weak "" } */ /* { dg-do run { target native } } */ /* { dg-additional-sources "gcovpart-13b.c" } */ -/* { dg-skip-if "weak ellision not supported" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */ +/* { dg-skip-if "weak ellision not supported" { { hppa*-*-hpux* } && { ! lp64 } } { "*" } { "" } } */ int __attribute__ ((weak)) weak () { Index: gcc.misc-tests/gcov-14.c =================================================================== --- gcc.misc-tests/gcov-14.c (revision 183951) +++ gcc.misc-tests/gcov-14.c (working copy) @@ -6,7 +6,7 @@ /* { dg-require-weak "" } */ /* { dg-do run { target native } } */ /* { dg-skip-if "undefined weak not supported" { alpha*-dec-osf* } } */ -/* { dg-skip-if "undefined weak not supported" { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } */ +/* { dg-skip-if "undefined weak not supported" { { hppa*-*-hpux* } && { ! lp64 } } } */ extern int __attribute__ ((weak)) Foo (); Index: g++.dg/ext/label13.C =================================================================== --- g++.dg/ext/label13.C (revision 183951) +++ g++.dg/ext/label13.C (working copy) @@ -8,7 +8,7 @@ C(); }; -C::C() // { dg-bogus "can never be copied" "" { xfail { { *-apple-darwin* alpha*-dec-osf* } || { hppa*-*-hpux* && { ! hppa*64*-*-* } } } } } +C::C() // { dg-bogus "can never be copied" "" { xfail { { *-apple-darwin* alpha*-dec-osf* } || { hppa*-*-hpux* && { ! lp64 } } } } } { static void *labelref = &&label; goto *labelref; Index: c-c++-common/fold-bitand-4.c =================================================================== --- c-c++-common/fold-bitand-4.c (revision 183951) +++ c-c++-common/fold-bitand-4.c (working copy) @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-fdump-tree-original" } */ -/* { dg-options "-fdump-tree-original -fno-common" { target hppa*-*-hpux* } } */ +/* { dg-additional-options "-fno-common" { target hppa*-*-hpux* } } */ typedef char char4[4] __attribute__ ((aligned (4))); char4 c4[4] __attribute__ ((aligned (16))); Index: c-c++-common/Wunused-var-12.c =================================================================== --- c-c++-common/Wunused-var-12.c (revision 183951) +++ c-c++-common/Wunused-var-12.c (working copy) @@ -1,7 +1,7 @@ /* PR c++/44780 */ /* { dg-do compile } */ /* { dg-options "-Wunused" } */ -/* { dg-options "-Wunused -fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */ +/* { dg-additional-options "-fno-common" { target { { hppa*-*-hpux* } && { ! lp64 } } } } */ typedef double vec __attribute__ ((__vector_size__ (16))); vec c, d;