From 58babad47ce5991e6562fd6a8db890b8a45882cc Mon Sep 17 00:00:00 2001 From: "Magnus Granberg (Zorry)" Date: Fri, 18 Jun 2010 23:14:30 +0200 Subject: Updated the Wtrampolines patch --- .../piepatch/35_all_gcc44_config_crtbegints.patch | 10 +++---- gcc-4.4.3/piepatch/README.Changelog | 4 +++ gcc-4.4.3/piepatch/README.history | 2 ++ .../piepatch/35_all_gcc44_config_crtbegints.patch | 10 +++---- gcc-4.4.4/piepatch/README.Changelog | 4 +++ gcc-4.4.4/piepatch/README.history | 2 ++ .../piepatch/35_all_gcc44_config_crtbegints.patch | 10 +++---- gcc-4.5.0/piepatch/README.Changelog | 4 +++ gcc-4.5.0/piepatch/README.history | 2 ++ upstream/warntrampolins/Wtrampolines.patch | 34 +++++++++------------- 10 files changed, 47 insertions(+), 35 deletions(-) diff --git a/gcc-4.4.3/piepatch/35_all_gcc44_config_crtbegints.patch b/gcc-4.4.3/piepatch/35_all_gcc44_config_crtbegints.patch index 099253d..8f43a87 100644 --- a/gcc-4.4.3/piepatch/35_all_gcc44_config_crtbegints.patch +++ b/gcc-4.4.3/piepatch/35_all_gcc44_config_crtbegints.patch @@ -1,4 +1,4 @@ -2009-09-25 Magnus Granberg +2010-06-18 Magnus Granberg * gcc/config/linux.h If ENABLE_CRTBEGINTS, -static and -pie use crtbegineTS.o. * gcc/config/rs6000/sysv4.h If ENABLE_CRTBEGINTS, -static and -pie use crtbegineTS.o. @@ -26,10 +26,10 @@ -#ifdef HAVE_LD_PIE +#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS) -+#define STARTFILE_LINUX_SPEC \ -+ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ -+ %{mnewlib:ecrti.o%s;:crti.o%s} \ -+ {static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}" ++#define STARTFILE_LINUX_SPEC "\ ++%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ ++%{mnewlib:ecrti.o%s;:crti.o%s} \ ++%{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}" +#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS) #define STARTFILE_LINUX_SPEC "\ %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ diff --git a/gcc-4.4.3/piepatch/README.Changelog b/gcc-4.4.3/piepatch/README.Changelog index 33a5f11..8d26b94 100644 --- a/gcc-4.4.3/piepatch/README.Changelog +++ b/gcc-4.4.3/piepatch/README.Changelog @@ -1,3 +1,7 @@ +0.4.5 Magnus Granberg + + * gcc/config/rs6000/sysv4.h Fix a typo in the static spec rules + 0.4.4 Magnus Granberg * gcc/esp.h Renamed ESP_CC1_STRICT_SPEC to ESP_CC1_STRICT_OVERFLOW_SPEC diff --git a/gcc-4.4.3/piepatch/README.history b/gcc-4.4.3/piepatch/README.history index 7b6c0dc..5f4ff15 100644 --- a/gcc-4.4.3/piepatch/README.history +++ b/gcc-4.4.3/piepatch/README.history @@ -1,3 +1,5 @@ +0.4.5 18-06-2010 + U 35_all_gcc44_config_crtbegints.patch 0.4.4 26-05-2010 U 30_all_gcc44_esp.h.patch 0.4.3 26-05-2010 diff --git a/gcc-4.4.4/piepatch/35_all_gcc44_config_crtbegints.patch b/gcc-4.4.4/piepatch/35_all_gcc44_config_crtbegints.patch index 099253d..8f43a87 100644 --- a/gcc-4.4.4/piepatch/35_all_gcc44_config_crtbegints.patch +++ b/gcc-4.4.4/piepatch/35_all_gcc44_config_crtbegints.patch @@ -1,4 +1,4 @@ -2009-09-25 Magnus Granberg +2010-06-18 Magnus Granberg * gcc/config/linux.h If ENABLE_CRTBEGINTS, -static and -pie use crtbegineTS.o. * gcc/config/rs6000/sysv4.h If ENABLE_CRTBEGINTS, -static and -pie use crtbegineTS.o. @@ -26,10 +26,10 @@ -#ifdef HAVE_LD_PIE +#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS) -+#define STARTFILE_LINUX_SPEC \ -+ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ -+ %{mnewlib:ecrti.o%s;:crti.o%s} \ -+ {static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}" ++#define STARTFILE_LINUX_SPEC "\ ++%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ ++%{mnewlib:ecrti.o%s;:crti.o%s} \ ++%{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}" +#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS) #define STARTFILE_LINUX_SPEC "\ %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ diff --git a/gcc-4.4.4/piepatch/README.Changelog b/gcc-4.4.4/piepatch/README.Changelog index 9661991..64815a2 100644 --- a/gcc-4.4.4/piepatch/README.Changelog +++ b/gcc-4.4.4/piepatch/README.Changelog @@ -1,3 +1,7 @@ +0.4.5 Magnus Granberg + + * gcc/config/rs6000/sysv4.h Fix a typo in the static spec rules + 0.4.4 Magnus Granberg * gcc/configure Fix ac_subst_vars so it support gentoos gcc patchset diff --git a/gcc-4.4.4/piepatch/README.history b/gcc-4.4.4/piepatch/README.history index 6ab7ffe..4e2f8b0 100644 --- a/gcc-4.4.4/piepatch/README.history +++ b/gcc-4.4.4/piepatch/README.history @@ -1,3 +1,5 @@ +0.4.5 18-06-2010 + U 35_all_gcc44_config_crtbegints.patch 0.4.4 15-06-2010 U 10_all_gcc444_configure.patch U 30_all_gcc44_esp.h.patch diff --git a/gcc-4.5.0/piepatch/35_all_gcc44_config_crtbegints.patch b/gcc-4.5.0/piepatch/35_all_gcc44_config_crtbegints.patch index f1e6532..8f43a87 100644 --- a/gcc-4.5.0/piepatch/35_all_gcc44_config_crtbegints.patch +++ b/gcc-4.5.0/piepatch/35_all_gcc44_config_crtbegints.patch @@ -1,4 +1,4 @@ -2009-09-25 Magnus Granberg +2010-06-18 Magnus Granberg * gcc/config/linux.h If ENABLE_CRTBEGINTS, -static and -pie use crtbegineTS.o. * gcc/config/rs6000/sysv4.h If ENABLE_CRTBEGINTS, -static and -pie use crtbegineTS.o. @@ -26,10 +26,10 @@ -#ifdef HAVE_LD_PIE +#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS) -+#define STARTFILE_LINUX_SPEC \ -+ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ -+ %{mnewlib:ecrti.o%s;:crti.o%s} \ -+ {static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}" ++#define STARTFILE_LINUX_SPEC "\ ++%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ ++%{mnewlib:ecrti.o%s;:crti.o%s} \ ++%{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}" +#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS) #define STARTFILE_LINUX_SPEC "\ %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \ diff --git a/gcc-4.5.0/piepatch/README.Changelog b/gcc-4.5.0/piepatch/README.Changelog index 936b997..ab59bcb 100644 --- a/gcc-4.5.0/piepatch/README.Changelog +++ b/gcc-4.5.0/piepatch/README.Changelog @@ -1,3 +1,7 @@ +0.4.5 Magnus Granberg + + * gcc/config/rs6000/sysv4.h Fix a typo in the static spec rules + 0.4.4 Magnus Granberg * gcc/esp.h Renamed ESP_CC1_STRICT_SPEC to ESP_CC1_STRICT_OVERFLOW_SPEC diff --git a/gcc-4.5.0/piepatch/README.history b/gcc-4.5.0/piepatch/README.history index c13f0db..07d373c 100644 --- a/gcc-4.5.0/piepatch/README.history +++ b/gcc-4.5.0/piepatch/README.history @@ -1,3 +1,5 @@ +0.4.5 18-06-2010 + U 35_all_gcc44_config_crtbegints.patch 0.4.4 26-05-2010 U 30_all_gcc44_esp.h.patch 0.4.3 26-05-2010 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 , Kevin F. Quinn - * 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 */ +/* Ported to test -Wtrampolines Magnus Granberg */ + +/* { 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 + -- cgit v1.2.3-65-gdbad