On Wed, Dec 18, 2013 at 11:56 AM, Uros Bizjak <ubiz...@gmail.com> wrote: > On Wed, Dec 18, 2013 at 11:44 AM, Rainer Orth > <r...@cebitec.uni-bielefeld.de> wrote: > >>> On Sun, Dec 15, 2013 at 1:14 PM, Dominique Dhumieres <domi...@lps.ens.fr> >>> wrote: >>>>> OTOH, I can't test darwin properly, please provide the patch and I'll >>>>> commit it for you. >>>> >>>> Basically the patch I have in my tree since the PR replace 'linux' with >>>> *' (see below). >>>> Since I can only test darwin, there is no guarantee that the tests pass >>>> on non-linux, >>>> non-darwin platforms. So if you apply the patch below as such, it will be >>>> necessary to >>>> watch out for fall-out. >>> >>> Let's ask Rainer for help with x86 solaris. >> >> I've just applied Dominique's patch to r206061 and ran the four changed >> tests on i386-pc-solaris2.10: all of them passed, so from my POV the >> change is fine. > > So, the proposed patch (with proper ChangeLog) is OK and preapproved.
Actually, we can remove target selector from dg-do directive altogether. callabi.exp already filters out incorrect targets. 2013-12-22 Uros Bizjak <ubiz...@gmail.com> * gcc.target/x86_64/abi/callabi/func-2a.c (dg-do): Remove target selector. * gcc.target/x86_64/abi/callabi/func-indirect-2a.c (dg-do): Ditto. * gcc.target/x86_64/abi/callabi/vaarg-4a.c (dg-do): Ditto. * gcc.target/x86_64/abi/callabi/vaarg-5a.c (dg-do): Ditto. Tested on x86_64-linux-gnu {,-m32}, will be committed to mainline later today. Uros.
Index: gcc.target/x86_64/abi/callabi/func-2a.c =================================================================== --- gcc.target/x86_64/abi/callabi/func-2a.c (revision 206165) +++ gcc.target/x86_64/abi/callabi/func-2a.c (working copy) @@ -1,5 +1,5 @@ /* Test for cross x86_64<->w64 abi standard calls. */ -/* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-do run } */ /* { dg-options "-O2 -mabi=ms -std=gnu99 -ffast-math -fno-builtin -maccumulate-outgoing-args" } */ /* { dg-additional-sources "func-2b.c" } */ Index: gcc.target/x86_64/abi/callabi/func-indirect-2a.c =================================================================== --- gcc.target/x86_64/abi/callabi/func-indirect-2a.c (revision 206165) +++ gcc.target/x86_64/abi/callabi/func-indirect-2a.c (working copy) @@ -1,5 +1,5 @@ /* Test for cross x86_64<->w64 abi standard calls via variable. */ -/* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-do run } */ /* { dg-options "-O2 -mabi=ms -std=gnu99 -ffast-math -fno-builtin -maccumulate-outgoing-args" } */ /* { dg-additional-sources "func-indirect-2b.c" } */ Index: gcc.target/x86_64/abi/callabi/vaarg-4a.c =================================================================== --- gcc.target/x86_64/abi/callabi/vaarg-4a.c (revision 206165) +++ gcc.target/x86_64/abi/callabi/vaarg-4a.c (working copy) @@ -1,5 +1,5 @@ /* Test for cross x86_64<->w64 abi va_list calls. */ -/* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-do run } */ /* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin -maccumulate-outgoing-args" } */ /* { dg-additional-sources "vaarg-4b.c" } */ Index: gcc.target/x86_64/abi/callabi/vaarg-5a.c =================================================================== --- gcc.target/x86_64/abi/callabi/vaarg-5a.c (revision 206165) +++ gcc.target/x86_64/abi/callabi/vaarg-5a.c (working copy) @@ -1,5 +1,5 @@ /* Test for cross x86_64<->w64 abi va_list calls. */ -/* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-do run } */ /* { dg-options "-O2 -mabi=ms -std=gnu99 -fno-builtin -maccumulate-outgoing-args" } */ /* { dg-additional-sources "vaarg-5b.c" } */