[Devil-linux-commit] build/scripts binutils,1.13,1.14 gcc,1.34,1.35

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19252/scripts

Modified Files:
	binutils gcc 
Log Message:
- added pt_pax patch to binutils
- updated binutils to 2.16.1
- updated pie and ssp script from HLFS


Index: gcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gcc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gcc	6 Feb 2005 04:15:49 -0000	1.34
+++ gcc	30 Sep 2005 02:17:26 -0000	1.35
@@ -67,32 +67,34 @@
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
 		    # and now make sure we use SSP when compiling
 		    # thanks to Robert Connolly
+
 perl -pi -e 's@\*cc1:\n@$_%(cc1_ssp) @;' \
-$(gcc --print-file specs) &&
+    $(gcc --print-file specs) &&
 perl -pi -e 's@\*cc1plus:\n@$_%(cc1_ssp) @;' \
-$(gcc --print-file specs) &&
-echo '*cc1_ssp:
+    $(gcc --print-file specs) &&
+echo '*cc1_ssp: 
 %{!fno-stack-protector*: -fstack-protector-all}
-' >> $(gcc --print-file specs)
+'    >> $(gcc --print-file specs)
+EOF
 
 		fi
 
 perl -pi -e 's@\*cc1:\n@$_%(cc1_pie) @;' \
-        $(gcc --print-file specs) &&
+$(gcc --print-file specs) &&
 perl -pi -e 's@\*cc1plus:\n@$_%(cc1_pie) @;' \
-        $(gcc --print-file specs) &&
+$(gcc --print-file specs) &&
 perl -pi -e 's@%{pie:-pie}@%(link_pie)@;' \
-                $(gcc --print-file specs) &&
+$(gcc --print-file specs) &&
 perl -pi -e 's@pie:@!no-pie|pie:@g;' $(gcc --print-file specs) &&
 perl -pi -e 's@\*cpp:\n@$_%(cpp_pie) @;' $(gcc --print-file specs) &&
-echo '*cpp_pie:
+echo '*cpp_pie: 
 %{!static:%{!no-pie:%{!pie: -D__PIC__ -DPIC}}}
 ' >> $(gcc --print-file specs) &&
-echo '*cc1_pie:
+echo '*cc1_pie: 
 %{!static:%{!no-pie:%{!pie: -fPIC}}}
 ' >> $(gcc --print-file specs) &&
-echo '*link_pie:
-%{pie:-pie}%{!no-pie:%{!static:%{!Bstatic:%{!i:%{!r: -z now -z relro -z combreloc %{!shared:%{!Bshareable:%{!pie: -pie}}}}}}}}
+echo '*link_pie: 
+%{pie:-pie}%{!no-pie:%{!static:%{!Bstatic:%{!i:%{!r: %{!nonow: -z now} %{!norelro: -z relro} %{!shared:%{!Bshareable:%{!pie: -pie}}}}}}}}
 ' >> $(gcc --print-file specs)
 		;;
 

Index: binutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/binutils,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- binutils	28 Dec 2004 18:55:08 -0000	1.13
+++ binutils	30 Sep 2005 02:17:26 -0000	1.14
@@ -29,6 +29,7 @@
 		# Apply additional Linux patches.
 		if [ ! -f binutils-patches.done ]; then
 			/bin/sh patches/README
+			bzcat $DL_DIR/src/binutils-2*-pt_pax-*.patch.bz2 | patch -p1 || exit 1
 			touch binutils-patches.done
 		fi