diff options
| author |   Magnus Granberg (Zorry) <zorry@gentoo.org> | 2010-06-18 23:14:30 +0200 |
|---|---|---|
| committer | Magnus Granberg (Zorry) <zorry@gentoo.org> | 2010-06-18 23:14:30 +0200 |
| commit | 58babad47ce5991e6562fd6a8db890b8a45882cc (patch) | |
| tree | 2d45db3dae5de48bc62c6d23a854a63a45fdef96 /upstream | |
| parent | Add gcc-4.4.4 (diff) | |
| download | hardened-gccpatchset-58babad47ce5991e6562fd6a8db890b8a45882cc.tar.gz hardened-gccpatchset-58babad47ce5991e6562fd6a8db890b8a45882cc.tar.bz2 hardened-gccpatchset-58babad47ce5991e6562fd6a8db890b8a45882cc.zip | |
Updated the Wtrampolines patch
Diffstat (limited to 'upstream')
| -rw-r--r-- | upstream/warntrampolins/Wtrampolines.patch | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/upstream/warntrampolins/Wtrampolines.patch b/upstream/warntrampolins/Wtrampolines.patch index ffe836e..db76acb 100644 --- a/upstream/warntrampolins/Wtrampolines.patch +++ b/upstream/warntrampolins/Wtrampolines.patch @@ -2,7 +2,7 @@ gcc/ 2010-05-06 Magnus Granberg <zorry@gentoo.org>, Kevin F. Quinn <kevquinn@gentoo.org> - * tree-nested: #include flags.h (convert_tramp_reference_op): if warn_trampolines make a warning. + * builtins.c: (expand_builtin_init_trampoline): if warn_trampolines make a warning. * common.opt: Add -Wtrampolines. * varasm.c: (file_end_indicate_exec_stack): if warn_trampolines make a warning. @@ -18,26 +18,19 @@ gcc/testsuite/ * gcc.dg/Wtrampolines.c: New. ---- gcc/tree-nested.c.zorry 2009-11-25 11:55:54.000000000 +0100 -+++ gcc/tree-nested.c 2010-05-29 14:49:13.000000000 +0200 -@@ -36,6 +36,7 @@ - #include "langhooks.h" - #include "pointer-set.h" - #include "ggc.h" -+#include "flags.h" +--- gcc/builtins.c.zorry 2010-04-13 15:47:11.000000000 +0200 ++++ gcc/builtins.c 2010-06-16 12:33:54.000000000 +0200 +@@ -5150,6 +5150,10 @@ + targetm.calls.trampoline_init (m_tramp, t_func, r_chain); - - /* The object of this pass is to lower the representation of a set of nested -@@ -1913,6 +1914,9 @@ - x = init_tmp_var (info, x, &wi->gsi); - - *tp = x; -+ if (warn_trampolines) -+ warning (OPT_Wtrampolines, "generating trampoline in object."); + trampolines_created = 1; + - break; ++ if (warn_trampolines) ++ warning (OPT_Wtrampolines, "trampoline generated for nested function %s", (IDENTIFIER_POINTER(DECL_NAME(t_func)))); ++ + return const0_rtx; + } - default: --- gcc/common.opt.zorry 2010-03-18 04:01:09.000000000 +0100 +++ gcc/common.opt 2010-05-06 00:44:18.000000000 +0200 @@ -192,6 +192,10 @@ @@ -100,14 +93,15 @@ gcc/testsuite/ @opindex Wno-float-equal --- gcc/testsuite/gcc.dg/Wtrampolines.c.zorry 2010-05-05 12:53:11.000000000 +0200 +++ gcc/testsuite/gcc.dg/Wtrampolines.c 2010-05-06 00:26:05.000000000 +0200 -@@ -0,0 +1,58 @@ +@@ -0,0 +1,59 @@ +/* Origin: trampoline-1.c Waldek Hebisch <hebisch@math.uni.wroc.pl> */ +/* Ported to test -Wtrampolines Magnus Granberg <zorry@gentoo.org> */ + +/* { dg-do compile } */ +/* { dg-require-effective-target trampolines } */ +/* { dg-options "-O2 -Wtrampolines" } */ -+/* { dg-warning "trampoline|stack" "" { target i?86-*-* x86_64-*-* } 58 } */ ++/* { dg-warning "trampoline" "" { target *-*-* } 31 } */ ++/* { dg-prune-output "stack" } */ + +#ifndef NO_TRAMPOLINES + |