aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg (Zorry) <zorry@gentoo.org>2010-05-05 01:27:51 +0200
committerMagnus Granberg (Zorry) <zorry@gentoo.org>2010-05-05 01:27:51 +0200
commit7d8468844d38cb36e2910c35213ec428d63321e7 (patch)
tree82a6ea5421b6f096d52d9ef9b78fb6807100906c
parentfix the upstream warntrampolins patch (diff)
downloadhardened-gccpatchset-7d8468844d38cb36e2910c35213ec428d63321e7.tar.gz
hardened-gccpatchset-7d8468844d38cb36e2910c35213ec428d63321e7.tar.bz2
hardened-gccpatchset-7d8468844d38cb36e2910c35213ec428d63321e7.zip
Fix the upstream warntrampolins patch part2
-rw-r--r--upstream/00_all_gcc45-trampolinewarn.patch33
-rw-r--r--upstream/warntrampolins/README8
-rw-r--r--upstream/warntrampolins/gcc_builtins.c.patch13
-rw-r--r--upstream/warntrampolins/gcc_common.opt.patch13
4 files changed, 34 insertions, 33 deletions
diff --git a/upstream/00_all_gcc45-trampolinewarn.patch b/upstream/00_all_gcc45-trampolinewarn.patch
deleted file mode 100644
index 053eebb..0000000
--- a/upstream/00_all_gcc45-trampolinewarn.patch
+++ /dev/null
@@ -1,33 +0,0 @@
- This trivial patch causes gcc to emit a warning whenever
- it generates a trampoline. These are otherwise hard to
- locate. It is rigged to default ON - to have it default
- to OFF remove the text 'Init(1)' from the common.opt
- patch, leaving just 'Common Var(warn_trampolines)'.
- Kevin F. Quinn <kevquinn@gentoo.org> 17 Jan 2006
-
---- gcc/common.opt
-+++ gcc/common.opt
-@@ -141,6 +141,10 @@
- Common Var(warn_system_headers)
- Do not suppress warnings from system headers
-
-+Wtrampolines
-+Common Var(warn_trampolines)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized)
- Warn about uninitialized automatic variables
---- gcc/builtins.c
-+++ gcc/builtins.c
-@@ -5150,6 +5150,10 @@
- targetm.calls.trampoline_init (m_tramp, t_func, r_chain);
-
- trampolines_created = 1;
-+
-+ if (warn_trampolines)
-+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
- return const0_rtx;
- }
-
diff --git a/upstream/warntrampolins/README b/upstream/warntrampolins/README
new file mode 100644
index 0000000..9c13059
--- /dev/null
+++ b/upstream/warntrampolins/README
@@ -0,0 +1,8 @@
+ This trivial patch causes gcc to emit a warning whenever
+ it generates a trampoline. These are otherwise hard to
+ locate. It is rigged to default ON - to have it default
+ to OFF remove the text 'Init(1)' from the common.opt
+ patch, leaving just 'Common Var(warn_trampolines)'.
+ Kevin F. Quinn <kevquinn@gentoo.org> 17 Jan 2006
+
+Ported to GCC 4.5.x /Zorry
diff --git a/upstream/warntrampolins/gcc_builtins.c.patch b/upstream/warntrampolins/gcc_builtins.c.patch
new file mode 100644
index 0000000..d6d26dd
--- /dev/null
+++ b/upstream/warntrampolins/gcc_builtins.c.patch
@@ -0,0 +1,13 @@
+--- gcc/builtins.c
++++ gcc/builtins.c
+@@ -5150,6 +5150,10 @@
+ targetm.calls.trampoline_init (m_tramp, t_func, r_chain);
+
+ trampolines_created = 1;
++
++ if (warn_trampolines)
++ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
++
+ return const0_rtx;
+ }
+ \ No newline at end of file
diff --git a/upstream/warntrampolins/gcc_common.opt.patch b/upstream/warntrampolins/gcc_common.opt.patch
new file mode 100644
index 0000000..45486e7
--- /dev/null
+++ b/upstream/warntrampolins/gcc_common.opt.patch
@@ -0,0 +1,13 @@
+--- gcc/common.opt
++++ gcc/common.opt
+@@ -141,6 +141,10 @@
+ Common Var(warn_system_headers)
+ Do not suppress warnings from system headers
+
++Wtrampolines
++Common Var(warn_trampolines)
++Warn whenever a trampoline is generated
++
+ Wuninitialized
+ Common Var(warn_uninitialized)
+ Warn about uninitialized automatic variables