Fix testsuite failures caused by our default warning patches.

3 files changed, 496 insertions, 0 deletions

diff --git a/4.5.2/gentoo/99_all_testsuite-01-Wformat.patch b/4.5.2/gentoo/99_all_testsuite-01-Wformat.patch
new file mode 100644
index 0000000..9ac9221
--- /dev/null
+++ b/4.5.2/gentoo/99_all_testsuite-01-Wformat.patch
@@ -0,0 +1,391 @@
+ Workaround testsuite failures caused by enabling -Wformat -Wformat-security
+ by default.
+
+ gcc/testsuite/g++.dg/abi/pragma-pack1.C            |    1 +
+ gcc/testsuite/g++.dg/ext/align1.C                  |    2 ++
+ gcc/testsuite/g++.dg/opt/alias2.C                  |    2 +-
+ gcc/testsuite/g++.old-deja/g++.abi/vbase1.C        |    1 +
+ gcc/testsuite/g++.old-deja/g++.brendan/template8.C |    1 +
+ gcc/testsuite/g++.old-deja/g++.jason/access23.C    |    1 +
+ gcc/testsuite/g++.old-deja/g++.law/cvt8.C          |    1 +
+ gcc/testsuite/g++.old-deja/g++.law/operators28.C   |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/net35.C        |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/offset1.C      |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/p12306.C       |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/p3579.C        |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/p3708.C        |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/p3708a.C       |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/p3708b.C       |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/p646.C         |    2 +-
+ gcc/testsuite/g++.old-deja/g++.mike/p710.C         |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/p789a.C        |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/pmf2.C         |    1 +
+ gcc/testsuite/g++.old-deja/g++.mike/temp.C         |    1 +
+ gcc/testsuite/g++.old-deja/g++.other/virtual8.C    |    1 +
+ gcc/testsuite/g++.old-deja/g++.pt/memtemp23.C      |    1 +
+ gcc/testsuite/g++.old-deja/g++.pt/memtemp24.C      |    1 +
+ gcc/testsuite/g++.old-deja/g++.pt/memtemp25.C      |    1 +
+ gcc/testsuite/g++.old-deja/g++.pt/memtemp26.C      |    1 +
+ gcc/testsuite/g++.old-deja/g++.pt/t39.C            |    1 +
+ gcc/testsuite/g++.old-deja/g++.robertl/eb17.C      |    1 +
+ gcc/testsuite/gcc.dg/charset/builtin2.c            |    2 +-
+ gcc/testsuite/gcc.dg/format/opt-1.c                |    2 +-
+ gcc/testsuite/gcc.dg/format/opt-2.c                |    2 +-
+ gcc/testsuite/gcc.dg/format/opt-3.c                |    2 +-
+ gcc/testsuite/gcc.dg/format/opt-4.c                |    2 +-
+ gcc/testsuite/gcc.dg/format/opt-5.c                |    2 +-
+ gcc/testsuite/gcc.dg/format/opt-6.c                |    2 +-
+ gcc/testsuite/gcc.dg/ipa/ipa-sra-1.c               |    2 +-
+ gcc/testsuite/gcc.dg/matrix/matrix-2.c             |    2 +-
+ gcc/testsuite/gcc.dg/packed-vla.c                  |    2 +-
+ gcc/testsuite/gcc.dg/pch/inline-4.c                |    2 ++
+ gcc/testsuite/gcc.dg/pr30473.c                     |    2 +-
+ gcc/testsuite/gcc.dg/pr38902.c                     |    2 +-
+ 40 files changed, 42 insertions(+), 14 deletions(-)
+
+--- a/gcc/testsuite/g++.dg/abi/pragma-pack1.C
++++ b/gcc/testsuite/g++.dg/abi/pragma-pack1.C
+@@ -1,3 +1,4 @@
++/* { dg-options "-Wformat=0" } */
+ // PR c++/7046
+ 
+ extern "C" int printf (const char *, ...);
+--- a/gcc/testsuite/g++.dg/ext/align1.C
++++ b/gcc/testsuite/g++.dg/ext/align1.C
+@@ -1,3 +1,5 @@
++/* { dg-options "-Wformat=0" } */
++
+ // Test that __attribute__ ((aligned)) is preserved.
+ // The alignment used to be 64 but Cygwin does not
+ // support an alignment greater than 16 and COFF 
+--- a/gcc/testsuite/g++.dg/opt/alias2.C
++++ b/gcc/testsuite/g++.dg/opt/alias2.C
+@@ -1,5 +1,5 @@
+ // { dg-do run }
+-// { dg-options "-O2" }
++// { dg-options "-O2 -Wformat=0" }
+ 
+ extern "C" int printf (const char*, ...);
+ 
+--- a/gcc/testsuite/g++.old-deja/g++.abi/vbase1.C
++++ b/gcc/testsuite/g++.old-deja/g++.abi/vbase1.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ // Copyright (C) 2000 Free Software Foundation, Inc.
+ // Contributed by Nathan Sidwell 16 Jan 2001 <nathan@codesourcery.com>
+ 
+--- a/gcc/testsuite/g++.old-deja/g++.brendan/template8.C
++++ b/gcc/testsuite/g++.old-deja/g++.brendan/template8.C
+@@ -1,4 +1,5 @@
+ // { dg-do assemble  }
++/* { dg-options "-Wformat=0" } */
+ // GROUPS passed templates
+ #include <stdio.h>
+ 
+--- a/gcc/testsuite/g++.old-deja/g++.jason/access23.C
++++ b/gcc/testsuite/g++.old-deja/g++.jason/access23.C
+@@ -1,4 +1,5 @@
+ // { dg-do assemble  }
++/* { dg-options "-Wformat=0" } */
+ // PRMS Id: 9127
+ // Bug: members of anonymous unions are not access-controlled.
+ 
+--- a/gcc/testsuite/g++.old-deja/g++.law/cvt8.C
++++ b/gcc/testsuite/g++.old-deja/g++.law/cvt8.C
+@@ -1,4 +1,5 @@
+ // { dg-do assemble  }
++/* { dg-options "-Wformat=0" } */
+ // GROUPS passed conversions
+ // cvt file
+ // From: solomon@cs.wisc.edu (Marvin Solomon)
+--- a/gcc/testsuite/g++.old-deja/g++.law/operators28.C
++++ b/gcc/testsuite/g++.old-deja/g++.law/operators28.C
+@@ -1,4 +1,5 @@
+ // { dg-do assemble  }
++/* { dg-options "-Wformat=0" } */
+ // GROUPS passed operators
+ #include <sys/types.h>
+ #include <stdio.h>
+--- a/gcc/testsuite/g++.old-deja/g++.mike/net35.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/net35.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ extern "C" int printf(const char *, ...);
+ 
+ class A {
+--- a/gcc/testsuite/g++.old-deja/g++.mike/offset1.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/offset1.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ extern "C" int printf(const char *, ...);
+ void *vp;
+ int fail = 0;
+--- a/gcc/testsuite/g++.old-deja/g++.mike/p12306.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/p12306.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ // prms-id: 12306
+ 
+ void *ptr1, *ptr2;
+--- a/gcc/testsuite/g++.old-deja/g++.mike/p3579.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/p3579.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ // prms-id: 3579
+ 
+ extern "C" int printf(const char *, ...);
+--- a/gcc/testsuite/g++.old-deja/g++.mike/p3708.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/p3708.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ // prms-id: 3708
+ 
+ extern "C" int printf (const char *, ...);
+--- a/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ // prms-id: 3708
+ 
+ extern "C" int printf (const char *, ...);
+--- a/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ // prms-id: 3708
+ 
+ extern "C" int printf (const char *, ...);
+--- a/gcc/testsuite/g++.old-deja/g++.mike/p646.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/p646.C
+@@ -1,5 +1,5 @@
+ // { dg-do assemble  }
+-// { dg-options "-Wno-deprecated -Wreturn-type" }
++// { dg-options "-Wno-deprecated -Wreturn-type -Wformat=0" }
+ // GROUPS passed i960
+ /*
+   Bug Id: bnr
+--- a/gcc/testsuite/g++.old-deja/g++.mike/p710.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/p710.C
+@@ -1,4 +1,5 @@
+ // { dg-do assemble  }
++/* { dg-options "-Wformat=0" } */
+ // GROUPS passed delete
+ /*
+   Bug Id: 
+--- a/gcc/testsuite/g++.old-deja/g++.mike/p789a.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/p789a.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ // global and local multidimensional array objects are not getting
+ // constructors called on any dimension, other than the first.  Also,
+ // the destructors are not being called.  Seems odd, they probably
+--- a/gcc/testsuite/g++.old-deja/g++.mike/pmf2.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/pmf2.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ extern "C" int printf(const char *, ...);
+ 
+ class A_table {
+--- a/gcc/testsuite/g++.old-deja/g++.mike/temp.C
++++ b/gcc/testsuite/g++.old-deja/g++.mike/temp.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ extern "C" int printf(const char *, ...);
+ extern "C" const char *getenv(const char *);
+ 
+--- a/gcc/testsuite/g++.old-deja/g++.other/virtual8.C
++++ b/gcc/testsuite/g++.old-deja/g++.other/virtual8.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ extern "C" int printf (const char*, ...);
+ 
+ struct A
+--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp23.C
++++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp23.C
+@@ -1,4 +1,5 @@
+ // { dg-do link  }
++/* { dg-options "-Wformat=0" } */
+ // GROUPS passed templates membertemplates
+ extern "C" int printf(const char*, ...);
+ 
+--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp24.C
++++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp24.C
+@@ -1,4 +1,5 @@
+ // { dg-do link  }
++/* { dg-options "-Wformat=0" } */
+ // GROUPS passed templates membertemplates
+ extern "C" int printf(const char*, ...);
+ 
+--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp25.C
++++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp25.C
+@@ -1,4 +1,5 @@
+ // { dg-do link  }
++/* { dg-options "-Wformat=0" } */
+ // GROUPS passed templates membertemplates
+ extern "C" int printf(const char*, ...);
+ 
+--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp26.C
++++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp26.C
+@@ -1,4 +1,5 @@
+ // { dg-do link  }
++/* { dg-options "-Wformat=0" } */
+ // GROUPS passed templates membertemplates
+ extern "C" int printf(const char*, ...);
+ 
+--- a/gcc/testsuite/g++.old-deja/g++.pt/t39.C
++++ b/gcc/testsuite/g++.old-deja/g++.pt/t39.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ extern "C" int printf (const char *, ...);
+ 
+ template <class T>
+--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb17.C
++++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb17.C
+@@ -1,4 +1,5 @@
+ // { dg-do run  }
++/* { dg-options "-Wformat=0" } */
+ #include <stdio.h>
+ 
+ class A {
+--- a/gcc/testsuite/gcc.dg/charset/builtin2.c
++++ b/gcc/testsuite/gcc.dg/charset/builtin2.c
+@@ -3,7 +3,7 @@
+ 
+ /* { dg-do compile } */
+ /* { dg-require-iconv "IBM1047" } */
+-/* { dg-options "-O2 -fexec-charset=IBM1047" } */
++/* { dg-options "-O2 -fexec-charset=IBM1047 -Wformat=0" } */
+ /* { dg-final { scan-assembler-not "printf" } } */
+ /* { dg-final { scan-assembler-not "fprintf" } } */
+ /* { dg-final { scan-assembler-not "sprintf" } } */
+--- a/gcc/testsuite/gcc.dg/format/opt-1.c
++++ b/gcc/testsuite/gcc.dg/format/opt-1.c
+@@ -2,6 +2,6 @@
+    -Wformat.  -Wformat-extra-args.  */
+ /* Origin: Joseph Myers <joseph@codesourcery.com> */
+ /* { dg-do compile } */
+-/* { dg-options "-Wformat-extra-args" } */
++/* { dg-options "-Wformat=0 -Wformat-extra-args" } */
+ 
+ /* { dg-warning "-Wformat-extra-args ignored without -Wformat" "ignored" { target *-*-* } 0 } */
+--- a/gcc/testsuite/gcc.dg/format/opt-2.c
++++ b/gcc/testsuite/gcc.dg/format/opt-2.c
+@@ -2,6 +2,6 @@
+    -Wformat.  -Wformat-nonliteral.  */
+ /* Origin: Joseph Myers <joseph@codesourcery.com> */
+ /* { dg-do compile } */
+-/* { dg-options "-Wformat-nonliteral" } */
++/* { dg-options "-Wformat=0 -Wformat-nonliteral" } */
+ 
+ /* { dg-warning "-Wformat-nonliteral ignored without -Wformat" "ignored" { target *-*-* } 0 } */
+--- a/gcc/testsuite/gcc.dg/format/opt-3.c
++++ b/gcc/testsuite/gcc.dg/format/opt-3.c
+@@ -2,6 +2,6 @@
+    -Wformat.  -Wformat-security.  */
+ /* Origin: Joseph Myers <joseph@codesourcery.com> */
+ /* { dg-do compile } */
+-/* { dg-options "-Wformat-security" } */
++/* { dg-options "-Wformat=0 -Wformat-security" } */
+ 
+ /* { dg-warning "-Wformat-security ignored without -Wformat" "ignored" { target *-*-* } 0 } */
+--- a/gcc/testsuite/gcc.dg/format/opt-4.c
++++ b/gcc/testsuite/gcc.dg/format/opt-4.c
+@@ -2,6 +2,6 @@
+    -Wformat.  -Wformat-y2k.  */
+ /* Origin: Joseph Myers <joseph@codesourcery.com> */
+ /* { dg-do compile } */
+-/* { dg-options "-Wformat-y2k" } */
++/* { dg-options "-Wformat=0 -Wformat-y2k" } */
+ 
+ /* { dg-warning "-Wformat-y2k ignored without -Wformat" "ignored" { target *-*-* } 0 } */
+--- a/gcc/testsuite/gcc.dg/format/opt-5.c
++++ b/gcc/testsuite/gcc.dg/format/opt-5.c
+@@ -2,6 +2,6 @@
+    -Wformat.  -Wformat-zero-length.  */
+ /* Origin: Joseph Myers <joseph@codesourcery.com> */
+ /* { dg-do compile } */
+-/* { dg-options "-Wformat-zero-length" } */
++/* { dg-options "-Wformat=0 -Wformat-zero-length" } */
+ 
+ /* { dg-warning "-Wformat-zero-length ignored without -Wformat" "ignored" { target *-*-* } 0 } */
+--- a/gcc/testsuite/gcc.dg/format/opt-6.c
++++ b/gcc/testsuite/gcc.dg/format/opt-6.c
+@@ -2,6 +2,6 @@
+    -Wformat.  -Wformat-contains-nul.  */
+ /* Origin: Bruce Korb <bkorb@gnu.org> */
+ /* { dg-do compile } */
+-/* { dg-options "-Wformat-contains-nul" } */
++/* { dg-options "-Wformat=0 -Wformat-contains-nul" } */
+ 
+ /* { dg-warning "-Wformat-contains-nul ignored without -Wformat" "ignored" { target *-*-* } 0 } */
+--- a/gcc/testsuite/gcc.dg/ipa/ipa-sra-1.c
++++ b/gcc/testsuite/gcc.dg/ipa/ipa-sra-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do run } */
+-/* { dg-options "-O2 -fipa-sra -fdump-tree-eipa_sra-details"  } */
++/* { dg-options "-O2 -fipa-sra -fdump-tree-eipa_sra-details -Wformat=0"  } */
+ 
+ struct bovid
+ {
+--- a/gcc/testsuite/gcc.dg/matrix/matrix-2.c
++++ b/gcc/testsuite/gcc.dg/matrix/matrix-2.c
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-do run } */
+-
++/* { dg-options "-Wformat=0" } */
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+--- a/gcc/testsuite/gcc.dg/packed-vla.c
++++ b/gcc/testsuite/gcc.dg/packed-vla.c
+@@ -1,6 +1,6 @@
+ /* PR middle-end/27945 */
+ /* { dg-do run } */
+-/* { dg-options "" } */
++/* { dg-options "-Wformat=0" } */
+ 
+ extern int printf (const char *, ...);
+ extern void abort ();
+--- a/gcc/testsuite/gcc.dg/pch/inline-4.c
++++ b/gcc/testsuite/gcc.dg/pch/inline-4.c
+@@ -1,3 +1,5 @@
++/* { dg-options "-Wformat=0" } */
++
+ #include "inline-4.h"
+ extern int printf (const char *, ...);
+ int main(void) {
+--- a/gcc/testsuite/gcc.dg/pr30473.c
++++ b/gcc/testsuite/gcc.dg/pr30473.c
+@@ -1,7 +1,7 @@
+ /* PR middle-end/30473 */
+ /* Make sure this doesn't ICE.  */
+ /* { dg-do compile } */
+-/* { dg-options "-O2" } */
++/* { dg-options "-O2 -Wformat=0" } */
+ 
+ extern int sprintf (char *, const char *, ...);
+ 
+--- a/gcc/testsuite/gcc.dg/pr38902.c
++++ b/gcc/testsuite/gcc.dg/pr38902.c
+@@ -1,6 +1,6 @@
+ /* PR target/38902 */
+ /* { dg-do run } */
+-/* { dg-options "-O2 -fstack-protector" } */
++/* { dg-options "-O2 -fstack-protector -Wformat=0" } */
+ /* { dg-require-effective-target fstack_protector } */
+ 
+ #ifdef DEBUG
diff --git a/4.5.2/gentoo/99_all_testsuite-02-Wtrampolines.patch b/4.5.2/gentoo/99_all_testsuite-02-Wtrampolines.patch
new file mode 100644
index 0000000..f9be664
--- /dev/null
+++ b/4.5.2/gentoo/99_all_testsuite-02-Wtrampolines.patch
@@ -0,0 +1,101 @@
+ Workaround testsuite failures caused by enabling -Wtrampolines by default.
+ 
+ gcc/testsuite/gcc.dg/20050607-1.c                  |    2 +-
+ gcc/testsuite/gcc.dg/debug/debug-3.c               |    1 +
+ gcc/testsuite/gcc.dg/debug/debug-5.c               |    1 +
+ gcc/testsuite/gcc.dg/nested-func-5.c               |    2 +-
+ gcc/testsuite/gcc.dg/pr34457-1.c                   |    2 +-
+ gcc/testsuite/gcc.dg/torture/nested-fn-1.c         |    2 +-
+ gcc/testsuite/gcc.dg/torture/stackalign/nested-5.c |    1 +
+ gcc/testsuite/gcc.dg/torture/stackalign/nested-6.c |    1 +
+ gcc/testsuite/gcc.dg/trampoline-1.c                |    2 +-
+ 9 files changed, 9 insertions(+), 5 deletions(-)
+
+--- a/gcc/testsuite/gcc.dg/20050607-1.c
++++ b/gcc/testsuite/gcc.dg/20050607-1.c
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-require-effective-target trampolines } */
+-/* { dg-options "-Wpadded" }
++/* { dg-options "-Wpadded -Wno-trampolines" }
+ /* The struct internally constructed for the nested function should
+    not result in a warning from -Wpadded. */
+ extern int baz(int (*) (int));
+--- a/gcc/testsuite/gcc.dg/debug/debug-3.c
++++ b/gcc/testsuite/gcc.dg/debug/debug-3.c
+@@ -2,6 +2,7 @@
+    (spanned 0 basic blocks) and DWARF-2 couldn't find baz origin.  */
+ /* { dg-do compile } */
+ /* { dg-require-effective-target trampolines } */
++/* { dg-options "-Wno-trampolines" } */
+ 
+ struct A { char *a, *b, *c, *d; };
+ 
+--- a/gcc/testsuite/gcc.dg/debug/debug-5.c
++++ b/gcc/testsuite/gcc.dg/debug/debug-5.c
+@@ -2,6 +2,7 @@
+    (spanned 0 basic blocks) and DWARF-2 couldn't find baz origin.  */
+ /* { dg-do compile } */
+ /* { dg-require-effective-target trampolines } */
++/* { dg-options "-Wno-trampolines" } */
+ 
+ extern void abort (void);
+ 
+--- a/gcc/testsuite/gcc.dg/nested-func-5.c
++++ b/gcc/testsuite/gcc.dg/nested-func-5.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-fexceptions" } */
++/* { dg-options "-fexceptions -Wno-trampolines" } */
+ /* PR28516: ICE generating ARM unwind directives for nested functions.  */
+ /* { dg-require-effective-target trampolines } */
+ 
+--- a/gcc/testsuite/gcc.dg/pr34457-1.c
++++ b/gcc/testsuite/gcc.dg/pr34457-1.c
+@@ -1,7 +1,7 @@
+ /* PR c/34457 */
+ /* { dg-do compile } */
+ /* { dg-require-effective-target trampolines } */
+-/* { dg-options "--combine -O2" } */
++/* { dg-options "--combine -O2 -Wno-trampolines" } */
+ /* { dg-additional-sources "pr34457-2.c" } */
+    
+ 
+--- a/gcc/testsuite/gcc.dg/torture/nested-fn-1.c
++++ b/gcc/testsuite/gcc.dg/torture/nested-fn-1.c
+@@ -1,7 +1,7 @@
+ /* PR middle-end/15345, c/16450 */
+ /* Test whether unused nested functions aren't emitted into the assembly.  */
+ /* { dg-do compile } */
+-/* { dg-options "-g0" } */
++/* { dg-options "-g0 -Wno-trampolines" } */
+ /* { dg-require-effective-target trampolines } */
+ 
+ int
+--- a/gcc/testsuite/gcc.dg/torture/stackalign/nested-5.c
++++ b/gcc/testsuite/gcc.dg/torture/stackalign/nested-5.c
+@@ -1,4 +1,5 @@
+ /* { dg-do run } */
++/* { dg-options "-Wno-trampolines" } */
+ 
+ extern void abort (void);
+ extern void exit (int);
+--- a/gcc/testsuite/gcc.dg/torture/stackalign/nested-6.c
++++ b/gcc/testsuite/gcc.dg/torture/stackalign/nested-6.c
+@@ -1,4 +1,5 @@
+ /* { dg-do run } */
++/* { dg-options "-Wno-trampolines" } */
+ 
+ #ifndef NO_TRAMPOLINES
+ 
+--- a/gcc/testsuite/gcc.dg/trampoline-1.c
++++ b/gcc/testsuite/gcc.dg/trampoline-1.c
+@@ -3,7 +3,7 @@
+ 
+ /* { dg-do run } */
+ /* { dg-require-effective-target trampolines } */
+-/* { dg-options "-O2" } */
++/* { dg-options "-O2 -Wno-trampolines" } */
+ 
+ #ifndef NO_TRAMPOLINES
+ 
diff --git a/4.5.2/gentoo/README.history b/4.5.2/gentoo/README.history
index 7bddf5a..d4e485e 100644
--- a/4.5.2/gentoo/README.history
+++ b/4.5.2/gentoo/README.history
@@ -1,3 +1,7 @@
+1.1		pending
+	+ 99_all_testsuite-01-Wformat.patch
+	+ 99_all_testsuite-02-Wtrampolines.patch
+
 1.0		27.12.2010 
 	+ 00_all_gcc-4.1-alpha-mieee-default.patch 
 	+ 01_all_gcc-4.1-alpha-asm-mcpu.patch