From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q3W9R-0007EO-Vx for garchives@archives.gentoo.org; Sat, 26 Mar 2011 16:15:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3247C1C013; Sat, 26 Mar 2011 16:15:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D65631C013 for ; Sat, 26 Mar 2011 16:15:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27C871B411D for ; Sat, 26 Mar 2011 16:15:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 88CE78006A for ; Sat, 26 Mar 2011 16:15:36 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <9b8b01c711d4d2d599619b7f7415950f07af3026.zorry@gentoo> Subject: [gentoo-commits] proj/hardened-gccpatchset:master commit in: gcc-4.6.0/piepatch/ X-VCS-Repository: proj/hardened-gccpatchset X-VCS-Files: gcc-4.6.0/piepatch/22_all_gcc46-default-ssp.patch gcc-4.6.0/piepatch/README.Changelog gcc-4.6.0/piepatch/README.history X-VCS-Directories: gcc-4.6.0/piepatch/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: 9b8b01c711d4d2d599619b7f7415950f07af3026 Date: Sat, 26 Mar 2011 16:15:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c1f50c5e1b455c5dbe1576d598e4f2f5 commit: 9b8b01c711d4d2d599619b7f7415950f07af3026 Author: Magnus Granberg gentoo org> AuthorDate: Sat Mar 26 16:15:23 2011 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Sat Mar 26 16:15:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-gccp= atchset.git;a=3Dcommit;h=3D9b8b01c7 bump the gcc-4.6 patchset --- gcc-4.6.0/piepatch/22_all_gcc46-default-ssp.patch | 171 ++++++++++-----= ------ gcc-4.6.0/piepatch/README.Changelog | 6 + gcc-4.6.0/piepatch/README.history | 2 + 3 files changed, 86 insertions(+), 93 deletions(-) diff --git a/gcc-4.6.0/piepatch/22_all_gcc46-default-ssp.patch b/gcc-4.6.= 0/piepatch/22_all_gcc46-default-ssp.patch index 66e80af..ea4be77 100644 --- a/gcc-4.6.0/piepatch/22_all_gcc46-default-ssp.patch +++ b/gcc-4.6.0/piepatch/22_all_gcc46-default-ssp.patch @@ -7,76 +7,8 @@ * gcc/gcc.c default_compilers[] Add %(esp_options) * gcc/cp/lang-specs.h compiler spec Add %(esp_options) =20 ---- a/src/gcc/objc/lang-specs.h.orig 2009-12-21 -+++ b/src/gcc/objc/lang-specs.h 2009-12-21 -@@ -30,9 +30,9 @@ - %{traditional|traditional-cpp:\ - %eGNU Objective C no longer supports traditional compilation}\ - %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temp= s:%b.mi} %{!save-temps:%g.mi} \n\ -- cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(c= c1_options) %{print-objc-runtime-info} %{gen-decls}}\ -+ cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(c= c1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}\ - %{!save-temps:%{!no-integrated-cpp:\ -- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-i= nfo} %{gen-decls}}}\ -+ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print= -objc-runtime-info} %{gen-decls}}}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, - {"@objective-c-header", - "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp= }\ -@@ -41,18 +41,18 @@ - %{traditional|traditional-cpp:\ - %eGNU Objective C no longer supports traditional compilation}\ - %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temp= s:%b.mi} %{!save-temps:%g.mi} \n\ -- cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-in= fo} %{gen-decls}\ -+ cc1obj -fpreprocessed %b.mi %(cc1_options) %(esp_options) %{print-= objc-runtime-info} %{gen-decls}\ - -o %g.s %{!o*:--output-pch=3D%i.gch}\ - %W{o*:--output-pch=3D%*}%V}\ - %{!save-temps:%{!no-integrated-cpp:\ -- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-i= nfo} %{gen-decls}\ -+ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print= -objc-runtime-info} %{gen-decls}\ - -o %g.s %{!o*:--output-pch=3D%i.gch}\ - %W{o*:--output-pch=3D%*}%V}}}}}", 0, 0, 0}, - {".mi", "@objective-c-cpp-output", 0, 0, 0}, - {"@objective-c-cpp-output", -- "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-o= bjc-runtime-info} %{gen-decls}\ -+ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_opt= ions) %{print-objc-runtime-info} %{gen-decls}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, - {"@objc-cpp-output", - "%nobjc-cpp-output is deprecated; please use objective-c-cpp-outp= ut instead\n\ -- %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-= objc-runtime-info} %{gen-decls}\ -+ %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_op= tions) %{print-objc-runtime-info} %{gen-decls}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ---- a/src/gcc/objcp/lang-specs.h.orig 2009-03-24 -+++ b/src/gcc/objcp/lang-specs.h 2009-12-21 -@@ -36,7 +36,7 @@ - %(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\ - cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-t= emps:%b.mii} %{!save-temps:%g.mii}}\ - %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\ -- %(cc1_options) %2\ -+ %(cc1_options) %(esp_options) %2\ - -o %g.s %{!o*:--output-pch=3D%i.gch} %W{o*:--output-pch=3D%*}%V= }}}", - CPLUSPLUS_CPP_SPEC, 0, 0}, - {"@objective-c++", -@@ -46,16 +46,16 @@ - %(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\ - cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-t= emps:%b.mii} %{!save-temps:%g.mii}}\ - %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\ -- %(cc1_options) %2\ -+ %(cc1_options) %(esp_options) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", - CPLUSPLUS_CPP_SPEC, 0, 0}, - {".mii", "@objective-c++-cpp-output", 0, 0, 0}, - {"@objective-c++-cpp-output", - "%{!M:%{!MM:%{!E:\ -- cc1objplus -fpreprocessed %i %(cc1_options) %2\ -+ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, - {"@objc++-cpp-output", - "%nobjc++-cpp-output is deprecated; please use objective-c++-cpp-out= put instead\n\ - %{!M:%{!MM:%{!E:\ -- cc1objplus -fpreprocessed %i %(cc1_options) %2\ -+ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ---- a/src/gcc/gcc.c.orig 2009-12-21 -+++ b/src/gcc/gcc.c 2009-12-21 +--- a/gcc/gcc.c.orig 2009-12-21 ++++ b/gcc/gcc.c 2009-12-21 @@ -740,7 +749,7 @@ static const char *cpp_options =3D "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} = %{w}\ @@ -107,39 +39,92 @@ {".s", "@assembler", 0, 0, 0}, {"@assembler", "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0,= 0, 0}, ---- a/src/gcc/cp/lang-specs.h.orig 2009-03-24 -+++ b/src/gcc/cp/lang-specs.h 2009-12-21 +--- a/gcc/cp/lang-specs.h 2011-03-06 17:27:57.000000000 +0100 ++++ b/gcc/cp/lang-specs.h 2011-03-26 13:30:40.312423000 +0100 @@ -47,7 +47,7 @@ - %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\ - cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temp= s:%b.ii} %{!save-temps:%g.ii}}\ - %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\ + %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\ + cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-tem= ps*:%b.ii} %{!save-temps*:%g.ii}}\ + %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ - %(cc1_options) %2\ + %(cc1_options) %(esp_options) %2\ %{!fsyntax-only:%{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=3D%i.gch= }\ %W{o*:--output-pch=3D%*}}%V}}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, -@@ -58,11 +58,11 @@ - %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\ - cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temp= s:%b.ii} %{!save-temps:%g.ii}}\ - %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\ +@@ -58,7 +58,7 @@ + %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\ + cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-tem= ps*:%b.ii} %{!save-temps*:%g.ii}}\ + %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ - %(cc1_options) %2\ + %(cc1_options) %(esp_options) %2\ %{!fsyntax-only:%(invoke_as)}}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, {".ii", "@c++-cpp-output", 0, 0, 0}, - {"@c++-cpp-output", + +--- a/gcc/objcp/lang-specs.h 2011-03-06 17:27:57.000000000 +0100 ++++ a/gcc/objcp/lang-specs.h 2011-03-26 14:19:12.596423000 +0100 +@@ -36,7 +36,7 @@ + %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}= \ + cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-= temps*:%b.mii} %{!save-temps*:%g.mii}}\ + %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ +- %(cc1_options) %2\ ++ %(cc1_options) %(esp_options) %2\ + -o %g.s %{!o*:--output-pch=3D%i.gch} %W{o*:--output-pch=3D%*}%V= }}}", + CPLUSPLUS_CPP_SPEC, 0, 0}, + {"@objective-c++", +@@ -46,16 +46,16 @@ + %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}= \ + cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-= temps*:%b.mii} %{!save-temps*:%g.mii}}\ + %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ +- %(cc1_options) %2\ ++ %(cc1_options) %(esp_options) %2\ + %{!fsyntax-only:%(invoke_as)}}}}", + CPLUSPLUS_CPP_SPEC, 0, 0}, + {".mii", "@objective-c++-cpp-output", 0, 0, 0}, + {"@objective-c++-cpp-output", "%{!M:%{!MM:%{!E:\ -- cc1plus -fpreprocessed %i %(cc1_options) %2\ -+ cc1plus -fpreprocessed %i %(cc1_options) %(esp_options) %2\ +- cc1objplus -fpreprocessed %i %(cc1_options) %2\ ++ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2\ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ---- a/src/gcc/params.def.orig 2010-09-09 11:00:26.579149661 -0700 -+++ b/src/gcc/params.def 2010-09-09 11:00:37.968871185 -0700 -@@ -651,7 +651,7 @@ - DEFPARAM (PARAM_SSP_BUFFER_SIZE, - "ssp-buffer-size", - "The lower bound for a buffer to be considered for stack smashing pr= otection", -- 8, 1, 0) -+ 4, 1, 0) -=20 - /* When we thread through a block we have to make copies of the - statements within the block. Clearly for large blocks the code + {"@objc++-cpp-output", + "%nobjc++-cpp-output is deprecated; please use objective-c++-cpp-out= put instead\n\ + %{!M:%{!MM:%{!E:\ +- cc1objplus -fpreprocessed %i %(cc1_options) %2\ ++ cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, +--- a/gcc/objc/lang-specs.h 2011-03-06 17:27:57.000000000 +0100 ++++ b/gcc/objc/lang-specs.h 2011-03-26 14:56:27.668423000 +0100 +@@ -30,9 +30,9 @@ + %{traditional|traditional-cpp:\ + %eGNU Objective C no longer supports traditional compilation}\ + %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-tem= ps*:%b.mi} %{!save-temps*:%g.mi} \n\ +- cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %= (cc1_options) %{print-objc-runtime-info} %{gen-decls}}\ ++ cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %= (cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}}\ + %{!save-temps*:%{!no-integrated-cpp:\ +- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-i= nfo} %{gen-decls}}}\ ++ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print= -objc-runtime-info} %{gen-decls}}}\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + {"@objective-c-header", + "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp= }\ +@@ -41,18 +41,18 @@ + %{traditional|traditional-cpp:\ + %eGNU Objective C no longer supports traditional compilation}\ + %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-tem= ps*:%b.mi} %{!save-temps*:%g.mi} \n\ +- cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-in= fo} %{gen-decls}\ ++ cc1obj -fpreprocessed %b.mi %(cc1_options)%(esp_options) %{print-= objc-runtime-info} %{gen-decls}\ + -o %g.s %{!o*:--output-pch=3D%i.gch}\ + %W{o*:--output-pch=3D%*}%V}\ + %{!save-temps*:%{!no-integrated-cpp:\ +- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-i= nfo} %{gen-decls}\ ++ cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print= -objc-runtime-info} %{gen-decls}\ + -o %g.s %{!o*:--output-pch=3D%i.gch}\ + %W{o*:--output-pch=3D%*}%V}}}}}", 0, 0, 0}, + {".mi", "@objective-c-cpp-output", 0, 0, 0}, + {"@objective-c-cpp-output", +- "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-o= bjc-runtime-info} %{gen-decls}\ ++ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_opt= ions) %{print-objc-runtime-info} %{gen-decls}\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + {"@objc-cpp-output", + "%nobjc-cpp-output is deprecated; please use objective-c-cpp-outp= ut instead\n\ +- %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-= objc-runtime-info} %{gen-decls}\ ++ %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(esp_op= tions) %{print-objc-runtime-info} %{gen-decls}\ + %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, diff --git a/gcc-4.6.0/piepatch/README.Changelog b/gcc-4.6.0/piepatch/REA= DME.Changelog index ea0c332..e205273 100644 --- a/gcc-4.6.0/piepatch/README.Changelog +++ b/gcc-4.6.0/piepatch/README.Changelog @@ -1,3 +1,9 @@ +0.4.8 Magnus granberg + =20 + * gcc/objc/lang-specs.h Bumped for gcc 4.6.0 release + * gcc/objcp/lang-specs.h Bumped for gcc 4.6.0 release + * gcc/cp/lang-specs.h Bumped for gcc 4.6.0 release + 0.4.7 Magnus Granberg =20 * gcc/gcc.c Add %(esp_options) and %(esp_cpp_options) diff --git a/gcc-4.6.0/piepatch/README.history b/gcc-4.6.0/piepatch/READM= E.history index 8630f82..8535288 100644 --- a/gcc-4.6.0/piepatch/README.history +++ b/gcc-4.6.0/piepatch/README.history @@ -1,3 +1,5 @@ +0.4.8 26-03-2011 + U 22_all_gcc46-default-ssp.patch 0.4.7 05-03-2011 U 20_all_gcc46_gcc.c.patch + 22_all_gcc46-default-ssp.patch