From patchwork Tue Mar 15 17:50:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 87021 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 67391B7011 for ; Wed, 16 Mar 2011 04:51:51 +1100 (EST) Received: (qmail 6960 invoked by alias); 15 Mar 2011 17:51:44 -0000 Received: (qmail 5704 invoked by uid 22791); 15 Mar 2011 17:51:09 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL, BAYES_00, NO_DNS_FOR_FROM, TW_AV, TW_EB, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 15 Mar 2011 17:50:36 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 15 Mar 2011 10:50:33 -0700 X-ExtLoop1: 1 Received: from gnu-33.sc.intel.com ([172.25.70.57]) by orsmga001.jf.intel.com with ESMTP; 15 Mar 2011 10:50:33 -0700 Received: by gnu-33.sc.intel.com (Postfix, from userid 500) id 46B27120434; Tue, 15 Mar 2011 10:50:33 -0700 (PDT) Date: Tue, 15 Mar 2011 10:50:33 -0700 From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Subject: Re: [x32] PATCH: Update gcc.target/i386 for x32 Message-ID: <20110315175033.GA10191@intel.com> Reply-To: "H.J. Lu" References: <20110312224426.GA9506@intel.com> <20110312232930.GA6066@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110312232930.GA6066@intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) 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 On Sat, Mar 12, 2011 at 03:29:30PM -0800, H.J. Lu wrote: > On Sat, Mar 12, 2011 at 02:44:26PM -0800, H.J. Lu wrote: > > Many tests gcc.target/i386 use ilp32 to check ia32 and use lp64 to > > check hardware long long support. I checked in this to fix it. > > > > > > Another patch. > > Another 2 patches. H.J. --- From 4882ba1f2efb896319436703e79dbc14dcce43f8 Mon Sep 17 00:00:00 2001 From: H.J. Lu Date: Tue, 15 Mar 2011 10:45:10 -0700 Subject: [PATCH 1/2] Require ia32 instead of ilp32. --- gcc/testsuite/ChangeLog.x32 | 100 ++++++++++++++++++++ .../dfp/func-vararg-alternate-d128-2.c | 2 +- .../c-c++-common/dfp/func-vararg-mixed-2.c | 2 +- gcc/testsuite/g++.dg/abi/bitfield3.C | 2 +- gcc/testsuite/g++.dg/eh/pr38662.C | 2 +- gcc/testsuite/g++.dg/ext/attrib36.C | 2 +- gcc/testsuite/g++.dg/ext/attrib37.C | 2 +- gcc/testsuite/g++.dg/ext/attrib8.C | 2 +- gcc/testsuite/g++.dg/ext/tmplattr1.C | 2 +- gcc/testsuite/g++.dg/inherit/override-attribs.C | 2 +- gcc/testsuite/g++.dg/opt/inline9.C | 2 +- gcc/testsuite/g++.dg/opt/life1.C | 2 +- gcc/testsuite/g++.dg/opt/longbranch2.C | 2 +- gcc/testsuite/g++.dg/opt/reg-stack4.C | 2 +- gcc/testsuite/g++.dg/other/pr35504.C | 2 +- gcc/testsuite/g++.dg/other/pr39496.C | 2 +- gcc/testsuite/g++.dg/warn/pr15774-1.C | 2 +- gcc/testsuite/g++.dg/warn/pr15774-2.C | 2 +- gcc/testsuite/g++.old-deja/g++.ext/attrib1.C | 2 +- gcc/testsuite/g++.old-deja/g++.ext/attrib2.C | 2 +- gcc/testsuite/g++.old-deja/g++.ext/attrib3.C | 2 +- gcc/testsuite/g++.old-deja/g++.pt/asm2.C | 2 +- gcc/testsuite/gcc.c-torture/compile/20000804-1.c | 2 +- gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp | 2 +- gcc/testsuite/gcc.dg/20020103-1.c | 2 +- gcc/testsuite/gcc.dg/20020108-1.c | 2 +- gcc/testsuite/gcc.dg/20020122-2.c | 2 +- gcc/testsuite/gcc.dg/20020122-3.c | 2 +- gcc/testsuite/gcc.dg/20020206-1.c | 2 +- gcc/testsuite/gcc.dg/20020310-1.c | 2 +- gcc/testsuite/gcc.dg/20020411-1.c | 2 +- gcc/testsuite/gcc.dg/20020418-2.c | 2 +- gcc/testsuite/gcc.dg/20020426-2.c | 2 +- gcc/testsuite/gcc.dg/20020517-1.c | 2 +- gcc/testsuite/gcc.dg/20030204-1.c | 2 +- gcc/testsuite/gcc.dg/20030826-2.c | 2 +- gcc/testsuite/gcc.dg/20031102-1.c | 2 +- gcc/testsuite/gcc.dg/20031202-1.c | 2 +- gcc/testsuite/gcc.dg/20050111-1.c | 2 +- gcc/testsuite/gcc.dg/array-init-1.c | 2 +- gcc/testsuite/gcc.dg/dfp/pr31344.c | 2 +- gcc/testsuite/gcc.dg/gomp/atomic-11.c | 2 +- gcc/testsuite/gcc.dg/graphite/pr40281.c | 4 +- gcc/testsuite/gcc.dg/ia64-sync-1.c | 2 +- gcc/testsuite/gcc.dg/ia64-sync-2.c | 2 +- gcc/testsuite/gcc.dg/ia64-sync-3.c | 2 +- gcc/testsuite/gcc.dg/ia64-sync-4.c | 2 +- gcc/testsuite/gcc.dg/ifcvt-fabs-1.c | 2 +- gcc/testsuite/gcc.dg/invalid-call-1.c | 2 +- gcc/testsuite/gcc.dg/loop-3.c | 2 +- gcc/testsuite/gcc.dg/nested-calls-1.c | 2 +- gcc/testsuite/gcc.dg/pr20017.c | 2 +- gcc/testsuite/gcc.dg/pr25023.c | 2 +- gcc/testsuite/gcc.dg/pr27671-2.c | 2 +- gcc/testsuite/gcc.dg/pr32176.c | 2 +- gcc/testsuite/gcc.dg/pr33676.c | 2 +- gcc/testsuite/gcc.dg/pr36015.c | 2 +- gcc/testsuite/gcc.dg/pr36998.c | 2 +- gcc/testsuite/gcc.dg/pr37438.c | 2 +- gcc/testsuite/gcc.dg/pr37908.c | 2 +- gcc/testsuite/gcc.dg/pr41241.c | 2 +- gcc/testsuite/gcc.dg/pr41340.c | 2 +- gcc/testsuite/gcc.dg/pr44136.c | 2 +- gcc/testsuite/gcc.dg/pr46212.c | 2 +- gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c | 2 +- gcc/testsuite/gcc.dg/setjmp-2.c | 2 +- gcc/testsuite/gcc.dg/short-compare-1.c | 2 +- gcc/testsuite/gcc.dg/short-compare-2.c | 2 +- gcc/testsuite/gcc.dg/smod-1.c | 2 +- gcc/testsuite/gcc.dg/sync-2.c | 2 +- gcc/testsuite/gcc.dg/sync-3.c | 2 +- gcc/testsuite/gcc.dg/tls/opt-1.c | 2 +- gcc/testsuite/gcc.dg/tls/opt-2.c | 2 +- gcc/testsuite/gcc.dg/tls/opt-3.c | 2 +- gcc/testsuite/gcc.dg/torture/badshift.c | 2 +- gcc/testsuite/gcc.dg/torture/pr38774.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/prefetch-8.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/prefetch-9.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c | 60 ++++++------ gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c | 16 ++-- gcc/testsuite/gcc.dg/tree-ssa/update-unroll-1.c | 2 +- gcc/testsuite/gcc.dg/unroll-1.c | 2 +- gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c | 2 +- gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c | 2 +- gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c | 2 +- gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c | 2 +- .../gcc.target/x86_64/abi/callabi/callabi.exp | 2 +- gcc/testsuite/gfortran.dg/compiler-directive_2.f | 2 +- gcc/testsuite/gfortran.dg/g77/20010216-1.f | 2 +- gcc/testsuite/gfortran.dg/gomp/pr39152.f90 | 2 +- libgomp/ChangeLog.x32 | 5 + libgomp/testsuite/libgomp.c/atomic-1.c | 2 +- libgomp/testsuite/libgomp.c/atomic-6.c | 2 +- 98 files changed, 238 insertions(+), 133 deletions(-) diff --git a/gcc/testsuite/ChangeLog.x32 b/gcc/testsuite/ChangeLog.x32 index f575587..ac1eb75 100644 --- a/gcc/testsuite/ChangeLog.x32 +++ b/gcc/testsuite/ChangeLog.x32 @@ -1,3 +1,103 @@ +2011-03-15 H.J. Lu + + * c-c++-common/dfp/func-vararg-alternate-d128-2.c: Require ia32 + instead of ilp32. + * c-c++-common/dfp/func-vararg-mixed-2.c: Likewise. + * g++.dg/abi/bitfield3.C: Likewise. + * g++.dg/eh/pr38662.C: Likewise. + * g++.dg/ext/attrib36.C: Likewise. + * g++.dg/ext/attrib37.C: Likewise. + * g++.dg/ext/attrib8.C: Likewise. + * g++.dg/ext/tmplattr1.C: Likewise. + * g++.dg/inherit/override-attribs.C: Likewise. + * g++.dg/opt/inline9.C: Likewise. + * g++.dg/opt/life1.C: Likewise. + * g++.dg/opt/longbranch2.C: Likewise. + * g++.dg/opt/reg-stack4.C: Likewise. + * g++.dg/other/pr35504.C: Likewise. + * g++.dg/other/pr39496.C: Likewise. + * g++.dg/warn/pr15774-1.C: Likewise. + * g++.dg/warn/pr15774-2.C: Likewise. + * g++.old-deja/g++.ext/attrib1.C: Likewise. + * g++.old-deja/g++.ext/attrib2.C: Likewise. + * g++.old-deja/g++.ext/attrib3.C: Likewise. + * g++.old-deja/g++.pt/asm2.C: Likewise. + * gcc.c-torture/compile/20000804-1.c: Likewise. + * gcc.dg/20020103-1.c: Likewise. + * gcc.dg/20020108-1.c: Likewise. + * gcc.dg/20020122-2.c: Likewise. + * gcc.dg/20020122-3.c: Likewise. + * gcc.dg/20020206-1.c: Likewise. + * gcc.dg/20020310-1.c: Likewise. + * gcc.dg/20020411-1.c: Likewise. + * gcc.dg/20020418-2.c: Likewise. + * gcc.dg/20020426-2.c: Likewise. + * gcc.dg/20020517-1.c: Likewise. + * gcc.dg/20030204-1.c: Likewise. + * gcc.dg/20030826-2.c: Likewise. + * gcc.dg/20031102-1.c: Likewise. + * gcc.dg/20031202-1.c: Likewise. + * gcc.dg/20050111-1.c: Likewise. + * gcc.dg/array-init-1.c: Likewise. + * gcc.dg/dfp/pr31344.c: Likewise. + * gcc.dg/gomp/atomic-11.c: Likewise. + * gcc.dg/graphite/pr40281.c: Likewise. + * gcc.dg/ia64-sync-1.c: Likewise. + * gcc.dg/ia64-sync-2.c: Likewise. + * gcc.dg/ia64-sync-3.c: Likewise. + * gcc.dg/ia64-sync-4.c: Likewise. + * gcc.dg/ifcvt-fabs-1.c: Likewise. + * gcc.dg/invalid-call-1.c: Likewise. + * gcc.dg/loop-3.c: Likewise. + * gcc.dg/nested-calls-1.c: Likewise. + * gcc.dg/pr20017.c: Likewise. + * gcc.dg/pr25023.c: Likewise. + * gcc.dg/pr27671-2.c: Likewise. + * gcc.dg/pr32176.c: Likewise. + * gcc.dg/pr33676.c: Likewise. + * gcc.dg/pr36015.c: Likewise. + * gcc.dg/pr36998.c: Likewise. + * gcc.dg/pr37438.c: Likewise. + * gcc.dg/pr37908.c: Likewise. + * gcc.dg/pr41241.c: Likewise. + * gcc.dg/pr41340.c: Likewise. + * gcc.dg/pr44136.c: Likewise. + * gcc.dg/pr46212.c: Likewise. + * gcc.dg/prefetch-loop-arrays-1.c: Likewise. + * gcc.dg/setjmp-2.c: Likewise. + * gcc.dg/short-compare-1.c: Likewise. + * gcc.dg/short-compare-2.c: Likewise. + * gcc.dg/smod-1.c: Likewise. + * gcc.dg/sync-2.c: Likewise. + * gcc.dg/sync-3.c: Likewise. + * gcc.dg/tls/opt-1.c: Likewise. + * gcc.dg/tls/opt-2.c: Likewise. + * gcc.dg/tls/opt-3.c: Likewise. + * gcc.dg/torture/badshift.c: Likewise. + * gcc.dg/torture/pr38774.c: Likewise. + * gcc.dg/tree-ssa/prefetch-3.c: Likewise. + * gcc.dg/tree-ssa/prefetch-4.c: Likewise. + * gcc.dg/tree-ssa/prefetch-5.c: Likewise. + * gcc.dg/tree-ssa/prefetch-6.c: Likewise. + * gcc.dg/tree-ssa/prefetch-7.c: Likewise. + * gcc.dg/tree-ssa/prefetch-8.c: Likewise. + * gcc.dg/tree-ssa/prefetch-9.c: Likewise. + * gcc.dg/tree-ssa/stdarg-2.c: Likewise. + * gcc.dg/tree-ssa/stdarg-4.c: Likewise. + * gcc.dg/tree-ssa/update-unroll-1.c: Likewise. + * gcc.dg/unroll-1.c: Likewise. + * gcc.misc-tests/i386-pf-3dnow-1.c: Likewise. + * gcc.misc-tests/i386-pf-athlon-1.c: Likewise. + * gcc.misc-tests/i386-pf-none-1.c: Likewise. + * gcc.misc-tests/i386-pf-sse-1.c: Likewise. + * gfortran.dg/compiler-directive_2.f: Likewise. + * gfortran.dg/g77/20010216-1.f: Likewise. + * gfortran.dg/gomp/pr39152.f9: Likewise. + + * gcc.c-torture/execute/ieee/ieee.exp: Check ia32 instead of + ilp32. + * gcc.target/x86_64/abi/callabi/callabi.exp: Likewise. + 2011-03-12 H.J. Lu * g++.dg/torture/stackalign/eh-fastcall-1.C: Require ia32 diff --git a/gcc/testsuite/c-c++-common/dfp/func-vararg-alternate-d128-2.c b/gcc/testsuite/c-c++-common/dfp/func-vararg-alternate-d128-2.c index 2960c35..f2e4dee 100644 --- a/gcc/testsuite/c-c++-common/dfp/func-vararg-alternate-d128-2.c +++ b/gcc/testsuite/c-c++-common/dfp/func-vararg-alternate-d128-2.c @@ -1,4 +1,4 @@ -/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-mpreferred-stack-boundary=2" } */ /* Simple test of vararg passing for problematic types with and without diff --git a/gcc/testsuite/c-c++-common/dfp/func-vararg-mixed-2.c b/gcc/testsuite/c-c++-common/dfp/func-vararg-mixed-2.c index 893cdae..02cafb0 100644 --- a/gcc/testsuite/c-c++-common/dfp/func-vararg-mixed-2.c +++ b/gcc/testsuite/c-c++-common/dfp/func-vararg-mixed-2.c @@ -1,4 +1,4 @@ -/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-mpreferred-stack-boundary=2" } */ /* C99 6.5.2.2 Function calls. diff --git a/gcc/testsuite/g++.dg/abi/bitfield3.C b/gcc/testsuite/g++.dg/abi/bitfield3.C index b96c9ed..033d4ac 100644 --- a/gcc/testsuite/g++.dg/abi/bitfield3.C +++ b/gcc/testsuite/g++.dg/abi/bitfield3.C @@ -4,7 +4,7 @@ // Cygwin and mingw32 default to MASK_ALIGN_DOUBLE. Override to ensure // 4-byte alignment. // { dg-options "-mno-align-double" { target i?86-*-cygwin* i?86-*-mingw* } } -// { dg-require-effective-target ilp32 } +// { dg-require-effective-target ia32 } struct A { diff --git a/gcc/testsuite/g++.dg/eh/pr38662.C b/gcc/testsuite/g++.dg/eh/pr38662.C index 5da0f97..294a129 100644 --- a/gcc/testsuite/g++.dg/eh/pr38662.C +++ b/gcc/testsuite/g++.dg/eh/pr38662.C @@ -1,4 +1,4 @@ -// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } } class E { }; class T { diff --git a/gcc/testsuite/g++.dg/ext/attrib36.C b/gcc/testsuite/g++.dg/ext/attrib36.C index 5434cb9..625ffe6 100644 --- a/gcc/testsuite/g++.dg/ext/attrib36.C +++ b/gcc/testsuite/g++.dg/ext/attrib36.C @@ -1,5 +1,5 @@ // PR c++/43031 -// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } } class T; class L { }; diff --git a/gcc/testsuite/g++.dg/ext/attrib37.C b/gcc/testsuite/g++.dg/ext/attrib37.C index d12c176..5aacac6 100644 --- a/gcc/testsuite/g++.dg/ext/attrib37.C +++ b/gcc/testsuite/g++.dg/ext/attrib37.C @@ -1,5 +1,5 @@ // PR c++/43093 -// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } } struct S { int x; diff --git a/gcc/testsuite/g++.dg/ext/attrib8.C b/gcc/testsuite/g++.dg/ext/attrib8.C index 7d99132..202b332 100644 --- a/gcc/testsuite/g++.dg/ext/attrib8.C +++ b/gcc/testsuite/g++.dg/ext/attrib8.C @@ -1,6 +1,6 @@ // PR 8656 // { dg-do compile { target i?86-*-* x86_64-*-* } } -// { dg-require-effective-target ilp32 } +// { dg-require-effective-target ia32 } extern int * (__attribute__((stdcall)) *fooPtr)( void); int * __attribute__((stdcall)) myFn01( void) { return 0; } diff --git a/gcc/testsuite/g++.dg/ext/tmplattr1.C b/gcc/testsuite/g++.dg/ext/tmplattr1.C index 111e344..b4d3a67 100644 --- a/gcc/testsuite/g++.dg/ext/tmplattr1.C +++ b/gcc/testsuite/g++.dg/ext/tmplattr1.C @@ -1,6 +1,6 @@ // PR c++/24260 // { dg-do compile { target i?86-*-* x86_64-*-* } } -// { dg-require-effective-target ilp32 } +// { dg-require-effective-target ia32 } #define stdcall __attribute__((stdcall)) diff --git a/gcc/testsuite/g++.dg/inherit/override-attribs.C b/gcc/testsuite/g++.dg/inherit/override-attribs.C index e28b8d4..cd5f491 100644 --- a/gcc/testsuite/g++.dg/inherit/override-attribs.C +++ b/gcc/testsuite/g++.dg/inherit/override-attribs.C @@ -1,6 +1,6 @@ // PR c++/14688 // { dg-do compile { target i?86-*-* x86_64-*-* } } -// { dg-require-effective-target ilp32 } +// { dg-require-effective-target ia32 } class one { diff --git a/gcc/testsuite/g++.dg/opt/inline9.C b/gcc/testsuite/g++.dg/opt/inline9.C index 10bc54c..4fc556f 100644 --- a/gcc/testsuite/g++.dg/opt/inline9.C +++ b/gcc/testsuite/g++.dg/opt/inline9.C @@ -3,7 +3,7 @@ // Testcase by Alan Modra // { dg-do run } // { dg-options "-O" } -// { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } struct thread_info { diff --git a/gcc/testsuite/g++.dg/opt/life1.C b/gcc/testsuite/g++.dg/opt/life1.C index f029767..1b78a24 100644 --- a/gcc/testsuite/g++.dg/opt/life1.C +++ b/gcc/testsuite/g++.dg/opt/life1.C @@ -1,7 +1,7 @@ // This testcase did not set up the pic register on IA-32 due // to bug in calculate_global_regs_live EH edge handling. // { dg-do compile { target i?86-*-linux* x86_64-*-linux* } } -// { dg-require-effective-target ilp32 } +// { dg-require-effective-target ia32 } // { dg-require-effective-target fpic } // { dg-options "-O2 -fPIC" } diff --git a/gcc/testsuite/g++.dg/opt/longbranch2.C b/gcc/testsuite/g++.dg/opt/longbranch2.C index f2a3a78..de63f69 100644 --- a/gcc/testsuite/g++.dg/opt/longbranch2.C +++ b/gcc/testsuite/g++.dg/opt/longbranch2.C @@ -2,7 +2,7 @@ // Originator: thor@math.tu-berlin.de // { dg-do compile } -// { dg-options "-O3 -funroll-loops -mtune=k6 -fomit-frame-pointer" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// { dg-options "-O3 -funroll-loops -mtune=k6 -fomit-frame-pointer" { target { { i?86-*-* x86_64-*-* } && ia32 } } } // This used to fail to assemble because of an out-of-range 'loop' instructions. diff --git a/gcc/testsuite/g++.dg/opt/reg-stack4.C b/gcc/testsuite/g++.dg/opt/reg-stack4.C index b1b7434..5707a38 100644 --- a/gcc/testsuite/g++.dg/opt/reg-stack4.C +++ b/gcc/testsuite/g++.dg/opt/reg-stack4.C @@ -5,7 +5,7 @@ // deleted a valid edge. // { dg-do compile } -// { dg-options "-mtune=i586 -O2" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// { dg-options "-mtune=i586 -O2" { target { { i?86-*-* x86_64-*-* } && ia32 } } } struct array { double data; diff --git a/gcc/testsuite/g++.dg/other/pr35504.C b/gcc/testsuite/g++.dg/other/pr35504.C index 58422f2..a37b8b3 100644 --- a/gcc/testsuite/g++.dg/other/pr35504.C +++ b/gcc/testsuite/g++.dg/other/pr35504.C @@ -1,4 +1,4 @@ -// { dg-do run { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// { dg-do run { target { { i?86-*-* x86_64-*-* } && ia32 } } } #define ATTR0 __attribute__((__regparm__(0))) #define ATTR1 __attribute__((__regparm__(1))) diff --git a/gcc/testsuite/g++.dg/other/pr39496.C b/gcc/testsuite/g++.dg/other/pr39496.C index 3791434..f7f2433 100644 --- a/gcc/testsuite/g++.dg/other/pr39496.C +++ b/gcc/testsuite/g++.dg/other/pr39496.C @@ -1,5 +1,5 @@ // PR target/39496 -// { dg-do compile { target { { i?86-*-linux* x86_64-*-linux* } && ilp32 } } } +// { dg-do compile { target { { i?86-*-linux* x86_64-*-linux* } && ia32 } } } // { dg-options "-O0 -fverbose-asm -fno-omit-frame-pointer -mtune=i686 -msse2 -mfpmath=sse" } // { dg-require-effective-target sse2 } // Verify that {foo,bar}{,2}param are all passed on the stack, using diff --git a/gcc/testsuite/g++.dg/warn/pr15774-1.C b/gcc/testsuite/g++.dg/warn/pr15774-1.C index efd4dae..116ec83 100644 --- a/gcc/testsuite/g++.dg/warn/pr15774-1.C +++ b/gcc/testsuite/g++.dg/warn/pr15774-1.C @@ -1,4 +1,4 @@ -// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } } // Test that an new declartion with different attributes then old one fail. extern void foo (int); // { dg-error "ambiguates old declaration" } diff --git a/gcc/testsuite/g++.dg/warn/pr15774-2.C b/gcc/testsuite/g++.dg/warn/pr15774-2.C index f890b7a..5002d54 100644 --- a/gcc/testsuite/g++.dg/warn/pr15774-2.C +++ b/gcc/testsuite/g++.dg/warn/pr15774-2.C @@ -1,4 +1,4 @@ -// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +// { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } } // Test that old declaration is used, if new one has no attributes. extern void __attribute__((stdcall)) foo (int); diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C index e879791..11e888b 100644 --- a/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C +++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C @@ -1,5 +1,5 @@ // { dg-do assemble { target i?86-*-* x86_64-*-* } } -// { dg-require-effective-target ilp32 } +// { dg-require-effective-target ia32 } // Test for using prefix attributes in a parameter decl. // Contributed by Jason Merrill diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C index 09b2bf2..990e5fd 100644 --- a/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C +++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C @@ -1,5 +1,5 @@ // { dg-do run { target i?86-*-* x86_64-*-* } } -// { dg-require-effective-target ilp32 } +// { dg-require-effective-target ia32 } // Test that stdcall doesn't prevent us from using op delete. // Contributed by Jason Merrill diff --git a/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C b/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C index 7d9c70e..c5b44bb 100644 --- a/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C +++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C @@ -1,5 +1,5 @@ // { dg-do run { target i?86-*-* x86_64-*-* } } -// { dg-require-effective-target ilp32 } +// { dg-require-effective-target ia32 } // Test for proper handling of attributes in template instantiation. // Contributed by Jason Merrill diff --git a/gcc/testsuite/g++.old-deja/g++.pt/asm2.C b/gcc/testsuite/g++.old-deja/g++.pt/asm2.C index 7a70637..0d93a20 100644 --- a/gcc/testsuite/g++.old-deja/g++.pt/asm2.C +++ b/gcc/testsuite/g++.old-deja/g++.pt/asm2.C @@ -1,5 +1,5 @@ // { dg-do assemble { target i?86-*-linux* x86_64-*-linux* } } -// { dg-require-effective-target ilp32 } +// { dg-require-effective-target ia32 } // We'd use ebx with 32-bit pic code, so require nonpic. // { dg-require-effective-target nonpic } // Origin: "Weidmann, Nicholas" diff --git a/gcc/testsuite/gcc.c-torture/compile/20000804-1.c b/gcc/testsuite/gcc.c-torture/compile/20000804-1.c index 0a63a32..8d2e79f 100644 --- a/gcc/testsuite/gcc.c-torture/compile/20000804-1.c +++ b/gcc/testsuite/gcc.c-torture/compile/20000804-1.c @@ -1,7 +1,7 @@ /* This does not work on m68hc11 or h8300 due to the use of an asm statement to force a 'long long' (64-bits) to go in a register. */ /* { dg-do assemble } */ -/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && { ilp32 && { ! nonpic } } } { "*" } { "" } } */ +/* { dg-skip-if "" { { i?86-*-* x86_64-*-* } && { ia32 && { ! nonpic } } } { "*" } { "" } } */ /* { dg-skip-if "No 64-bit registers" { m32c-*-* } { "*" } { "" } } */ /* { dg-skip-if "Not enough 64-bit registers" { pdp11-*-* } { "-O0" } { "" } } */ /* { dg-xfail-if "" { m6811-*-* m6812-*-* h8300-*-* } { "*" } { "" } } */ diff --git a/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp b/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp index 25009e4..d15e90a 100644 --- a/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp +++ b/gcc/testsuite/gcc.c-torture/execute/ieee/ieee.exp @@ -44,7 +44,7 @@ set additional_flags "-fno-inline" if [istarget "i\[34567\]86-*-*"] then { lappend additional_flags "-ffloat-store" } -if { [istarget "x86_64-*-*"] && [check_effective_target_ilp32] } then { +if { [istarget "x86_64-*-*"] && [check_effective_target_ia32] } then { lappend additional_flags "-ffloat-store" } if [istarget "m68k-*-*"] then { diff --git a/gcc/testsuite/gcc.dg/20020103-1.c b/gcc/testsuite/gcc.dg/20020103-1.c index 4209486..a3b34c2 100644 --- a/gcc/testsuite/gcc.dg/20020103-1.c +++ b/gcc/testsuite/gcc.dg/20020103-1.c @@ -1,6 +1,6 @@ /* Verify that constant equivalences get reloaded properly, either by being spilled to the stack, or regenerated, but not dropped to memory. */ -/* { dg-do compile { target { { i?86-*-* rs6000-*-* alpha*-*-* x86_64-*-* } || { powerpc*-*-* && ilp32 } } } } */ +/* { dg-do compile { target { { i?86-*-* rs6000-*-* alpha*-*-* x86_64-*-* } || { powerpc*-*-* && ia32 } } } } */ /* { dg-require-effective-target fpic } */ /* { dg-options "-O2 -fpic -fno-omit-frame-pointer -fno-asynchronous-unwind-tables" } */ /* { dg-final { scan-assembler-not "LC\[0-9\]" } } */ diff --git a/gcc/testsuite/gcc.dg/20020108-1.c b/gcc/testsuite/gcc.dg/20020108-1.c index d61944c..579a228 100644 --- a/gcc/testsuite/gcc.dg/20020108-1.c +++ b/gcc/testsuite/gcc.dg/20020108-1.c @@ -5,7 +5,7 @@ is not valid general_operand in HImode. */ /* { dg-do compile } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ void diff --git a/gcc/testsuite/gcc.dg/20020122-2.c b/gcc/testsuite/gcc.dg/20020122-2.c index 275dcee..2499221 100644 --- a/gcc/testsuite/gcc.dg/20020122-2.c +++ b/gcc/testsuite/gcc.dg/20020122-2.c @@ -3,7 +3,7 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */ -/* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ extern int access( char* ); extern int a(); diff --git a/gcc/testsuite/gcc.dg/20020122-3.c b/gcc/testsuite/gcc.dg/20020122-3.c index 28f6871..e39bd23 100644 --- a/gcc/testsuite/gcc.dg/20020122-3.c +++ b/gcc/testsuite/gcc.dg/20020122-3.c @@ -4,7 +4,7 @@ /* { dg-do compile } */ /* { dg-options "-Os -fprefetch-loop-arrays -w" } */ -/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-Os -fprefetch-loop-arrays -mtune=pentium3 -w" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ int foo (int *p, int n) { diff --git a/gcc/testsuite/gcc.dg/20020206-1.c b/gcc/testsuite/gcc.dg/20020206-1.c index 837718b..4b3d0fc 100644 --- a/gcc/testsuite/gcc.dg/20020206-1.c +++ b/gcc/testsuite/gcc.dg/20020206-1.c @@ -4,7 +4,7 @@ /* { dg-do run } */ /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */ -/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -fprefetch-loop-arrays -mtune=pentium3 -w" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ struct reload diff --git a/gcc/testsuite/gcc.dg/20020310-1.c b/gcc/testsuite/gcc.dg/20020310-1.c index bdd2967..7f35e9b 100644 --- a/gcc/testsuite/gcc.dg/20020310-1.c +++ b/gcc/testsuite/gcc.dg/20020310-1.c @@ -2,7 +2,7 @@ This testcase was miscompiled because of an rtx sharing bug. */ /* { dg-do run } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -mtune=i586" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -mtune=i586" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ struct A { diff --git a/gcc/testsuite/gcc.dg/20020411-1.c b/gcc/testsuite/gcc.dg/20020411-1.c index 47a8fed..55ca299 100644 --- a/gcc/testsuite/gcc.dg/20020411-1.c +++ b/gcc/testsuite/gcc.dg/20020411-1.c @@ -3,7 +3,7 @@ for its mode. */ /* { dg-do compile } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -march=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ #if __INT_MAX__ > 32767 diff --git a/gcc/testsuite/gcc.dg/20020418-2.c b/gcc/testsuite/gcc.dg/20020418-2.c index 93688d2..56094e7 100644 --- a/gcc/testsuite/gcc.dg/20020418-2.c +++ b/gcc/testsuite/gcc.dg/20020418-2.c @@ -1,7 +1,7 @@ /* PR optimization/6010 */ /* { dg-do compile } */ /* { dg-options "-O2 -funroll-all-loops" } */ -/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -funroll-all-loops -march=pentium3" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ void bar (float); diff --git a/gcc/testsuite/gcc.dg/20020426-2.c b/gcc/testsuite/gcc.dg/20020426-2.c index 3a892ed..9ad7a54 100644 --- a/gcc/testsuite/gcc.dg/20020426-2.c +++ b/gcc/testsuite/gcc.dg/20020426-2.c @@ -2,7 +2,7 @@ Distilled from zlib sources. */ /* { dg-do run } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target { { i?86-*-* x86_64-*-* } && { ilp32 && fpic } } } } */ +/* { dg-options "-O2 -frename-registers -fomit-frame-pointer -fPIC -mtune=i686" { target { { i?86-*-* x86_64-*-* } && { ia32 && fpic } } } } */ extern void exit (int); diff --git a/gcc/testsuite/gcc.dg/20020517-1.c b/gcc/testsuite/gcc.dg/20020517-1.c index 032ccd2..74c6b3e 100644 --- a/gcc/testsuite/gcc.dg/20020517-1.c +++ b/gcc/testsuite/gcc.dg/20020517-1.c @@ -2,7 +2,7 @@ was not sign-extended for QImode. */ /* { dg-do run } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ #include diff --git a/gcc/testsuite/gcc.dg/20030204-1.c b/gcc/testsuite/gcc.dg/20030204-1.c index 701ded2..6b8ea4d 100644 --- a/gcc/testsuite/gcc.dg/20030204-1.c +++ b/gcc/testsuite/gcc.dg/20030204-1.c @@ -1,7 +1,7 @@ /* PR optimization/8555 */ /* { dg-do compile } */ /* { dg-options "-O -ffast-math -funroll-loops" } */ -/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-march=pentium3 -O -ffast-math -funroll-loops" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ float foo (float *a, int i) diff --git a/gcc/testsuite/gcc.dg/20030826-2.c b/gcc/testsuite/gcc.dg/20030826-2.c index 32db091..552c77e 100644 --- a/gcc/testsuite/gcc.dg/20030826-2.c +++ b/gcc/testsuite/gcc.dg/20030826-2.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-options "-O2 -fomit-frame-pointer" } */ -/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -fomit-frame-pointer -march=i386" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ extern void abort (void); extern void exit (int); diff --git a/gcc/testsuite/gcc.dg/20031102-1.c b/gcc/testsuite/gcc.dg/20031102-1.c index 5a02a70..2148381 100644 --- a/gcc/testsuite/gcc.dg/20031102-1.c +++ b/gcc/testsuite/gcc.dg/20031102-1.c @@ -3,7 +3,7 @@ /* { dg-do run } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -march=i686" { target { { i686-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -march=i686" { target { { i686-*-* x86_64-*-* } && ia32 } } } */ /* Verify that reload_cse_move2add doesn't add unexpected CLOBBERs. */ diff --git a/gcc/testsuite/gcc.dg/20031202-1.c b/gcc/testsuite/gcc.dg/20031202-1.c index c7fbfe5..a5e7845 100644 --- a/gcc/testsuite/gcc.dg/20031202-1.c +++ b/gcc/testsuite/gcc.dg/20031202-1.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ extern void abort (void); extern void exit (int); diff --git a/gcc/testsuite/gcc.dg/20050111-1.c b/gcc/testsuite/gcc.dg/20050111-1.c index 7cf04e8..0ad256f 100644 --- a/gcc/testsuite/gcc.dg/20050111-1.c +++ b/gcc/testsuite/gcc.dg/20050111-1.c @@ -1,7 +1,7 @@ /* PR middle-end/19084, rtl-optimization/19348 */ /* { dg-do compile } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -march=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ unsigned int foo (unsigned long long x) diff --git a/gcc/testsuite/gcc.dg/array-init-1.c b/gcc/testsuite/gcc.dg/array-init-1.c index 0ab8634..14ec955 100644 --- a/gcc/testsuite/gcc.dg/array-init-1.c +++ b/gcc/testsuite/gcc.dg/array-init-1.c @@ -1,7 +1,7 @@ /* Test that both arrays are initialized by store_by_pieces. */ /* { dg-do compile } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ struct A { char c[10]; }; extern void baz (struct A *); diff --git a/gcc/testsuite/gcc.dg/dfp/pr31344.c b/gcc/testsuite/gcc.dg/dfp/pr31344.c index 0f5e21e..506eef4 100644 --- a/gcc/testsuite/gcc.dg/dfp/pr31344.c +++ b/gcc/testsuite/gcc.dg/dfp/pr31344.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -mtune=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O -mtune=i386" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-O" } */ typedef struct diff --git a/gcc/testsuite/gcc.dg/gomp/atomic-11.c b/gcc/testsuite/gcc.dg/gomp/atomic-11.c index 397972b..b5647b0 100644 --- a/gcc/testsuite/gcc.dg/gomp/atomic-11.c +++ b/gcc/testsuite/gcc.dg/gomp/atomic-11.c @@ -1,7 +1,7 @@ /* PR middle-end/36877 */ /* { dg-do compile } */ /* { dg-options "-fopenmp" } */ -/* { dg-options "-fopenmp -march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-fopenmp -march=i386" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ int i; float f; diff --git a/gcc/testsuite/gcc.dg/graphite/pr40281.c b/gcc/testsuite/gcc.dg/graphite/pr40281.c index 255546b..d242754 100644 --- a/gcc/testsuite/gcc.dg/graphite/pr40281.c +++ b/gcc/testsuite/gcc.dg/graphite/pr40281.c @@ -1,6 +1,6 @@ /* { dg-options "-O -fprefetch-loop-arrays -w" } */ -/* { dg-options "-O -fprefetch-loop-arrays -march=i686 -msse -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ -/* { dg-require-effective-target sse { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O -fprefetch-loop-arrays -march=i686 -msse -w" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ +/* { dg-require-effective-target sse { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ void foo(int); void bar(int n) diff --git a/gcc/testsuite/gcc.dg/ia64-sync-1.c b/gcc/testsuite/gcc.dg/ia64-sync-1.c index 83c995a..2cfc144 100644 --- a/gcc/testsuite/gcc.dg/ia64-sync-1.c +++ b/gcc/testsuite/gcc.dg/ia64-sync-1.c @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-require-effective-target sync_int_long } */ /* { dg-options } */ -/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-mcpu=v9" { target sparc*-*-* } } */ /* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.dg/ia64-sync-2.c b/gcc/testsuite/gcc.dg/ia64-sync-2.c index 69fb9b7..d8d4082 100644 --- a/gcc/testsuite/gcc.dg/ia64-sync-2.c +++ b/gcc/testsuite/gcc.dg/ia64-sync-2.c @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-require-effective-target sync_int_long } */ /* { dg-options } */ -/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-mcpu=v9" { target sparc*-*-* } } */ /* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.dg/ia64-sync-3.c b/gcc/testsuite/gcc.dg/ia64-sync-3.c index 965d435..621e902 100644 --- a/gcc/testsuite/gcc.dg/ia64-sync-3.c +++ b/gcc/testsuite/gcc.dg/ia64-sync-3.c @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-require-effective-target sync_int_long } */ /* { dg-options } */ -/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-mcpu=v9" { target sparc*-*-* } } */ /* Test basic functionality of the intrinsics. */ diff --git a/gcc/testsuite/gcc.dg/ia64-sync-4.c b/gcc/testsuite/gcc.dg/ia64-sync-4.c index e78fb4c..eec472f 100644 --- a/gcc/testsuite/gcc.dg/ia64-sync-4.c +++ b/gcc/testsuite/gcc.dg/ia64-sync-4.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ /* { dg-require-effective-target sync_int_long } */ /* { dg-options "-O2 -finline-functions" } */ -/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-mcpu=v9" { target sparc*-*-* } } */ /* Test inlining __sync_bool_compare_and_swap. */ diff --git a/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c b/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c index bdf6b39..40c57d8 100644 --- a/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c +++ b/gcc/testsuite/gcc.dg/ifcvt-fabs-1.c @@ -1,6 +1,6 @@ /* { dg-do run } */ /* { dg-options "-O" } */ -/* { dg-options "-O -march=i686" { target { { i686-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O -march=i686" { target { { i686-*-* x86_64-*-* } && ia32 } } } */ extern void abort(void); diff --git a/gcc/testsuite/gcc.dg/invalid-call-1.c b/gcc/testsuite/gcc.dg/invalid-call-1.c index 1d19c56..31f66b9 100644 --- a/gcc/testsuite/gcc.dg/invalid-call-1.c +++ b/gcc/testsuite/gcc.dg/invalid-call-1.c @@ -3,7 +3,7 @@ /* { dg-do compile } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -march=i586" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -march=i586" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ typedef void (*fp)(void); extern char* bar(void* a1, int a2); diff --git a/gcc/testsuite/gcc.dg/loop-3.c b/gcc/testsuite/gcc.dg/loop-3.c index 06428d9..6bdb5ef 100644 --- a/gcc/testsuite/gcc.dg/loop-3.c +++ b/gcc/testsuite/gcc.dg/loop-3.c @@ -3,7 +3,7 @@ /* { dg-do compile } */ /* { dg-options "-O3" } */ -/* { dg-options "-O3 -mtune=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O3 -mtune=i386" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ #if defined(STACK_SIZE) && (STACK_SIZE < 65536) # define BYTEMEM_SIZE 10000L diff --git a/gcc/testsuite/gcc.dg/nested-calls-1.c b/gcc/testsuite/gcc.dg/nested-calls-1.c index 89fdc88..500fed2 100644 --- a/gcc/testsuite/gcc.dg/nested-calls-1.c +++ b/gcc/testsuite/gcc.dg/nested-calls-1.c @@ -3,7 +3,7 @@ /* { dg-do run } */ /* { dg-options "-std=c99 -O -fno-inline" } */ -/* { dg-options "-std=c99 -O -fno-inline -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-std=c99 -O -fno-inline -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ #include diff --git a/gcc/testsuite/gcc.dg/pr20017.c b/gcc/testsuite/gcc.dg/pr20017.c index 1fd6d58..47c048f 100644 --- a/gcc/testsuite/gcc.dg/pr20017.c +++ b/gcc/testsuite/gcc.dg/pr20017.c @@ -6,7 +6,7 @@ /* { dg-do compile } */ /* { dg-options "-O1" } */ -/* { dg-options "-O1 -march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O1 -march=i386" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ int foo (int *buf, int *p) diff --git a/gcc/testsuite/gcc.dg/pr25023.c b/gcc/testsuite/gcc.dg/pr25023.c index b8cb7cf..40d7f03 100644 --- a/gcc/testsuite/gcc.dg/pr25023.c +++ b/gcc/testsuite/gcc.dg/pr25023.c @@ -1,7 +1,7 @@ /* PR debug/25023 */ /* { dg-do compile } */ /* { dg-options "-O2" } */ -/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* || x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -mtune=i686" { target { { i?86-*-* || x86_64-*-* } && ia32 } } } */ extern unsigned char v; diff --git a/gcc/testsuite/gcc.dg/pr27671-2.c b/gcc/testsuite/gcc.dg/pr27671-2.c index 7882042..11dae10 100644 --- a/gcc/testsuite/gcc.dg/pr27671-2.c +++ b/gcc/testsuite/gcc.dg/pr27671-2.c @@ -3,7 +3,7 @@ simplify_relational_operation_1 in simplify-rtx.c. */ /* { dg-do run } */ /* { dg-options "-O1" } */ -/* { dg-options "-O1 -march=pentium4" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O1 -march=pentium4" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ extern void abort (void) __attribute__ ((noreturn)); extern void exit (int) __attribute__ ((noreturn)); diff --git a/gcc/testsuite/gcc.dg/pr32176.c b/gcc/testsuite/gcc.dg/pr32176.c index 6646db0..3017c34 100644 --- a/gcc/testsuite/gcc.dg/pr32176.c +++ b/gcc/testsuite/gcc.dg/pr32176.c @@ -2,7 +2,7 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */ -/* { dg-options "-O2 -fprefetch-loop-arrays -march=i686 -msse" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -fprefetch-loop-arrays -march=i686 -msse" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ void foo (void) { diff --git a/gcc/testsuite/gcc.dg/pr33676.c b/gcc/testsuite/gcc.dg/pr33676.c index af65478..79c830e 100644 --- a/gcc/testsuite/gcc.dg/pr33676.c +++ b/gcc/testsuite/gcc.dg/pr33676.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-O0 -mtune=i386 -fomit-frame-pointer" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O0 -mtune=i386 -fomit-frame-pointer" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ __attribute__((noreturn,noinline)) void abrt (const char *fi, const char *fu) { diff --git a/gcc/testsuite/gcc.dg/pr36015.c b/gcc/testsuite/gcc.dg/pr36015.c index 456ec6a..fc31535 100644 --- a/gcc/testsuite/gcc.dg/pr36015.c +++ b/gcc/testsuite/gcc.dg/pr36015.c @@ -1,7 +1,7 @@ /* PR target/36015 */ /* { dg-do run } */ /* { dg-options "-O0" } */ -/* { dg-options "-O0 -mregparm=3" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O0 -mregparm=3" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ static int test (); diff --git a/gcc/testsuite/gcc.dg/pr36998.c b/gcc/testsuite/gcc.dg/pr36998.c index 9315fd5..bf08ed1 100644 --- a/gcc/testsuite/gcc.dg/pr36998.c +++ b/gcc/testsuite/gcc.dg/pr36998.c @@ -1,7 +1,7 @@ /* PR rtl-optimization/36998 */ /* { dg-do compile } */ /* { dg-options "-Os -fasynchronous-unwind-tables" } */ -/* { dg-options "-Os -mpreferred-stack-boundary=2 -fasynchronous-unwind-tables" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-Os -mpreferred-stack-boundary=2 -fasynchronous-unwind-tables" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-fno-omit-frame-pointer" { target { avr-*-* } } } */ void foo (const char *, ...) __attribute__ ((noreturn)); diff --git a/gcc/testsuite/gcc.dg/pr37438.c b/gcc/testsuite/gcc.dg/pr37438.c index a6e366d..7365dc9 100644 --- a/gcc/testsuite/gcc.dg/pr37438.c +++ b/gcc/testsuite/gcc.dg/pr37438.c @@ -1,7 +1,7 @@ /* PR target/37438 */ /* { dg-do compile } */ /* { dg-options "-Os" } */ -/* { dg-options "-Os -march=i486" { target { { i686-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-Os -march=i486" { target { { i686-*-* x86_64-*-* } && ia32 } } } */ extern int bar (unsigned long long int); extern int baz (const char *, unsigned int, unsigned short); diff --git a/gcc/testsuite/gcc.dg/pr37908.c b/gcc/testsuite/gcc.dg/pr37908.c index d927807..32946d1 100644 --- a/gcc/testsuite/gcc.dg/pr37908.c +++ b/gcc/testsuite/gcc.dg/pr37908.c @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-require-effective-target sync_char_short } */ /* { dg-options "-Wsync-nand" } */ -/* { dg-options "-Wsync-nand -march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-Wsync-nand -march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-Wsync-nand -mcpu=v9" { target sparc*-*-* } } */ diff --git a/gcc/testsuite/gcc.dg/pr41241.c b/gcc/testsuite/gcc.dg/pr41241.c index b69aa96..42fb2f7 100644 --- a/gcc/testsuite/gcc.dg/pr41241.c +++ b/gcc/testsuite/gcc.dg/pr41241.c @@ -1,7 +1,7 @@ /* PR bootstrap/41241 */ /* { dg-do compile } */ /* { dg-options "-O2 -fcompare-debug -g" } */ -/* { dg-options "-O2 -fcompare-debug -g -march=i586 -mtune=i586 -fomit-frame-pointer" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -fcompare-debug -g -march=i586 -mtune=i586 -fomit-frame-pointer" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ typedef struct { int t1; int t2; int t3; } *T; typedef struct { int s; } S; diff --git a/gcc/testsuite/gcc.dg/pr41340.c b/gcc/testsuite/gcc.dg/pr41340.c index b86f40b..439046a 100644 --- a/gcc/testsuite/gcc.dg/pr41340.c +++ b/gcc/testsuite/gcc.dg/pr41340.c @@ -1,7 +1,7 @@ /* PR debug/41340 */ /* { dg-do compile } */ /* { dg-options "-O3 -g -fcompare-debug" } */ -/* { dg-options "-O3 -g -fcompare-debug -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O3 -g -fcompare-debug -march=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-skip-if "no long pointers" { { ! ilp32 } && { ! lp64 } } } */ typedef struct { int t; } *T; diff --git a/gcc/testsuite/gcc.dg/pr44136.c b/gcc/testsuite/gcc.dg/pr44136.c index e053cf8..31f1924 100644 --- a/gcc/testsuite/gcc.dg/pr44136.c +++ b/gcc/testsuite/gcc.dg/pr44136.c @@ -1,7 +1,7 @@ /* PR debug/44136 */ /* { dg-do compile } */ /* { dg-options "-w -O2 -g" } */ -/* { dg-options "-w -Wno-psabi -O2 -g -mno-sse" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-w -Wno-psabi -O2 -g -mno-sse" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ #define vector __attribute((vector_size(16))) vector float a; diff --git a/gcc/testsuite/gcc.dg/pr46212.c b/gcc/testsuite/gcc.dg/pr46212.c index 9dbb601..3533e25 100644 --- a/gcc/testsuite/gcc.dg/pr46212.c +++ b/gcc/testsuite/gcc.dg/pr46212.c @@ -1,7 +1,7 @@ /* PR rtl-optimization/46212 */ /* { dg-do compile } */ /* { dg-options "-O3 -funroll-loops" } */ -/* { dg-options "-O3 -funroll-loops -march=i386" { target { { i686-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O3 -funroll-loops -march=i386" { target { { i686-*-* x86_64-*-* } && ia32 } } } */ static inline unsigned foo (void *x) diff --git a/gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c b/gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c index 59cebc5..024cc1a 100644 --- a/gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c +++ b/gcc/testsuite/gcc.dg/prefetch-loop-arrays-1.c @@ -1,7 +1,7 @@ /* PR tree-optimization/28887 */ /* { dg-do compile } */ /* { dg-options "-O2 -fprefetch-loop-arrays -w" } */ -/* { dg-options "-O2 -fprefetch-loop-arrays -march=i686 -msse -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -fprefetch-loop-arrays -march=i686 -msse -w" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ __extension__ typedef __SIZE_TYPE__ size_t; diff --git a/gcc/testsuite/gcc.dg/setjmp-2.c b/gcc/testsuite/gcc.dg/setjmp-2.c index 8ad874d..f31f6b2 100644 --- a/gcc/testsuite/gcc.dg/setjmp-2.c +++ b/gcc/testsuite/gcc.dg/setjmp-2.c @@ -2,7 +2,7 @@ /* Origin: Tom Hughes */ /* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */ /* { dg-options "-O -fomit-frame-pointer" } */ -/* { dg-options "-O -fomit-frame-pointer -march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O -fomit-frame-pointer -march=i386" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ #include #include diff --git a/gcc/testsuite/gcc.dg/short-compare-1.c b/gcc/testsuite/gcc.dg/short-compare-1.c index 4c47052..b5e01c1 100644 --- a/gcc/testsuite/gcc.dg/short-compare-1.c +++ b/gcc/testsuite/gcc.dg/short-compare-1.c @@ -3,7 +3,7 @@ /* { dg-do run } */ /* { dg-options "-O" } */ -/* { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ extern void abort(void); diff --git a/gcc/testsuite/gcc.dg/short-compare-2.c b/gcc/testsuite/gcc.dg/short-compare-2.c index 0026a88..bf4e6b4 100644 --- a/gcc/testsuite/gcc.dg/short-compare-2.c +++ b/gcc/testsuite/gcc.dg/short-compare-2.c @@ -4,7 +4,7 @@ /* { dg-do run } */ /* { dg-options "-O" } */ -/* { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ extern void abort(); diff --git a/gcc/testsuite/gcc.dg/smod-1.c b/gcc/testsuite/gcc.dg/smod-1.c index 8ff60de..9a847a1 100644 --- a/gcc/testsuite/gcc.dg/smod-1.c +++ b/gcc/testsuite/gcc.dg/smod-1.c @@ -3,7 +3,7 @@ /* { dg-do run } */ /* { dg-options "-std=c99" } */ -/* { dg-options "-std=c99 -mtune=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-std=c99 -mtune=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ #include diff --git a/gcc/testsuite/gcc.dg/sync-2.c b/gcc/testsuite/gcc.dg/sync-2.c index 7794ffd..e94248c 100644 --- a/gcc/testsuite/gcc.dg/sync-2.c +++ b/gcc/testsuite/gcc.dg/sync-2.c @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-require-effective-target sync_char_short } */ /* { dg-options "-ansi" } */ -/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-mcpu=v9" { target sparc*-*-* } } */ /* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.dg/sync-3.c b/gcc/testsuite/gcc.dg/sync-3.c index f912405..255faaa 100644 --- a/gcc/testsuite/gcc.dg/sync-3.c +++ b/gcc/testsuite/gcc.dg/sync-3.c @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-require-effective-target sync_char_short } */ /* { dg-options "-ansi" } */ -/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-march=i486" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-options "-mcpu=v9" { target sparc*-*-* } } */ /* Test functionality of the intrinsics for 'short' and 'char'. */ diff --git a/gcc/testsuite/gcc.dg/tls/opt-1.c b/gcc/testsuite/gcc.dg/tls/opt-1.c index f9399e0..658fc67 100644 --- a/gcc/testsuite/gcc.dg/tls/opt-1.c +++ b/gcc/testsuite/gcc.dg/tls/opt-1.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fPIC" } */ -/* { dg-options "-O2 -fPIC -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -fPIC -mtune=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-require-effective-target tls } */ /* { dg-require-effective-target fpic } */ diff --git a/gcc/testsuite/gcc.dg/tls/opt-2.c b/gcc/testsuite/gcc.dg/tls/opt-2.c index 3ede352..868b97c 100644 --- a/gcc/testsuite/gcc.dg/tls/opt-2.c +++ b/gcc/testsuite/gcc.dg/tls/opt-2.c @@ -4,7 +4,7 @@ on IA-32. */ /* { dg-do link } */ /* { dg-options "-O2 -ftls-model=initial-exec" } */ -/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -ftls-model=initial-exec -march=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-require-effective-target tls } */ /* { dg-require-effective-target tls_runtime } */ diff --git a/gcc/testsuite/gcc.dg/tls/opt-3.c b/gcc/testsuite/gcc.dg/tls/opt-3.c index dd37dbc..0f1bbfc 100644 --- a/gcc/testsuite/gcc.dg/tls/opt-3.c +++ b/gcc/testsuite/gcc.dg/tls/opt-3.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fpic" } */ -/* { dg-options "-O2 -fpic -mregparm=3" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -fpic -mregparm=3" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* { dg-require-effective-target tls } */ /* { dg-require-effective-target fpic } */ diff --git a/gcc/testsuite/gcc.dg/torture/badshift.c b/gcc/testsuite/gcc.dg/torture/badshift.c index 7288a37..39d123b 100644 --- a/gcc/testsuite/gcc.dg/torture/badshift.c +++ b/gcc/testsuite/gcc.dg/torture/badshift.c @@ -2,7 +2,7 @@ /* { dg-do run } */ /* { dg-options "" } */ -/* { dg-options "-march=i386" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-march=i386" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ /* We used to optimize the DImode shift-by-32 to zero because in combine we turned: diff --git a/gcc/testsuite/gcc.dg/torture/pr38774.c b/gcc/testsuite/gcc.dg/torture/pr38774.c index d6d7fcb..b626194 100644 --- a/gcc/testsuite/gcc.dg/torture/pr38774.c +++ b/gcc/testsuite/gcc.dg/torture/pr38774.c @@ -1,7 +1,7 @@ /* PR rtl-optimization/38774 */ /* { dg-do compile } */ /* { dg-options "" } */ -/* { dg-options "-march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-march=i686" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ extern int bar (void); volatile int g; diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c index 2c1282d..81375d7 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c @@ -1,7 +1,7 @@ /* Prefetching used to prefer nonsensical unroll factor of 5 in this testcase. */ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ /* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon -msse2 -mfpmath=sse -fdump-tree-aprefetch-details" } */ #define N 1000000 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c index bff4b9f..e08a5ac 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c @@ -1,7 +1,7 @@ /* The loop rolls too little, hence the prefetching would not be useful. */ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ /* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon -fdump-tree-optimized" } */ int xxx[20]; diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c index 19914ca..0627faa 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c @@ -1,5 +1,5 @@ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ /* { dg-options "-O2 --param min-insn-to-prefetch-ratio=5 -fprefetch-loop-arrays -march=athlon -fdump-tree-aprefetch-details" } */ /* These are common idioms for writing variable-length arrays at the end diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c index 7a1de5a..ab6c8a3 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c @@ -1,5 +1,5 @@ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ /* { dg-require-effective-target sse2 } */ /* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon -msse2 -mfpmath=sse --param simultaneous-prefetches=100 --param min-insn-to-prefetch-ratio=6 -fdump-tree-aprefetch-details" } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c index 9e453a7..bf2c2b8 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c @@ -1,5 +1,5 @@ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ /* { dg-require-effective-target sse2 } */ /* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=athlon" } } */ /* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon -msse2 -mfpmath=sse --param simultaneous-prefetches=100 -fdump-tree-aprefetch-details -fdump-tree-optimized" } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-8.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-8.c index a05d552..e99510b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-8.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-8.c @@ -1,5 +1,5 @@ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ /* { dg-require-effective-target sse2 } */ /* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=athlon" } } */ /* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon -msse2 -mfpmath=sse --param simultaneous-prefetches=100 -fdump-tree-aprefetch-details -fdump-tree-optimized" } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-9.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-9.c index eb22a66..c08ce87 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-9.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-9.c @@ -1,5 +1,5 @@ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ /* { dg-require-effective-target sse2 } */ /* { dg-skip-if "" { i?86-*-* x86_64-*-* } { "-march=*" } { "-march=athlon" } } */ /* { dg-options "-O2 -fprefetch-loop-arrays -march=athlon -msse2 -mfpmath=sse --param simultaneous-prefetches=100 -fdump-tree-aprefetch-details -fdump-tree-optimized" } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c index 6b4783c..e7a2447 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c @@ -22,10 +22,10 @@ f1 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -42,10 +42,10 @@ f2 (int i, ...) /* Assume the counters can be number of registers or bytes on 32-bit architecture or bytes on 64-bit architecture. */ /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 8 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 1 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -58,10 +58,10 @@ f3 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ +/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ia32 } } } } } */ /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 0 GPR units and 1 FPR units" "stdarg" { target s390*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[1-9\]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[1-9\]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[1-9\]\[0-9\]* GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[1-9\]\[0-9\]* GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -75,10 +75,10 @@ f4 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f4: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -93,10 +93,10 @@ f5 (int i, ...) va_end (gap); } /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f5: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -113,10 +113,10 @@ f6 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 24 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save 3 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f6: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -130,10 +130,10 @@ f7 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f7: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -149,10 +149,10 @@ f8 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f8: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -166,10 +166,10 @@ f9 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f9: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -185,10 +185,10 @@ f10 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f10: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -205,10 +205,10 @@ f11 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save 24 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save 3 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f11: va_list escapes 0, needs to save (3|12|24) GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -225,10 +225,10 @@ f12 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ +/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ia32 } } } } } */ /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 24 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save 0 GPR units and 3 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f12: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -245,10 +245,10 @@ f13 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ +/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ia32 } } } } } */ /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 24 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save 0 GPR units and 3 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f13: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -265,10 +265,10 @@ f14 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[148\] GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[148\] GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ +/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[148\] GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ia32 } } } } } */ /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save 24 GPR units and 3" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save 1 GPR units and 2 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f14: va_list escapes 0, needs to save \[1-9]\[0-9\]* GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -289,10 +289,10 @@ f15 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save \[148\] GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save \[148\] GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ +/* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save \[148\] GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ia32 } } } } } */ /* { dg-final { scan-tree-dump "f15: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f15: va_list escapes 0, needs to save 1 GPR units and 2 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ /* { dg-final { cleanup-tree-dump "stdarg" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c index d0e47e1..f64ba8f 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c @@ -24,10 +24,10 @@ f1 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save all GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f1: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f1: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f1: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f1: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -41,10 +41,10 @@ f2 (int i, ...) va_end (ap); } /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR units and all FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ +/* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR units and all FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ia32 } } } } } */ /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save all GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f2: va_list escapes 0, needs to save 0 GPR units and all FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f2: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f2: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f2: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f2: va_list escapes \[01\], needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -64,10 +64,10 @@ f3 (int i, ...) } } /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units and 0 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units and 0 FPR units" "stdarg" { target { powerpc*-*-linux* && ia32 } } } } */ /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 8 GPR units and 1" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save 1 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f3: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ @@ -85,10 +85,10 @@ f4 (int i, ...) } } /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } */ -/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ilp32 } } } } } */ +/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR units and \[1-9\]\[0-9\]* FPR units" "stdarg" { target { powerpc*-*-linux* && { powerpc_fprs && ia32 } } } } } */ /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 8 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */ /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save 0 GPR units and 1 FPR units" "stdarg" { target s390*-*-linux* } } } */ -/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } } */ +/* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */ /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* } } } */ /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */ /* { dg-final { cleanup-tree-dump "stdarg" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/update-unroll-1.c b/gcc/testsuite/gcc.dg/tree-ssa/update-unroll-1.c index d911dd8..a47be98 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/update-unroll-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/update-unroll-1.c @@ -1,5 +1,5 @@ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ /* { dg-options "-O1 -fprefetch-loop-arrays -march=athlon -fdump-tree-aprefetch-blocks" } */ int a[10000]; diff --git a/gcc/testsuite/gcc.dg/unroll-1.c b/gcc/testsuite/gcc.dg/unroll-1.c index 5ff07e2..e703289 100644 --- a/gcc/testsuite/gcc.dg/unroll-1.c +++ b/gcc/testsuite/gcc.dg/unroll-1.c @@ -1,7 +1,7 @@ /* PR optimization/8599 */ /* { dg-do run } */ /* { dg-options "-O2 -funroll-loops" } */ -/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-mtune=k6 -O2 -funroll-loops" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ extern void abort (void); diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c index ffb2e79..5cfcf36 100644 --- a/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c +++ b/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c @@ -2,7 +2,7 @@ variants that use 3DNow! prefetch instructions. */ /* { dg-do compile { target i?86-*-* x86_64-*-*} } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ extern void exit (int); diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c index 8d5ad1e..bba7e48 100644 --- a/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c +++ b/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c @@ -3,7 +3,7 @@ locality hints. */ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ extern void exit (int); diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c index d87a210..da4bfe4 100644 --- a/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c +++ b/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c @@ -2,7 +2,7 @@ that do not support those instructions. */ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ extern void exit (int); diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c b/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c index fb47c9d..a7ae5a8 100644 --- a/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c +++ b/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c @@ -2,7 +2,7 @@ variants that use SSE prefetch instructions. */ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target ia32 } */ extern void exit (int); diff --git a/gcc/testsuite/gcc.target/x86_64/abi/callabi/callabi.exp b/gcc/testsuite/gcc.target/x86_64/abi/callabi/callabi.exp index e76d0c1..b0cba17 100644 --- a/gcc/testsuite/gcc.target/x86_64/abi/callabi/callabi.exp +++ b/gcc/testsuite/gcc.target/x86_64/abi/callabi/callabi.exp @@ -20,7 +20,7 @@ load_lib gcc-dg.exp if { (![istarget x86_64-*-*] && ![istarget i?86-*-*]) - || [is-effective-target ilp32] } then { + || [is-effective-target ia32] } then { return } diff --git a/gcc/testsuite/gfortran.dg/compiler-directive_2.f b/gcc/testsuite/gfortran.dg/compiler-directive_2.f index fcb1657..aa3dacc 100644 --- a/gcc/testsuite/gfortran.dg/compiler-directive_2.f +++ b/gcc/testsuite/gfortran.dg/compiler-directive_2.f @@ -1,5 +1,5 @@ ! { dg-do compile { target i?86-*-* x86_64-*-* } } -! { dg-require-effective-target ilp32 } +! { dg-require-effective-target ia32 } ! ! PR fortran/34112 ! diff --git a/gcc/testsuite/gfortran.dg/g77/20010216-1.f b/gcc/testsuite/gfortran.dg/g77/20010216-1.f index 004d1d3..af2c03a 100644 --- a/gcc/testsuite/gfortran.dg/g77/20010216-1.f +++ b/gcc/testsuite/gfortran.dg/g77/20010216-1.f @@ -1,7 +1,7 @@ C Test for bug in reg-stack handling conditional moves. C Reported by Tim Prince C -C { dg-do run { target { { i[6789]86-*-* x86_64-*-* } && ilp32 } } } +C { dg-do run { target { { i[6789]86-*-* x86_64-*-* } && ia32 } } } C { dg-options "-ffast-math -march=pentiumpro" } double precision function foo(x, y) diff --git a/gcc/testsuite/gfortran.dg/gomp/pr39152.f90 b/gcc/testsuite/gfortran.dg/gomp/pr39152.f90 index ff088b5..385ebc7 100644 --- a/gcc/testsuite/gfortran.dg/gomp/pr39152.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/pr39152.f90 @@ -1,4 +1,4 @@ -! { dg-do compile { target { { i?86-*-* x86_64-*-* } && ilp32 } } } +! { dg-do compile { target { { i?86-*-* x86_64-*-* } && ia32 } } } ! { dg-options "-march=i486 -fopenmp -mavx -O3 -funroll-all-loops" } call test_workshare diff --git a/libgomp/ChangeLog.x32 b/libgomp/ChangeLog.x32 index eedac54..cdbbde6 100644 --- a/libgomp/ChangeLog.x32 +++ b/libgomp/ChangeLog.x32 @@ -1,3 +1,8 @@ +2011-03-15 H.J. Lu + + * libgomp.c/atomic-1.c: Require ia32 instead of ilp32. + * libgomp.c/atomic-6.c: Likewise. + 2011-03-06 H.J. Lu * lib/libgomp.exp (libgomp_init): Don't add -march=i486 for x32. diff --git a/libgomp/testsuite/libgomp.c/atomic-1.c b/libgomp/testsuite/libgomp.c/atomic-1.c index b2be8f0..4725b7d 100644 --- a/libgomp/testsuite/libgomp.c/atomic-1.c +++ b/libgomp/testsuite/libgomp.c/atomic-1.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-options "-O2 -march=pentium" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -march=pentium" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ #ifdef __i386__ #include "cpuid.h" diff --git a/libgomp/testsuite/libgomp.c/atomic-6.c b/libgomp/testsuite/libgomp.c/atomic-6.c index 59baf7d..f8ab75e 100644 --- a/libgomp/testsuite/libgomp.c/atomic-6.c +++ b/libgomp/testsuite/libgomp.c/atomic-6.c @@ -1,7 +1,7 @@ /* PR middle-end/36106 */ /* { dg-options "-O2" } */ /* { dg-options "-O2 -mieee" { target alpha*-*-* } } */ -/* { dg-options "-O2 -march=i586" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ +/* { dg-options "-O2 -march=i586" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */ #ifdef __i386__ # include "cpuid.h"