On Fri, Jul 8, 2011 at 1:03 AM, H.J. Lu <hjl.to...@gmail.com> wrote: >> Here is the updated patch. I will wait for Uros's comments. >> > > I attached the wrong file. Here is the updated patch.
--- 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 } Please rather change dg-do run command to: +// { dg-do <...> { target { { i?86-*-* x86_64-*-* } && ia32 } } } and remove dg-require-effective-target entirely. This will ease grepping for certain target considerably. +++ b/gcc/testsuite/g++.dg/ext/attrib8.C +++ b/gcc/testsuite/g++.dg/ext/tmplattr1.C +++ b/gcc/testsuite/g++.dg/inherit/override-attribs.C +++ b/gcc/testsuite/g++.dg/opt/life1.C +++ b/gcc/testsuite/g++.dg/opt/nrv12.C +++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib1.C +++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib2.C +++ b/gcc/testsuite/g++.old-deja/g++.ext/attrib3.C +++ b/gcc/testsuite/g++.old-deja/g++.pt/asm2.C +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-28.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c ... and many more. Same here. --- 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 } } } } */ Wrong change. --- 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 } } } */ Please also remove || in the target string. --- a/gcc/testsuite/gcc.dg/lower-subreg-1.c +++ b/gcc/testsuite/gcc.dg/lower-subreg-1.c @@ -1,4 +1,4 @@ -/* { dg-do compile { target { { { ! mips64 } && { ! ia64-*-* } } && { ! spu-*-* } } } } */ +/* { dg-do compile { target { { { { ! mips64 } && { ! ia64-*-* } } && { ! spu-*-* } } && { ! { { i?86-*-* x86_64-*-* } && x32 } } } } } */ /* { dg-options "-O -fdump-rtl-subreg1" } */ /* { dg-require-effective-target ilp32 } */ This change is still present in updated patch, please change according to Mike's comments. I'd prefer skip-if there, BTW. BTW: What about using ... && { ! ia32 } instead of ... && { x32 || lp64 } in +/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && { x32 || lp64 } } } } */ This will IMO future-proof the testcases. Otherwise, the patch looks OK to me. Uros.