stop enabling trampoline warnings by default in older versions for compatibility and simplicity -- these are really only used for old builds now and cross-compiling

3 files changed, 2 insertions, 165 deletions

diff --git a/4.5.4/gentoo/09_all_gcc-4.5-Wtrampolines.patch b/4.5.4/gentoo/09_all_gcc-4.5-Wtrampolines.patch
deleted file mode 100644
index 9c95c1e..0000000
--- a/4.5.4/gentoo/09_all_gcc-4.5-Wtrampolines.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-2010-07-15  Magnus Granberg  <zorry@gentoo.org>
-            Kevin F. Quinn  <kevquinn@gentoo.org>
-
-            * builtins.c (expand_builtin_init_trampoline): If
-              -Wtrampolines make a warning.
-            * common.opt:  Add -Wtrampolines.
-            * doc/invoke.texi:  Add -Wtrampolines.
-
-2010-07-31	Magnus Granberg <zorry@gentoo.org>
-
-            #328451 set -Wtrampolines as default
-
-http://gcc.gnu.org/viewcvs?view=revision&revision=162205
-
---- a/gcc/builtins.c
-+++ b/gcc/builtins.c
-@@ -5155,6 +5155,10 @@ expand_builtin_init_trampoline (tree exp)
-   targetm.calls.trampoline_init (m_tramp, t_func, r_chain);
- 
-   trampolines_created = 1;
-+
-+  warning_at (DECL_SOURCE_LOCATION (t_func), OPT_Wtrampolines,
-+              "trampoline generated for nested function %qD", t_func);
-+
-   return const0_rtx;
- }
- 
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -192,6 +192,10 @@ Wsystem-headers
- Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers
- 
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1) Warning
-+Warn whenever a trampoline is generated
-+
- Wtype-limits
- Common Var(warn_type_limits) Init(-1) Warning
- Warn if a comparison is always true or always false due to the limited range of the data type
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -3611,6 +3611,21 @@ code.  However, note that using @option{-Wall} in conjunction with this
- option will @emph{not} warn about unknown pragmas in system
- headers---for that, @option{-Wunknown-pragmas} must also be used.
- 
-+@item -Wtrampolines
-+@opindex Wtrampolines
-+@opindex Wno-trampolines
-+ Warn about trampolines generated for pointers to nested functions.
-+ 
-+ NOTE: In Gentoo, @option{-Wtrampolines} is set by default.
-+ To disable, specify @option{-Wno-trampolines}
-+
-+ A trampoline is a small piece of data or code that is created at run
-+ time on the stack when the address of a nested function is taken, and
-+ is used to call the nested function indirectly.  For some targets, it
-+ is made up of data only and thus requires no special treatment.  But,
-+ for most targets, it is made up of code and thus requires the stack
-+ to be made executable in order for the program to work properly.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
diff --git a/4.5.4/gentoo/99_all_testsuite-02-Wtrampolines.patch b/4.5.4/gentoo/99_all_testsuite-02-Wtrampolines.patch
deleted file mode 100644
index f9be664..0000000
--- a/4.5.4/gentoo/99_all_testsuite-02-Wtrampolines.patch
+++ /dev/null
@@ -1,101 +0,0 @@
- 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.4/gentoo/README.history b/4.5.4/gentoo/README.history
index 2d0dd1b..8aace3d 100644
--- a/4.5.4/gentoo/README.history
+++ b/4.5.4/gentoo/README.history
@@ -1,6 +1,8 @@
 1.3		[pending]
+	- 09_all_gcc-4.5-Wtrampolines.patch
 	+ 18_all_libgcc-cross-canadian.patch
 	+ 34_all_libjava-classpath-locale-sort.patch
+	- 99_all_testsuite-02-Wtrampolines.patch
 
 1.2		19 Apr 2013
 	+ 30_all_gcc-4.5_arm_armv4-no-thumb-fix-link.patch