zorry 18/05/03 10:47:18
Modified: 13_all_default-ssp-fix.patch
55_all_extra-options.patch README.history
Log:
Update patches for gcc 6.4 and 7.3 in the patchset
Revision Changes Path
1.2 src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch?r1=1.1&r2=1.2
Index: 13_all_default-ssp-fix.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/gcc/7.3.0/gentoo/13_all_default-ssp-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 13_all_default-ssp-fix.patch 25 Jan 2018 21:20:43 -0000 1.1
+++ 13_all_default-ssp-fix.patch 3 May 2018 10:47:18 -0000 1.2
@@ -1,48 +1,32 @@
-We disable ssp on -nostdlib and -ffreestanding as we did on older gcc
-and change the buffer size.
+Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
+Change the buffer size.
---- a/gcc/c-family/c-opts.c
-+++ b/gcc/c-family/c-opts.c
-@@ -450,7 +450,14 @@
+--- a/gcc/gcc.c 2017-07-04 09:15:57.740793000 +0200
++++ b/gcc/gcc.c 2018-03-02 13:58:44.387741114 +0100
+@@ -857,6 +857,12 @@ proper position among the other output f
+ #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
+ #endif
- case OPT_ffreestanding:
- value = !value;
-+ if (global_options.x_flag_stack_protect == -1)
-+ global_options.x_flag_stack_protect = 0;
- /* Fall through. */
++#ifdef ENABLE_DEFAULT_SSP
++#define NO_SSP_SPEC
"%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
++#else
++#define NO_SSP_SPEC ""
++#endif
+
-+ case OPT_nostdlib:
-+ if (global_options.x_flag_stack_protect == -1)
-+ global_options.x_flag_stack_protect = 0;
-+
- case OPT_fhosted:
- flag_hosted = value;
- flag_no_builtin = !value;
---- a/gcc/c-family/c.opt
-+++ b/gcc/c-family/c.opt
-@@ -1647,6 +1647,10 @@ nostdinc++
- C++ ObjC++
- Do not search standard system include directories for C++.
-
-+nostdlib
-+C ObjC C++ ObjC++
-+; Documented in common.opt
-+
- o
- C ObjC C++ ObjC++ Joined Separate
- ; Documented in common.opt
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -1145,6 +1145,7 @@
+ #ifndef LINK_SSP_SPEC
+ #ifdef TARGET_LIBC_PROVIDES_SSP
+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+@@ -1131,7 +1148,7 @@ static const char *cc1_options =
+ %{-version:--version}\
%{-help=*:--help=%*}\
%{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
- %{fsyntax-only:-o %j} %{-param*}\
-+ %{nostdlib:-nostdlib}\
- %{coverage:-fprofile-arcs -ftest-coverage}\
- %{fprofile-arcs|fprofile-generate*|coverage:\
- %{!fprofile-update=single:\
---- a/gcc/params.def
-+++ b/gcc/params.def
+- %{fsyntax-only:-o %j} %{-param*}\
++ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
+ %{coverage:-fprofile-arcs -ftest-coverage}";
+
+ static const char *asm_options =
+--- a/gcc/params.def 2016-03-30 09:47:40.000000000 +0200
++++ b/gcc/params.def 2016-09-19 12:56:58.443179039 +0200
@@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT,
DEFPARAM (PARAM_SSP_BUFFER_SIZE,
"ssp-buffer-size",
1.2 src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch?r1=1.1&r2=1.2
Index: 55_all_extra-options.patch
===================================================================
RCS file:
/var/cvsroot/gentoo/src/patchsets/gcc/7.3.0/gentoo/55_all_extra-options.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 55_all_extra-options.patch 25 Jan 2018 21:20:43 -0000 1.1
+++ 55_all_extra-options.patch 3 May 2018 10:47:18 -0000 1.2
@@ -42,7 +42,7 @@
#endif
#endif
-+#define STACK_CHECK_SPEC "%{fstack-check|fstack-check=*:;: -fstack-check} "
++#define STACK_CHECK_SPEC ""
+#ifdef EXTRA_OPTIONS
+#define LINK_NOW_SPEC "%{!nonow:-z now} "
+#else
1.4 src/patchsets/gcc/7.3.0/gentoo/README.history
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/README.history?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/README.history?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/7.3.0/gentoo/README.history?r1=1.3&r2=1.4
Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/7.3.0/gentoo/README.history,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.history 14 Apr 2018 12:28:33 -0000 1.3
+++ README.history 3 May 2018 10:47:18 -0000 1.4
@@ -1,3 +1,6 @@
+1.3 03 Maj 2018
+ U 13_all_default-ssp-fix.patch
+ U 55_all_extra-options.patch
1.2 14 Apr 2018
+ 92_all_sh-drop-sysroot-suffix.patch
1.1 11 Feb 2018
