[gentoo-commits] gentoo commit in src/patchsets/gcc/4.6.0/gentoo: 10_all_default-fortify-source.patch README.history

[Ryan Hill (dirtyepic)]

dirtyepic    11/04/04 00:52:55

  Modified:             10_all_default-fortify-source.patch README.history
  Log:
  Unbreak -U_FORTIFY_SOURCE (bug #361783).

Revision  Changes    Path
1.2                  src/patchsets/gcc/4.6.0/gentoo/10_all_default-fortify-source.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.0/gentoo/10_all_default-fortify-source.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.0/gentoo/10_all_default-fortify-source.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.0/gentoo/10_all_default-fortify-source.patch?r1=1.1&r2=1.2

Index: 10_all_default-fortify-source.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.6.0/gentoo/10_all_default-fortify-source.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 10_all_default-fortify-source.patch	1 Apr 2011 05:20:12 -0000	1.1
+++ 10_all_default-fortify-source.patch	4 Apr 2011 00:52:55 -0000	1.2
@@ -1,9 +1,21 @@
-Enable -D_FORTIFY_SOURCE=2 by default at -O2 and higher.
+Enable -D_FORTIFY_SOURCE=2 by default
 
 
+--- a/gcc/c-family/c-cppbuiltin.c
++++ b/gcc/c-family/c-cppbuiltin.c
+@@ -731,6 +731,9 @@ c_cpp_builtins (cpp_reader *pfile)
+   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
+   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
+ 
++  /* Fortify Source enabled by default */
++  builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
++
+   /* Misc.  */
+   if (flag_gnu89_inline)
+     cpp_define (pfile, "__GNUC_GNU_INLINE__");
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
-@@ -5983,6 +5983,11 @@ also turns on the following optimization flags:
+@@ -5973,6 +5973,11 @@ also turns on the following optimization flags:
  Please note the warning under @option{-fgcse} about
  invoking @option{-O2} on programs that use computed gotos.
  
@@ -15,13 +27,3 @@
  @item -O3
  @opindex O3
  Optimize yet more.  @option{-O3} turns on all optimizations specified
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -741,6 +741,7 @@ static const char *cpp_unique_options =
-  %{H} %C %{D*&U*&A*} %{i*} %Z %i\
-  %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\
-  %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\
-+ %{!D_FORTIFY_SOURCE:%{!D_FORTIFY_SOURCE=*:%{!U_FORTIFY_SOURCE:-D_FORTIFY_SOURCE=2}}}\
-  %{E|M|MM:%W{o*}}";
- 
- /* This contains cpp options which are common with cc1_options and are passed



1.2                  src/patchsets/gcc/4.6.0/gentoo/README.history

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.0/gentoo/README.history?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.0/gentoo/README.history?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.6.0/gentoo/README.history?r1=1.1&r2=1.2

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.6.0/gentoo/README.history,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.history	1 Apr 2011 05:20:12 -0000	1.1
+++ README.history	4 Apr 2011 00:52:55 -0000	1.2
@@ -1,4 +1,7 @@
-1.0		pending
+1.1		2011-04-03
+	U 10_all_default-fortify-source.patch
+
+1.0		2011-04-02
 	+ 03_all_java-nomulti.patch
 	+ 08_all_cross-compile.patch
 	+ 10_all_default-fortify-source.patch