Message ID | 20130122170044.GZ7269@tucnak.redhat.com |
---|---|
State | New |
Headers | show |
On 22 January 2013 17:00, Jakub Jelinek wrote: > > Now in the form of a tested patch (regtested on x86_64-linux and > i686-linux). Ok for trunk? OK, thanks. > dg-additional-options unfortunately isn't supported in libstdc++ testsuite, > so had to use second dg-options, and also the \(, \) were wrong and resulted > in no matches. Kai has a forthcoming patch to add dg-additional-options: http://gcc.gnu.org/ml/gcc-patches/2013-01/msg00945.html
> Now in the form of a tested patch (regtested on x86_64-linux and > i686-linux). Ok for trunk? > > dg-additional-options unfortunately isn't supported in libstdc++ testsuite, > so had to use second dg-options, and also the \(, \) were wrong and resulted > in no matches. Looks good to me (but cannot approve). Thanks Jakub for fixing this up. -Andi > > 2013-01-22 Jakub Jelinek <jakub@redhat.com> > > * testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc: > Tightten scan-assembler-times regexps, add dg-additional-options for > ia32, add -g0 -fno-exceptions -fno-asynchronous-unwind-tables to > dg-options. > > --- libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc.jj 2013-01-21 10:57:10.199935240 +0100 > +++ libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc 2013-01-22 14:46:15.851668073 +0100 > @@ -1,9 +1,10 @@ > -// { dg-options "-std=gnu++0x" } > // { dg-do compile { target i?86-*-* x86_64-*-* } } > -// { dg-final { scan-assembler-times "\(xacquire\|\.byte.*0xf2\)" 14 } } > -// { dg-final { scan-assembler-times "\(xrelease\|\.byte.*0xf3\)" 14 } } > +// { dg-options "-std=gnu++0x -g0 -fno-exceptions -fno-asynchronous-unwind-tables" } > +// { dg-options "-std=gnu++0x -g0 -fno-exceptions -fno-asynchronous-unwind-tables -march=i486" { target ia32 } } > +// { dg-final { scan-assembler-times "xacquire\|\.byte\[^\n\r]*0xf2" 14 } } > +// { dg-final { scan-assembler-times "xrelease\|\.byte\[^\n\r]*0xf3" 14 } } > > -// Copyright (C) 2008, 2009, 2013 Free Software Foundation, Inc. > +// Copyright (C) 2008-2013 Free Software Foundation, Inc. > // > // This file is part of the GNU ISO C++ Library. This library is free > // software; you can redistribute it and/or modify it under the > > > Jakub >
--- libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc.jj 2013-01-21 10:57:10.199935240 +0100 +++ libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc 2013-01-22 14:46:15.851668073 +0100 @@ -1,9 +1,10 @@ -// { dg-options "-std=gnu++0x" } // { dg-do compile { target i?86-*-* x86_64-*-* } } -// { dg-final { scan-assembler-times "\(xacquire\|\.byte.*0xf2\)" 14 } } -// { dg-final { scan-assembler-times "\(xrelease\|\.byte.*0xf3\)" 14 } } +// { dg-options "-std=gnu++0x -g0 -fno-exceptions -fno-asynchronous-unwind-tables" } +// { dg-options "-std=gnu++0x -g0 -fno-exceptions -fno-asynchronous-unwind-tables -march=i486" { target ia32 } } +// { dg-final { scan-assembler-times "xacquire\|\.byte\[^\n\r]*0xf2" 14 } } +// { dg-final { scan-assembler-times "xrelease\|\.byte\[^\n\r]*0xf3" 14 } } -// Copyright (C) 2008, 2009, 2013 Free Software Foundation, Inc. +// Copyright (C) 2008-2013 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the