Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
Date: 2007-12-28
Initial Package Version: 4.1.2
Upstream Status: Not Submitted
Origin: me
Description: This patch makes '-D_FORTIFY_SOURCE=2' the default. This only
works with optimization, so if no optimization is given then -O is added.

uClibc does not have _FORTIFY_SOURCE support yet, but libssp does. So for
uClibc the libssp library is linked. If you are building a Glibc prior to
version 2.4, you will also need to link to libssp... replace "__UCLIBC__"
with "TRUE".

Disable with -U_FORTIFY_SOURCE.

<ssp/stdio.h> gets modified a bit to make building other packages smoother.

- Libssp usage -
To use Libssp's _FORTIFY_SOURCE feature Libssp's private headers need to
always be used. I tried several different methods and this was the least
problematic:

mv -v /usr/include/{stdio,stdio-uclibc}.h
mv -v /usr/include/{string,string-uclibc}.h
mv -v /usr/include/{unistd,unistd-uclibc}.h

sed -e 's/.*include_next.*/#include <stdio-uclibc.h>/' -e 's@ssp.h@ssp/ssp.h@' \
    `dirname $(gcc -print-libgcc-file-name)`/include/ssp/stdio.h \
    > /usr/include/stdio.h

sed -e 's/.*include_next.*/#include <string-uclibc.h>/' -e 's@ssp.h@ssp/ssp.h@' \
    `dirname $(gcc -print-libgcc-file-name)`/include/ssp/string.h \
    > /usr/include/string.h

sed -e 's/.*include_next.*/#include <unistd-uclibc.h>/' -e 's@ssp.h@ssp/ssp.h@' \
    `dirname $(gcc -print-libgcc-file-name)`/include/ssp/unistd.h \
    > /usr/include/unistd.h

diff -Naur gcc-4.1.2.orig/gcc/gcc.c gcc-4.1.2/gcc/gcc.c
--- gcc-4.1.2.orig/gcc/gcc.c	2006-11-07 14:26:21.000000000 +0000
+++ gcc-4.1.2/gcc/gcc.c	2007-12-25 05:30:21.000000000 +0000
@@ -724,12 +724,18 @@
 # define SYSROOT_HEADERS_SUFFIX_SPEC ""
 #endif
 
+#ifdef __UCLIBC__
+#define LINK_FORTIFY_SPEC "%{!U_FORTIFY_SOURCE:-lssp_nonshared -lssp}"
+#else
+#define LINK_FORTIFY_SPEC ""
+#endif
+
 static const char *asm_debug;
 static const char *cpp_spec = CPP_SPEC;
 static const char *cc1_spec = 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 *link_ssp_spec = LINK_SSP_SPEC;
+static const char *link_ssp_spec = LINK_SSP_SPEC " " LINK_FORTIFY_SPEC;
 static const char *asm_spec = ASM_SPEC;
 static const char *asm_final_spec = ASM_FINAL_SPEC;
 static const char *link_spec = LINK_SPEC;
@@ -765,6 +771,7 @@
    file that happens to exist is up-to-date.  */
 static const char *cpp_unique_options =
 "%{C|CC:%{!E:%eGCC does not support -C or -CC without -E}}\
+ %{!D_FORTIFY_SOURCE=*:-D_FORTIFY_SOURCE=2}\
  %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*&F*} %{P} %I\
  %{MD:-MD %{!o:%b.d}%{o*:%.d%*}}\
  %{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}}\
@@ -801,6 +808,7 @@
  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
  %{fsyntax-only:-o %j} %{-param*}\
  %{fmudflap|fmudflapth:-fno-builtin -fno-merge-constants}\
+ %{!O*:-O}\
  %{coverage:-fprofile-arcs -ftest-coverage}";
 
 static const char *asm_options =
diff -Naur gcc-4.1.2.orig/libssp/Makefile.am gcc-4.1.2/libssp/Makefile.am
--- gcc-4.1.2.orig/libssp/Makefile.am	2006-02-28 00:29:00.000000000 +0000
+++ gcc-4.1.2/libssp/Makefile.am	2007-12-24 19:39:07.000000000 +0000
@@ -7,6 +7,7 @@
 AUTOMAKE_OPTIONS = 1.9.5 foreign
 ACLOCAL_AMFLAGS = -I .. -I ../config
 MAINT_CHARSET = latin1
+AM_CPPFLAGS= -U_FORTIFY_SOURCE
 
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
diff -Naur gcc-4.1.2.orig/libssp/Makefile.in gcc-4.1.2/libssp/Makefile.in
--- gcc-4.1.2.orig/libssp/Makefile.in	2006-09-29 21:27:38.000000000 +0000
+++ gcc-4.1.2/libssp/Makefile.in	2007-12-24 19:39:07.000000000 +0000
@@ -214,6 +214,7 @@
 AUTOMAKE_OPTIONS = 1.9.5 foreign
 ACLOCAL_AMFLAGS = -I .. -I ../config
 MAINT_CHARSET = latin1
+AM_CPPFLAGS = -U_FORTIFY_SOURCE
 
 # May be used by various substitution variables.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
diff -Naur gcc-4.1.2.orig/libssp/ssp/stdio.h gcc-4.1.2/libssp/ssp/stdio.h
--- gcc-4.1.2.orig/libssp/ssp/stdio.h	2005-08-17 03:26:45.000000000 +0000
+++ gcc-4.1.2/libssp/ssp/stdio.h	2007-12-24 19:40:51.000000000 +0000
@@ -33,6 +33,9 @@
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
+#if defined(__need_FILE) || defined(__need__FILE)
+#include_next <stdio.h>
+#else
 #ifndef _SSP_STDIO_H
 #define _SSP_STDIO_H 1
 
@@ -99,3 +102,4 @@
 
 #endif /* __SSP_FORTIFY_LEVEL > 0 */
 #endif /* _SSP_STDIO_H */
+#endif /* __need_FILE */