Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5152/scripts
Modified Files:
gcc
Log Message:
some cleanup
make sure we use latest spec changes from HLFS
Index: gcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gcc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- gcc 11 Jan 2005 02:30:56 -0000 1.31
+++ gcc 29 Jan 2005 20:40:25 -0000 1.32
@@ -35,30 +35,15 @@
cd gcc
patch -p1 -i $PROTECTORDIR/gcc*.dif || exit 1
cp $PROTECTORDIR/gcc/protector.c $PROTECTORDIR/gcc/protector.h . || exit 1
- #patch -p1 -i $PROTECTORDIR/protectonly.dif || exit 1
cd ..
touch ./.done_patch_protector
- #if [ ! -f $KERNELDIR/devil-linux-kernel-protector-patch.done ]; then
- # echo "applying SSP kernel patch"
- # if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
- # bzcat $DL_DIR/src/linux-2.4.*-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
- # else
- # bzcat $DL_DIR/src/linux-2.6.*-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
- # fi
- # touch $KERNELDIR/devil-linux-kernel-protector-patch.done
- #fi
-
fi
- #CONFIG_EXTRA="$CONFIG_EXTRA --enable-stack-protector"
- #patch -p1 -i $(find_src_dir gcc-secpatches)/gcc-3.4-sspspecs-3.patch || exit 1
fi
if [ ! -f gcc-patches.done ]; then
echo "applying gcc patches"
bzcat $DL_DIR/src/gcc-3*patch.bz2 | patch -p1 || exit 1
- #echo "applying auto-pie patch"
- #patch -p1 -i $(find_src_dir gcc-secpatches)/gcc-3.4-piespecs_x86-2.patch || exit 1
touch gcc-patches.done
fi
@@ -83,24 +68,25 @@
# 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)
- perl -pi -e 's@\*cc1plus:\n@$_%(cc1_ssp) @;' $(gcc --print-file specs)
+ perl -pi -e 's@\*cc1plus:\n@$_%(cc1_ssp) @;' $(gcc --print-file specs)
echo '*cc1_ssp:
%{!fno-stack-protector*: -fstack-protector-all}
' >> $(gcc --print-file specs)
fi
- perl -pi -e 's@\*cc1:\n@$_%(cc1_pie) @;' $(gcc --print-file specs)
- perl -pi -e 's@\*cc1plus:\n@$_%(cc1_pie) @;' $(gcc --print-file specs)
- perl -pi -e 's@%{pie:-pie}@%(link_pie)@;' $(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)
+
+ perl -pi -e 's@\*cc1:\n@$_%(cc1_pie) @;' $(gcc --print-file specs)
+ perl -pi -e 's@\*cc1plus:\n@$_%(cc1_pie) @;' $(gcc --print-file specs)
+ perl -pi -e 's@%{pie:-pie}@%(link_pie)@;' $(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:
%{!static:%{!no-pie:%{!pie: -D__PIC__ -DPIC}}}
-' >> $(gcc --print-file specs)
+' >> $(gcc --print-file specs) &&
echo '*cc1_pie:
%{!static:%{!no-pie:%{!pie: -fPIC}}}
-' >> $(gcc --print-file specs)
+' >> $(gcc --print-file specs) &&
echo '*link_pie:
-%{pie:-pie} %{!pie:%{!static:%{!Bstatic:%{!shared:%{!Bshareable:%{!i:%{!r:%{!no-pie: -pie -z now -z relro}}}}}}}}
+%{pie:-pie}%{!no-pie:%{!static:%{!Bstatic:%{!i:%{!r:%{!shared:%{!Bshareable:%{!pie: -pie}}} -z now -z relro -z combreloc}}}}}
' >> $(gcc --print-file specs)
;;
|
