LGTM
Ollie
On Wed, Sep 14, 2011 at 3:29 PM, Diego Novillo <dnovi...@google.com> wrote:
>
> This merge brings google/integration up to rev 178783. I also
> merged rev 178833 to get the testsuite validation script I
> committed to trunk yesterday.
>
> Simon, Ollie, I expect our internal builder to fail until I
> incorporate validate_failures.py into it. It's a catch-22, but
> it is easier to keep the local changes to the builder than the
> whole merge.
>
> I have reverted all the xfail/skip markers we used to have. I
> moved the ones that still fail to the new xfail manifest file in
> contrib/testsuite-management (we'll likely need manifests for
> other platforms as well).
>
> Tested on x86_64. Committed to google/integration.
>
>
> 2011-09-14 Diego Novillo <dnovi...@google.com>
>
> Mainline merge rev 178783.
> Cherry pick mainline rev 178833.
>
> 2011-09-14 Diego Novillo <dnovi...@google.com>
>
> contrib/ChangeLog.google-integration
>
> * testsuite-management/x86_64-unknown-linux-gnu.xfail: New.
>
> gcc/testsuite/ChangeLog.google-integration
>
> * g++.dg/tree-prof/partition2.C: Revert to mainline variant.
> * g++.dg/tree-ssa/pr41186.C: Likewise.
> * gcc.dg/cproj-fails-with-broken-glibc.c: Likewise.
> * gcc.dg/guality/sra-1.c: Likewise.
> * gcc.dg/guality/vla-1.c: Likewise.
> * gcc.dg/guality/vla-2.c: Likewise.
> * gcc.dg/inline_3.c: Likewise.
> * gcc.dg/inline_4.c: Likewise.
> * gcc.dg/tree-ssa/vrp47.c: Likewise.
> * gcc.dg/uninit-B.c: Likewise.
> * gcc.dg/uninit-pr19430.c: Likewise.
> * gcc.dg/unroll_2.c: Likewise.
> * gcc.dg/unroll_3.c: Likewise.
> * gcc.dg/unroll_4.c: Likewise.
> * gcc.target/i386/pr27827.c: Likewise.
> * gcc.target/i386/sse4_1-blendps-2.c: Likewise.
> * gcc.target/i386/sse4_1-blendps.c: Likewise.
>
> libmudflap/ChangeLog.google-integration
>
> * testsuite/libmudflap.c++/pass55-frag.cxx: Revert to
> mainline variant.
>
> libstdc++-v3/ChangeLog.google-integration:
>
> * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
> Revert to mainline variant.
> *
> testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc:
> Likewise.
> *
> testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc:
> Likewise.
> * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
> Likewise.
>
> diff --git
> a/svnclient/contrib/testsuite-management/x86_64-unknown-linux-gnu.xfail
> b/svnclient/contrib/testsuite-management/x86_64-unknown-linux-gnu.xfail
> new file mode 100644
> index 0000000..b3e86a5
> --- /dev/null
> +++ b/svnclient/contrib/testsuite-management/x86_64-unknown-linux-gnu.xfail
> @@ -0,0 +1,59 @@
> +# These tests fail in trunk in all configurations.
> +FAIL: 23_containers/vector/requirements/dr438/assign_neg.cc (test for
> errors, line 1222)
> +FAIL: 23_containers/vector/requirements/dr438/assign_neg.cc (test for excess
> errors)
> +FAIL: 23_containers/vector/requirements/dr438/constructor_1_neg.cc (test for
> excess errors)
> +FAIL: 23_containers/vector/requirements/dr438/constructor_1_neg.cc (test for
> errors, line 1152)
> +FAIL: 23_containers/vector/requirements/dr438/constructor_2_neg.cc (test for
> excess errors)
> +FAIL: 23_containers/vector/requirements/dr438/constructor_2_neg.cc (test for
> errors, line 1152)
> +FAIL: 23_containers/vector/requirements/dr438/insert_neg.cc (test for excess
> errors)
> +FAIL: 23_containers/vector/requirements/dr438/insert_neg.cc (test for
> errors, line 1263)
> +FAIL: gcc.dg/cproj-fails-with-broken-glibc.c execution test
> +XPASS: gcc.dg/inline_3.c (test for excess errors)
> +XPASS: gcc.dg/inline_4.c (test for excess errors)
> +FAIL: gcc.dg/tree-ssa/vrp47.c scan-tree-dump-times dom1 "x[^ ]* & y" 1
> +XPASS: gcc.dg/uninit-B.c uninit i warning (test for warnings, line 12)
> +XPASS: gcc.dg/uninit-pr19430.c uninitialized (test for warnings, line 41)
> +XPASS: gcc.dg/uninit-pr19430.c (test for warnings, line 32)
> +XPASS: gcc.dg/unroll_2.c (test for excess errors)
> +XPASS: gcc.dg/unroll_3.c (test for excess errors)
> +XPASS: gcc.dg/unroll_4.c (test for excess errors)
> +FAIL: libmudflap.c++/pass55-frag.cxx ( -O) execution test
> +
> +# The following tests are failing with gold. The LTO plugin is not resolving
> +# names properly. Only builds configured to use gold will show these.
> +UNRESOLVED: gcc.c-torture/execute/20010209-1.c execution, -O2 -flto
> -flto-partition=none
> +UNRESOLVED: gcc.c-torture/execute/20010209-1.c execution, -O2 -flto
> +FAIL: gcc.c-torture/execute/20010209-1.c compilation, -O2 -flto (internal
> compiler error)
> +FAIL: gcc.c-torture/execute/20010209-1.c compilation, -O2 -flto
> -flto-partition=none (internal compiler error)
> +
> +# These tests fail in trunk when compiled with -m32.
> +FAIL: boehm-gc.c/thread_leak_test.c -O2 (test for excess errors)
> +FAIL: gcc.target/i386/pr27827.c scan-assembler fmul[ \t]*%st
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O1 (internal compiler
> error)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O1 (test for excess
> errors)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O2 (internal compiler
> error)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O2 (test for excess
> errors)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O3 -fomit-frame-pointer
> (internal compiler error)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O3 -fomit-frame-pointer
> (test for excess errors)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O3 -fomit-frame-pointer
> -funroll-loops (internal compiler error)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O3 -fomit-frame-pointer
> -funroll-loops (test for excess errors)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O3 -fomit-frame-pointer
> -funroll-all-loops -finline-functions (internal compiler error)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O3 -fomit-frame-pointer
> -funroll-all-loops -finline-functions (test for excess errors)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O3 -g (internal compiler
> error)
> +FAIL: gfortran.dg/actual_array_constructor_1.f90 -O3 -g (test for excess
> errors)
> +UNRESOLVED: gfortran.dg/actual_array_constructor_1.f90 -O3 -g compilation
> failed to produce executable
> +UNRESOLVED: gfortran.dg/actual_array_constructor_1.f90 -O1 compilation
> failed to produce executable
> +UNRESOLVED: gfortran.dg/actual_array_constructor_1.f90 -O3
> -fomit-frame-pointer -funroll-all-loops -finline-functions compilation
> failed to produce executable
> +UNRESOLVED: gfortran.dg/actual_array_constructor_1.f90 -O2 compilation
> failed to produce executable
> +UNRESOLVED: gfortran.dg/actual_array_constructor_1.f90 -O3
> -fomit-frame-pointer compilation failed to produce executable
> +UNRESOLVED: gfortran.dg/actual_array_constructor_1.f90 -O3
> -fomit-frame-pointer -funroll-loops compilation failed to produce executable
> +
> +# These are flaky when tested in loaded machines (they exceed the timeout)
> +flaky | FAIL: libmudflap.cth/pass40-frag.c (-O2) output pattern test
> +flaky | FAIL: libmudflap.cth/pass40-frag.c (-static -DSTATIC) execution test
> +flaky | FAIL: libmudflap.cth/pass40-frag.c (-O3) execution test
> +flaky | FAIL: libmudflap.cth/pass40-frag.c (-static -DSTATIC) output pattern
> test
> +flaky | FAIL: libmudflap.cth/pass40-frag.c (-O3) output pattern test
> +flaky | FAIL: libmudflap.cth/pass40-frag.c execution test
> +flaky | FAIL: libmudflap.cth/pass40-frag.c output pattern test
> +flaky | FAIL: libmudflap.cth/pass40-frag.c (-O2) execution test
> diff --git a/svnclient/gcc/testsuite/g++.dg/tree-prof/partition2.C
> b/svnclient/gcc/testsuite/g++.dg/tree-prof/partition2.C
> index 062ef68..6715da5 100644
> --- a/svnclient/gcc/testsuite/g++.dg/tree-prof/partition2.C
> +++ b/svnclient/gcc/testsuite/g++.dg/tree-prof/partition2.C
> @@ -2,7 +2,6 @@
> // { dg-require-effective-target freorder }
> // { dg-options "-fnon-call-exceptions -freorder-blocks-and-partition" }
> // { dg-skip-if "PR target/47683" { mips-sgi-irix* } }
> -// { dg-skip-if "google/integration - broken in trunk" { *-*-* } }
>
> int
> main ()
> diff --git a/svnclient/gcc/testsuite/g++.dg/tree-ssa/pr41186.C
> b/svnclient/gcc/testsuite/g++.dg/tree-ssa/pr41186.C
> index ffd5d9a..cc685b2 100644
> --- a/svnclient/gcc/testsuite/g++.dg/tree-ssa/pr41186.C
> +++ b/svnclient/gcc/testsuite/g++.dg/tree-ssa/pr41186.C
> @@ -30,6 +30,6 @@ int main()
> }
>
> /* { dg-final { scan-tree-dump "Replaced b1.b with 1" "fre1" } } */
> -/* { dg-final { scan-tree-dump "Replaced b1.D.\[0-9\]*.i with 0" "fre1" {
> xfail *-*-* } } } */
> -/* { dg-final { scan-tree-dump "Replaced b1.D.\[0-9\]*.f with 1" "fre1" {
> xfail *-*-* } } } */
> +/* { dg-final { scan-tree-dump "Replaced b1.D.\[0-9\]*.i with 0" "fre1" } }
> */
> +/* { dg-final { scan-tree-dump "Replaced b1.D.\[0-9\]*.f with 1" "fre1" } }
> */
> /* { dg-final { cleanup-tree-dump "fre1" } } */
> diff --git a/svnclient/gcc/testsuite/gcc.dg/cproj-fails-with-broken-glibc.c
> b/svnclient/gcc/testsuite/gcc.dg/cproj-fails-with-broken-glibc.c
> index 9e8f1cf..fe143b9 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/cproj-fails-with-broken-glibc.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/cproj-fails-with-broken-glibc.c
> @@ -7,8 +7,7 @@
>
> Origin: Kaveh R. Ghazi, April 20, 2010. */
>
> -/* FIXME google - Change to dg-run after upgrading glibc. */
> -/* { dg-do compile } */
> +/* { dg-do run } */
> /* { dg-options "-fno-builtin-cproj" } */
> /* { dg-add-options c99_runtime } */
> /* { dg-require-effective-target c99_runtime } */
> diff --git a/svnclient/gcc/testsuite/gcc.dg/guality/sra-1.c
> b/svnclient/gcc/testsuite/gcc.dg/guality/sra-1.c
> index e36d68d..e779d7a 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/guality/sra-1.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/guality/sra-1.c
> @@ -40,7 +40,7 @@ f3 (int k)
> asm ("" : "+r" (a.i));
> a.j++;
> bar (a.i); /* { dg-final { gdb-test 43 "a.i" "4" } } */
> - bar (a.j); /* { dg-final { gdb-test 43 "a.j" "14" { xfail *-*-*
> } } } */
> + bar (a.j); /* { dg-final { gdb-test 43 "a.j" "14" } } */
> return a.i + a.j;
> }
>
> diff --git a/svnclient/gcc/testsuite/gcc.dg/guality/vla-1.c
> b/svnclient/gcc/testsuite/gcc.dg/guality/vla-1.c
> index b5185d6..6514654 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/guality/vla-1.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/guality/vla-1.c
> @@ -14,14 +14,14 @@ f1 (int i)
> {
> char a[i + 1];
> a[0] = 5; /* { dg-final { gdb-test 17 "i" "5" } } */
> - return a[0]; /* { dg-final { gdb-test 17 "sizeof (a)" "6" { xfail
> *-*-* } } } */
> + return a[0]; /* { dg-final { gdb-test 17 "sizeof (a)" "6" } } */
> }
>
> int __attribute__((noinline))
> f2 (int i)
> {
> short a[i * 2 + 7]; /* { dg-final { gdb-test 24 "i" "5" } } */
> - bar (a); /* { dg-final { gdb-test 24 "sizeof (a)" "17 * sizeof
> (short)" { xfail *-*-* } } } */
> + bar (a); /* { dg-final { gdb-test 24 "sizeof (a)" "17 * sizeof
> (short)" } } */
> return a[i + 4];
> }
>
> diff --git a/svnclient/gcc/testsuite/gcc.dg/guality/vla-2.c
> b/svnclient/gcc/testsuite/gcc.dg/guality/vla-2.c
> index d473cdd..6773775 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/guality/vla-2.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/guality/vla-2.c
> @@ -13,7 +13,7 @@ fn2 (int i)
> {
> int a[i];
> fn1 (a, i);
> - fn1 (a, i); /* { dg-final { gdb-test 16 "sizeof (a)" "5 * sizeof
> (int)" { xfail *-*-* } } } */
> + fn1 (a, i); /* { dg-final { gdb-test 16 "sizeof (a)" "5 * sizeof
> (int)" } } */
> return i;
> }
>
> @@ -22,7 +22,7 @@ fn3 (int i)
> {
> int a[i];
> fn1 (a, i);
> - fn1 (a, i); /* { dg-final { gdb-test 25 "sizeof (a)" "6 * sizeof
> (int)" { xfail *-*-* } } } */
> + fn1 (a, i); /* { dg-final { gdb-test 25 "sizeof (a)" "6 * sizeof
> (int)" } } */
> return i;
> }
>
> diff --git a/svnclient/gcc/testsuite/gcc.dg/inline_3.c
> b/svnclient/gcc/testsuite/gcc.dg/inline_3.c
> index 0b9ffed..17871c6 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/inline_3.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/inline_3.c
> @@ -20,3 +20,4 @@ int foo2 (void)
>
> /* { dg-final { scan-tree-dump-times "bar" 5 "optimized" } } */
> /* { dg-final { cleanup-tree-dump "optimized" } } */
> +/* { dg-excess-errors "extra notes" } */
> diff --git a/svnclient/gcc/testsuite/gcc.dg/inline_4.c
> b/svnclient/gcc/testsuite/gcc.dg/inline_4.c
> index a2fcac4..1feefa1 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/inline_4.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/inline_4.c
> @@ -20,3 +20,4 @@ int foo2 (void)
>
> /* { dg-final { scan-tree-dump-times "bar" 4 "optimized" } } */
> /* { dg-final { cleanup-tree-dump "optimized" } } */
> +/* { dg-excess-errors "extra notes" } */
> diff --git a/svnclient/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c
> b/svnclient/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c
> index 4e6ef98..19e1911 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c
> @@ -37,7 +37,7 @@ int f(int x)
> /* { dg-final { scan-tree-dump-times "\[xy\]\[^ \]* !=" 0 "vrp1" } } */
>
> /* This one needs more copy propagation that only happens in dom1. */
> -/* { dg-final { scan-tree-dump-times "x\[^ \]* & y" 1 "dom1" { xfail *-*-* }
> } } */
> +/* { dg-final { scan-tree-dump-times "x\[^ \]* & y" 1 "dom1" } } */
> /* { dg-final { scan-tree-dump-times "x\[^ \]* & y" 1 "vrp1" { xfail *-*-* }
> } } */
>
> /* These two are fully simplified by VRP. */
> diff --git a/svnclient/gcc/testsuite/gcc.dg/uninit-B.c
> b/svnclient/gcc/testsuite/gcc.dg/uninit-B.c
> index adb1461..f03dd70 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/uninit-B.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/uninit-B.c
> @@ -9,7 +9,7 @@ void
> baz (void)
> {
> int i;
> - if (i) /* { dg-warning "is used uninitialized" "uninit i warning" } */
> + if (i) /* { dg-warning "is used uninitialized" "uninit i warning" { xfail
> *-*-* } } */
> bar (i);
> foo (&i);
> }
> diff --git a/svnclient/gcc/testsuite/gcc.dg/uninit-pr19430.c
> b/svnclient/gcc/testsuite/gcc.dg/uninit-pr19430.c
> index 3612931..4d2b4f6 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/uninit-pr19430.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/uninit-pr19430.c
> @@ -29,7 +29,7 @@ void frob(int *pi);
> int main(void)
> {
> int i;
> - printf("i = %d\n", i); /* { dg-warning "'i' is used uninitialized in this
> function" "" } */
> + printf("i = %d\n", i); /* { dg-warning "'i' is used uninitialized in this
> function" "" { xfail *-*-* } } */
> frob(&i);
>
> return 0;
> @@ -38,6 +38,6 @@ int main(void)
> void foo3(int*);
> void bar3(void) {
> int x;
> - if(x) /* { dg-warning "'x' is used uninitialized in this function"
> "uninitialized" } */
> + if(x) /* { dg-warning "'x' is used uninitialized in this function"
> "uninitialized" { xfail *-*-* } } */
> foo3(&x);
> }
> diff --git a/svnclient/gcc/testsuite/gcc.dg/unroll_2.c
> b/svnclient/gcc/testsuite/gcc.dg/unroll_2.c
> index 9fdec57..12912cf 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/unroll_2.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/unroll_2.c
> @@ -30,3 +30,4 @@ int foo2(void)
>
> /* { dg-final { scan-rtl-dump-times "Decided to peel loop completely" 1
> "loop2_unroll" } } */
> /* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */
> +/* { dg-excess-errors "extra notes" } */
> diff --git a/svnclient/gcc/testsuite/gcc.dg/unroll_3.c
> b/svnclient/gcc/testsuite/gcc.dg/unroll_3.c
> index cc9a4fb..d86ed55 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/unroll_3.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/unroll_3.c
> @@ -30,3 +30,4 @@ int foo2(void)
>
> /* { dg-final { scan-rtl-dump-times "Decided to peel loop completely" 1
> "loop2_unroll" } } */
> /* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */
> +/* { dg-excess-errors "extra notes" } */
> diff --git a/svnclient/gcc/testsuite/gcc.dg/unroll_4.c
> b/svnclient/gcc/testsuite/gcc.dg/unroll_4.c
> index 4484f04..7c70157 100644
> --- a/svnclient/gcc/testsuite/gcc.dg/unroll_4.c
> +++ b/svnclient/gcc/testsuite/gcc.dg/unroll_4.c
> @@ -30,3 +30,4 @@ int foo2(void)
>
> /* { dg-final { scan-rtl-dump-times "Decided to peel loop completely" 1
> "loop2_unroll" } } */
> /* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */
> +/* { dg-excess-errors "extra notes" } */
> diff --git a/svnclient/gcc/testsuite/gcc.target/i386/pr27827.c
> b/svnclient/gcc/testsuite/gcc.target/i386/pr27827.c
> index bb6b025..3b33744 100644
> --- a/svnclient/gcc/testsuite/gcc.target/i386/pr27827.c
> +++ b/svnclient/gcc/testsuite/gcc.target/i386/pr27827.c
> @@ -1,6 +1,6 @@
> /* { dg-do compile } */
> /* { dg-require-effective-target ilp32 } */
> -/* { dg-options "-O2 -mfpmath=387 -mtune=generic" } */
> +/* { dg-options "-O2 -mfpmath=387" } */
>
> double a, b;
> double f(double c)
> diff --git a/svnclient/gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c
> b/svnclient/gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c
> index a15bc95..af56e14 100644
> --- a/svnclient/gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c
> +++ b/svnclient/gcc/testsuite/gcc.target/i386/sse4_1-blendps-2.c
> @@ -1,7 +1,6 @@
> /* { dg-do run } */
> /* { dg-require-effective-target sse4 } */
> -/* FIXME - Forced -O0. This test is flaky as of trunk@175879. */
> -/* { dg-options "-O0 -msse4.1" } */
> +/* { dg-options "-O2 -msse4.1" } */
>
> #include "sse4_1-check.h"
>
> diff --git a/svnclient/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c
> b/svnclient/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c
> index f6824ad..b4d8e8e 100644
> --- a/svnclient/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c
> +++ b/svnclient/gcc/testsuite/gcc.target/i386/sse4_1-blendps.c
> @@ -1,7 +1,6 @@
> /* { dg-do run } */
> /* { dg-require-effective-target sse4 } */
> -/* FIXME - Forced -O0. This test is flaky as of trunk@175879. */
> -/* { dg-options "-O0 -msse4.1" } */
> +/* { dg-options "-O2 -msse4.1" } */
>
> #ifndef CHECK_H
> #define CHECK_H "sse4_1-check.h"
> diff --git a/svnclient/libmudflap/testsuite/libmudflap.c++/pass55-frag.cxx
> b/svnclient/libmudflap/testsuite/libmudflap.c++/pass55-frag.cxx
> index e2bc583..e83c124 100644
> --- a/svnclient/libmudflap/testsuite/libmudflap.c++/pass55-frag.cxx
> +++ b/svnclient/libmudflap/testsuite/libmudflap.c++/pass55-frag.cxx
> @@ -1,4 +1,3 @@
> -/* { dg-options "-O2" } - This test is flaky under GRTE. */
> #include <vector>
>
> int main() {
> diff --git
> a/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
>
> b/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
> index 10da012..55b9096 100644
> ---
> a/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
> +++
> b/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
> @@ -18,7 +18,7 @@
> // <http://www.gnu.org/licenses/>.
>
> // { dg-do compile }
> -// { dg-error "no matching" "" { target *-*-* } 0 }
> +// { dg-error "no matching" "" { target *-*-* } 1222 }
>
> #include <vector>
>
> diff --git
> a/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
>
> b/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
> index 878d405..6ea2c6f 100644
> ---
> a/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
> +++
> b/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
> @@ -18,7 +18,7 @@
> // <http://www.gnu.org/licenses/>.
>
> // { dg-do compile }
> -// { dg-error "no matching" "" { target *-*-* } 0 }
> +// { dg-error "no matching" "" { target *-*-* } 1152 }
>
> #include <vector>
>
> diff --git
> a/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
>
> b/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
> index ec4f653..75b5bd6 100644
> ---
> a/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
> +++
> b/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
> @@ -18,7 +18,7 @@
> // <http://www.gnu.org/licenses/>.
>
> // { dg-do compile }
> -// { dg-error "no matching" "" { target *-*-* } 0 }
> +// { dg-error "no matching" "" { target *-*-* } 1152 }
>
> #include <vector>
> #include <utility>
> diff --git
> a/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
>
> b/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
> index fd2307a..d93de19 100644
> ---
> a/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
> +++
> b/svnclient/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
> @@ -18,7 +18,7 @@
> // <http://www.gnu.org/licenses/>.
>
> // { dg-do compile }
> -// { dg-error "no matching" "" { target *-*-* } 0 }
> +// { dg-error "no matching" "" { target *-*-* } 1263 }
>
> #include <vector>
>
