commit: 8468b2fa05288d77bed2b59800b3153c71569cae
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 02:34:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 02:34:38 2023 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8468b2fa
13.1.0: rebase 26_all_enable-cet.patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
13.1.0/gentoo/26_all_enable-cet.patch | 32 ++++++++++++++++----------------
13.1.0/gentoo/README.history | 1 +
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/13.1.0/gentoo/26_all_enable-cet.patch
b/13.1.0/gentoo/26_all_enable-cet.patch
index a6976c4..b13abab 100644
--- a/13.1.0/gentoo/26_all_enable-cet.patch
+++ b/13.1.0/gentoo/26_all_enable-cet.patch
@@ -11,7 +11,7 @@ Needs:
Only supported on amd64.
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ along with GCC; see the file COPYING3. If not see
" %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
" %{fmodules-ts:-fmodule-header %{fpreprocessed:-fdirectives-only}}"
@@ -20,7 +20,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{!S:-o %g.s%V}"
" %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ along with GCC; see the file COPYING3. If not see
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
" %{fmodules-ts:-fmodule-header=system"
" %{fpreprocessed:-fdirectives-only}}"
@@ -29,7 +29,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{!S:-o %g.s%V}"
" %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ along with GCC; see the file COPYING3. If not see
" %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
" %{fmodules-ts:-fmodule-header=user
%{fpreprocessed:-fdirectives-only}}"
@@ -38,7 +38,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{!S:-o %g.s%V}"
" %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ along with GCC; see the file COPYING3. If not see
" cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed"
" %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
@@ -47,7 +47,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{fmodule-only:%{!S:-o %g.s%V}}"
" %{!fmodule-only:%(invoke_as)}}"
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see
{".ii", "@c++-cpp-output", 0, 0, 0},
{"@c++-cpp-output",
"%{!E:%{!M:%{!MM:"
@@ -58,7 +58,7 @@ Only supported on amd64.
" %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}"
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
-@@ -987,6 +987,18 @@
+@@ -994,6 +994,18 @@ proper position among the other output files. */
#define LINK_NOW_SPEC ""
#endif
@@ -77,15 +77,15 @@ Only supported on amd64.
#ifdef ENABLE_DEFAULT_PIE
#define PIE_SPEC "!no-pie"
#define NO_FPIE1_SPEC "fno-pie"
-@@ -1189,6 +1201,7 @@
- static const char *cc1_spec = CC1_SPEC;
+@@ -1196,6 +1208,7 @@ static const char *cpp_spec = CPP_SPEC;
+ static const char *cc1_spec = CC1_SPEC OS_CC1_SPEC;
static const char *cc1plus_spec = CC1PLUS_SPEC;
static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
+static const char *default_flag_cf_spec = DEFAULT_FLAG_CF_SPEC;
static const char *link_ssp_spec = LINK_SSP_SPEC;
static const char *asm_spec = ASM_SPEC;
static const char *asm_final_spec = ASM_FINAL_SPEC;
-@@ -1247,7 +1260,7 @@
+@@ -1254,7 +1267,7 @@ static const char *cpp_options =
"%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
%{f*} %{g*:%{%:debug-level-gt(0):%{g*}\
%{!fno-working-directory:-fworking-directory}}} %{O*}\
@@ -94,7 +94,7 @@ Only supported on amd64.
/* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al.
-@@ -1440,9 +1453,9 @@
+@@ -1448,9 +1461,9 @@ static const struct compiler default_compilers[] =
%{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
%(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
@@ -106,7 +106,7 @@ Only supported on amd64.
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
{"-",
"%{!E:%e-E or -x required when input is from standard input}\
-@@ -1467,7 +1480,7 @@
+@@ -1475,7 +1488,7 @@ static const struct compiler default_compilers[] =
%W{o*:--output-pch %*}}%V}}}}}}}",
0, 0, 0},
{".i", "@cpp-output", 0, 0, 0},
{"@cpp-output",
@@ -115,7 +115,7 @@ Only supported on amd64.
{".s", "@assembler", 0, 0, 0},
{"@assembler",
"%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-@@ -1699,6 +1712,7 @@
+@@ -1707,6 +1720,7 @@ static struct spec_list static_specs[] =
INIT_STATIC_SPEC ("cc1_options", &cc1_options),
INIT_STATIC_SPEC ("cc1plus", &cc1plus_spec),
INIT_STATIC_SPEC ("link_gcc_c_sequence", &link_gcc_c_sequence_spec),
@@ -125,7 +125,7 @@ Only supported on amd64.
INIT_STATIC_SPEC ("link", &link_spec),
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
-@@ -29,9 +29,9 @@
+@@ -29,9 +29,9 @@ along with GCC; see the file COPYING3. If not see
%{traditional|traditional-cpp:\
%eGNU Objective C no longer supports traditional compilation}\
%{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o
%{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
@@ -137,7 +137,7 @@ Only supported on amd64.
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{"@objective-c-header",
"%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\
-@@ -40,18 +40,18 @@
+@@ -40,18 +40,18 @@ along with GCC; see the file COPYING3. If not see
%{traditional|traditional-cpp:\
%eGNU Objective C no longer supports traditional compilation}\
%{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o
%{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
@@ -162,7 +162,7 @@ Only supported on amd64.
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
--- a/gcc/objcp/lang-specs.h
+++ b/gcc/objcp/lang-specs.h
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ along with GCC; see the file COPYING3. If not see
%(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)}}\
@@ -171,7 +171,7 @@ Only supported on amd64.
-o %g.s %{!o*:--output-pch %i.gch} %W{o*:--output-pch %*}%V}}}",
CPLUSPLUS_CPP_SPEC, 0, 0},
{"@objective-c++",
-@@ -46,16 +46,16 @@
+@@ -46,16 +46,16 @@ along with GCC; see the file COPYING3. If not see
%(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)}}\
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index 26027e1..047322a 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,4 +1,5 @@
10 23 Apr 2023
+ U 26_all_enable-cet.patch
+ 31_all_gm2_make_P_var.patch
9 13 Mar 2023
