Clifford Wolf:

package/base/gcc/config-300.in

@@ -28,12 +28,16 @@ then
 	bool 'Building gcc 3.2.x package' ROCKCFG_PKG_GCC_GCC32 0
 	bool 'Building gcc 3.3.x package' ROCKCFG_PKG_GCC_GCC33 0
 	bool 'Building gcc 3.4.x package' ROCKCFG_PKG_GCC_GCC34 1
+	bool 'Building gcc 4.0.x package' ROCKCFG_PKG_GCC_GCC40 0
+	bool 'Building gcc 4.1.x package' ROCKCFG_PKG_GCC_GCC41 0
 
 	l=""
 	if [ $ROCKCFG_PKG_GCC_GCC2  = 1 ]; then pkgfork gcc gcc2;  l="$l gcc2";  fi
 	if [ $ROCKCFG_PKG_GCC_GCC32 = 1 ]; then pkgfork gcc gcc32; l="$l gcc32"; fi
 	if [ $ROCKCFG_PKG_GCC_GCC33 = 1 ]; then pkgfork gcc gcc33; l="$l gcc33"; fi
 	if [ $ROCKCFG_PKG_GCC_GCC34 = 1 ]; then pkgfork gcc gcc34; l="$l gcc34"; fi
+	if [ $ROCKCFG_PKG_GCC_GCC40 = 1 ]; then pkgfork gcc gcc40; l="$l gcc40"; fi
+	if [ $ROCKCFG_PKG_GCC_GCC41 = 1 ]; then pkgfork gcc gcc41; l="$l gcc41"; fi
 	pkgremove gcc
 
 	d="none"
@@ -41,6 +45,8 @@ then
 	if [ $ROCKCFG_PKG_GCC_GCC33 = 1 ]; then d="gcc33"; fi
 	if [ $ROCKCFG_PKG_GCC_GCC32 = 1 ]; then d="gcc32"; fi
 	if [ $ROCKCFG_PKG_GCC_GCC34 = 1 ]; then d="gcc34"; fi
+	if [ $ROCKCFG_PKG_GCC_GCC40 = 1 ]; then d="gcc40"; fi
+	if [ $ROCKCFG_PKG_GCC_GCC41 = 1 ]; then d="gcc41"; fi
 
 	k=""; for x in $l; do
 		k="$k $x Use_${x}_as_standard_C_compiler"
@@ -62,7 +68,7 @@ then
 	done
 	choice ROCKCFG_DEFAULT_F77 $d $k
 
-	k=""; for x in gcc2 gcc32 gcc33 gcc34; do
+	k=""; for x in gcc2 gcc32 gcc33 gcc34 gcc40 gcc41; do
 		if [ "$ROCKCFG_DEFAULT_CC" != "$x" ]; then
 			if [ "$ROCKCFG_DEFAULT_CXX" != "$x" ]; then
 				k="$k / gcc=$x / s/^\(..\).../\1---/;"
@@ -107,6 +113,24 @@ then
 				ROCKCFG_PKG_GCC34_PROFILED 1
 		%include package/*/*/subconfig-gcc34.in
 	fi
+	if pkgcheck gcc=gcc40 X; then
+		comment ' '
+		comment '--- GCC 4.0.x options'
+		bool 'Do not build JAVA compiler' \
+				ROCKCFG_PKG_GCC40_NO_JAVA 1
+		bool 'Do profiled bootstrap' \
+				ROCKCFG_PKG_GCC40_PROFILED 1
+		%include package/*/*/subconfig-gcc40.in
+	fi
+	if pkgcheck gcc=gcc41 X; then
+		comment ' '
+		comment '--- GCC 4.1.x options'
+		bool 'Do not build JAVA compiler' \
+				ROCKCFG_PKG_GCC41_NO_JAVA 1
+		bool 'Do profiled bootstrap' \
+				ROCKCFG_PKG_GCC41_PROFILED 1
+		%include package/*/*/subconfig-gcc41.in
+	fi
 
   menu_end
 fi

package/base/gcc/gcc.conf

@@ -204,7 +204,7 @@ custmain() {
 	else
 
 		if [ $xpkg = gcc2 -a "$ROCKCFG_PKG_GCC2_NO_CHILL" != 0 ] ; then
-			# gcc-2.x contains no java compiler
+			# gcc-2.x contains no 'java' compiler
 			confopt="$confopt --enable-languages=c,c++,objc,f77"
 		elif [ "$ROCKCFG_DIETLIBC_ALL" = 1 -o "$ROCKCFG_DIETLIBC_gcc3" = 1 ] ; then
 			# FIXME: c++ and java are not working with dietlibc
@@ -212,8 +212,10 @@ custmain() {
 		elif [ $xpkg = gcc32 -a "$ROCKCFG_PKG_GCC32_NO_JAVA" != 0 ] || \
 		     [ $xpkg = gcc33 -a "$ROCKCFG_PKG_GCC33_NO_JAVA" != 0 ] || \
 		     [ $xpkg = gcc34 -a "$ROCKCFG_PKG_GCC34_NO_JAVA" != 0 ]; then
-			# gcc-3.x contains no chill compiler
 			confopt="$confopt --enable-languages=c,c++,objc,f77"
+		elif [ $xpkg = gcc40 -a "$ROCKCFG_PKG_GCC40_NO_JAVA" != 0 ] || \
+		     [ $xpkg = gcc41 -a "$ROCKCFG_PKG_GCC41_NO_JAVA" != 0 ]; then
+			confopt="$confopt --enable-languages=c,c++,objc,f95"
 		elif [ "$arch" = mips ] ; then
 			# FIXME: MIPS doesn't like the Java compiler
 			confopt="$confopt --disable-libgcj"
@@ -241,6 +243,10 @@ custmain() {
 		hook_eval premake
 		if [ $xpkg = gcc34 -a "$ROCKCFG_PKG_GCC34_PROFILED" != 0 ]; then
 			eval "$MAKE GCJFLAGS=\"$CXXFLAGS\" profiledbootstrap"
+		elif [ $xpkg = gcc40 -a "$ROCKCFG_PKG_GCC40_PROFILED" != 0 ]; then
+			eval "$MAKE GCJFLAGS=\"$CXXFLAGS\" profiledbootstrap"
+		elif [ $xpkg = gcc41 -a "$ROCKCFG_PKG_GCC41_PROFILED" != 0 ]; then
+			eval "$MAKE GCJFLAGS=\"$CXXFLAGS\" profiledbootstrap"
 		else
 			eval "$MAKE GCJFLAGS=\"$CXXFLAGS\" all"
 		fi
@@ -532,6 +538,12 @@ else
 	custmain="custmain"
 fi
 
-gcc_lib_dir="gcc-lib/${pkg_gcc_target}/${ver%%-*}"
-[ $pkg_gcc_version = 34 ] && gcc_lib_dir="gcc/${pkg_gcc_target}/${ver%%-*}"
+case "$pkg_gcc_version" in
+	34|4*)
+		gcc_lib_dir="gcc/${pkg_gcc_target}/${ver%%-*}"
+		;;
+	*)
+		gcc_lib_dir="gcc-lib/${pkg_gcc_target}/${ver%%-*}"
+		;;
+esac
 

package/base/gcc/gcc.desc

@@ -70,5 +70,17 @@
 [D] 870641564 protector-3.4-2.tar.gz http://www.research.ibm.com/trl/projects/security/ssp/gcc3_4/
 #endif
 
+#if xpkg == gcc40
+[V] 4.0-20050319
+[D] 449602379 gcc-4.0-20050319.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/4.0-20050319/
+# [D] 870641564 protector-3.4-2.tar.gz http://www.research.ibm.com/trl/projects/security/ssp/gcc3_4/
+#endif
+
+#if xpkg == gcc41
+[V] 4.1-20050320
+[D] 4264714789 gcc-4.1-20050320.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-20050320/
+# [D] 870641564 protector-3.4-2.tar.gz http://www.research.ibm.com/trl/projects/security/ssp/gcc3_4/
+#endif
+
 [CD] <COPY> for x in $cachedir/*.cache; do cp $x $confdir/$pkg.cache; done
 

package/base/gcc/gcc40/auxbase.patch

@@ -0,0 +1,50 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/gcc/gcc34/auxbase.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+
+This fix is for passing -auxbase or -auxbase-strip thru the "gcc" driver
+programs (e.g. 'gcc') to the backend compilers (e.g. 'cc1'). We will need
+this for supporting feedback compilation using the ROCK toolchain...
+
+ - Clifford <clifford@clifford.at>
+
+--- ./gcc/gcc.h.orig	2004-09-24 15:42:27.000000000 +0200
++++ ./gcc/gcc.h	2004-09-24 15:43:24.000000000 +0200
+@@ -46,6 +46,7 @@
+  (!strcmp (STR, "Tdata") || !strcmp (STR, "Ttext")	\
+   || !strcmp (STR, "Tbss") || !strcmp (STR, "include")	\
+   || !strcmp (STR, "imacros") || !strcmp (STR, "aux-info") \
++  || !strcmp (STR, "auxbase") || !strcmp (STR, "auxbase-strip") \
+   || !strcmp (STR, "idirafter") || !strcmp (STR, "iprefix") \
+   || !strcmp (STR, "iwithprefix") || !strcmp (STR, "iwithprefixbefore") \
+   || !strcmp (STR, "isystem") || !strcmp (STR, "-param") \
+--- ./gcc/gcc.c.orig	2004-09-24 15:44:36.000000000 +0200
++++ ./gcc/gcc.c	2004-09-24 15:48:48.000000000 +0200
+@@ -788,9 +788,9 @@
+ /* NB: This is shared amongst all front-ends.  */
+ static const char *cc1_options =
+ "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
+- %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\
++ %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*}\
+  %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\
+- %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\
++ %{a*} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\
+  %{v:-version} %{pg:-p} %{p} %{f*} %{undef}\
+  %{Qn:-fno-ident} %{--help:--help}\
+  %{--target-help:--target-help}\

package/base/gcc/gcc40/head-tail.patch

@@ -0,0 +1,256 @@
+--- ./gcc/testsuite/ada/acats/run_all.sh.orig	2004-04-26 23:15:54.000000000 +0200
++++ ./gcc/testsuite/ada/acats/run_all.sh	2005-03-25 19:24:49.000000000 +0100
+@@ -229,7 +229,7 @@
+       ls ${i}?.adb > ${i}.lst 2> /dev/null
+       ls ${i}*m.adb >> ${i}.lst 2> /dev/null
+       ls ${i}.adb >> ${i}.lst 2> /dev/null
+-      main=`tail -1 ${i}.lst`
++      main=`tail -n 1 ${i}.lst`
+       binmain=`echo $main | sed -e 's/\(.*\)\..*/\1/g'`
+       echo "BUILD $main" >> $dir/acats.log
+       EXTERNAL_OBJECTS=""
+--- ./gcc/Makefile.in.orig	2005-02-17 09:47:19.000000000 +0100
++++ ./gcc/Makefile.in	2005-03-25 19:24:31.000000000 +0100
+@@ -3898,8 +3898,8 @@
+ 	    for file in $$dir/*$(objext); do \
+ 	      case "$@" in \
+ 		slowcompare* ) \
+-		  tail +16c ./$$file > tmp-foo1; \
+-		  tail +16c stage$$stage/$$file > tmp-foo2 \
++		  tail -n +16c ./$$file > tmp-foo1; \
++		  tail -n +16c stage$$stage/$$file > tmp-foo2 \
+ 		    && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
+ 		  ;; \
+ 		fastcompare* ) \
+--- ./gcc/configure.orig	2005-02-25 19:42:35.000000000 +0100
++++ ./gcc/configure	2005-03-25 19:24:32.000000000 +0100
+@@ -13489,7 +13489,7 @@
+   # and we got the correct data, then succeed.
+   if test x$gcc_cv_objdump != x \
+   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
+-     | tail -3 > conftest.got \
++     | tail -n 3 > conftest.got \
+   && { cmp conftest.lit conftest.got > /dev/null 2>&1 \
+     || cmp conftest.big conftest.got > /dev/null 2>&1; }
+   then
+--- ./gcc/configure.ac.orig	2005-02-25 19:42:35.000000000 +0100
++++ ./gcc/configure.ac	2005-03-25 19:24:33.000000000 +0100
+@@ -2211,7 +2211,7 @@
+   # and we got the correct data, then succeed.
+   if test x$gcc_cv_objdump != x \
+   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
+-     | tail -3 > conftest.got \
++     | tail -n 3 > conftest.got \
+   && { cmp conftest.lit conftest.got > /dev/null 2>&1 \
+     || cmp conftest.big conftest.got > /dev/null 2>&1; }
+   then
+--- ./config/acx.m4.orig	2004-08-14 00:31:45.000000000 +0200
++++ ./config/acx.m4	2005-03-25 19:25:10.000000000 +0100
+@@ -228,7 +228,7 @@
+ [AC_CACHE_CHECK([how to compare bootstrapped objects], gcc_cv_prog_cmp_skip,
+ [ echo abfoo >t1
+   echo cdfoo >t2
+-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
++  gcc_cv_prog_cmp_skip='tail -n +16c $$f1 > tmp-foo1; tail -n +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+   if cmp t1 t2 2 2 > /dev/null 2>&1; then
+     if cmp t1 t2 1 1 > /dev/null 2>&1; then
+       :
+--- ./contrib/test_summary.orig	2004-08-26 07:51:22.000000000 +0200
++++ ./contrib/test_summary	2005-03-25 19:25:10.628454344 +0100
+@@ -106,7 +106,7 @@
+     srcdir = configflags;
+     sub(/\/configure .*/, "", srcdir);
+     printf "LAST_UPDATED: ";
+-    system("tail -1 " srcdir "/LAST_UPDATED");
++    system("tail -n 1 " srcdir "/LAST_UPDATED");
+     print "";
+ 
+     sub(/^[^ ]*\/configure */, " ", configflags);
+--- ./libjava/acinclude.m4.orig	2004-09-23 03:14:00.000000000 +0200
++++ ./libjava/acinclude.m4	2005-03-25 19:25:17.422421504 +0100
+@@ -17,8 +17,8 @@
+ AC_MSG_CHECKING(whether 'ld' is at least 2.13)
+ LD_PROG=`$CC --print-prog-name=ld`
+ LD_VERSION=`$LD_PROG --version`
+-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
+-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
+ if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
+   LD_OK="ok"
+ else
+--- ./libjava/configure.orig	2005-03-20 00:15:42.000000000 +0100
++++ ./libjava/configure	2005-03-25 19:25:17.592395664 +0100
+@@ -5918,8 +5918,8 @@
+ echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6
+ LD_PROG=`$CC --print-prog-name=ld`
+ LD_VERSION=`$LD_PROG --version`
+-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
+-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
+ if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
+   LD_OK="ok"
+ else
+--- ./libstdc++-v3/scripts/check_survey.in.orig	2003-07-05 08:00:05.000000000 +0200
++++ ./libstdc++-v3/scripts/check_survey.in	2005-03-25 19:25:38.663192416 +0100
+@@ -182,9 +182,9 @@
+     function size_command()
+     {
+       case $1 in
+-        TEXT)  TEXT=$(size -B $EXENAME | tail -1 | awk '{print $1}')  ;;
+-        DATA)  DATA=$(size -B $EXENAME | tail -1 | awk '{print $2}')  ;;
+-        SIZE)  SIZE=$(size -B $EXENAME | tail -1 | awk '{print $4}')  ;;
++        TEXT)  TEXT=$(size -B $EXENAME | tail -n 1 | awk '{print $1}')  ;;
++        DATA)  DATA=$(size -B $EXENAME | tail -n 1 | awk '{print $2}')  ;;
++        SIZE)  SIZE=$(size -B $EXENAME | tail -n 1 | awk '{print $4}')  ;;
+       esac
+     }
+   else
+--- ./libstdc++-v3/acinclude.m4.orig	2005-02-24 19:55:16.000000000 +0100
++++ ./libstdc++-v3/acinclude.m4	2005-03-25 19:25:34.534820024 +0100
+@@ -241,7 +241,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+   changequote(,)
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+   changequote([,])
+   glibcxx_gnu_ld_version=`echo $ldver | \
+--- ./libstdc++-v3/configure.orig	2005-02-24 19:55:17.000000000 +0100
++++ ./libstdc++-v3/configure	2005-03-25 19:25:35.386690520 +0100
+@@ -9880,7 +9880,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -55252,7 +55252,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -76923,7 +76923,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -79292,7 +79292,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -81537,7 +81537,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -84550,7 +84550,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -86748,7 +86748,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -88995,7 +88995,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -91603,7 +91603,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -95660,7 +95660,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+--- ./ChangeLog.orig	2005-03-14 02:37:04.000000000 +0100
++++ ./ChangeLog	2005-03-25 19:25:09.070691160 +0100
+@@ -10853,7 +10853,7 @@
+ 	to i386-sco3.2v4.  Set TARGETS and CFLAGS for i386-sco3.2v4.
+ 	(all-cygnus, native, build-cygnus): Make
+ 	$(canonhost)-stamp-3stage-done, not $(host)....
+-	* test-build.mk (stamp-3stage-compared): Use tail +10c for
++	* test-build.mk (stamp-3stage-compared): Use tail -n +10c for
+ 	i386-sco3.2v4.  Added else true to if command.
+ 
+ Mon Dec 28 12:08:56 1992  Ken Raeburn  (raeburn@cygnus.com)
+--- ./configure.orig	2005-02-23 11:12:44.000000000 +0100
++++ ./configure	2005-03-25 19:25:09.490627320 +0100
+@@ -2158,7 +2158,7 @@
+ else
+    echo abfoo >t1
+   echo cdfoo >t2
+-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
++  gcc_cv_prog_cmp_skip='tail -n +16c $$f1 > tmp-foo1; tail -n +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+   if cmp t1 t2 2 2 > /dev/null 2>&1; then
+     if cmp t1 t2 1 1 > /dev/null 2>&1; then
+       :
+--- ./ltcf-c.sh.orig	2004-10-02 18:33:06.000000000 +0200
++++ ./ltcf-c.sh	2005-03-25 19:25:09.537620176 +0100
+@@ -153,7 +153,7 @@
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname-def;
+       else
+         echo EXPORTS > $output_objdir/$soname-def;
+--- ./ltcf-gcj.sh.orig	2004-04-27 08:14:30.000000000 +0200
++++ ./ltcf-gcj.sh	2005-03-25 19:25:09.554617592 +0100
+@@ -156,7 +156,7 @@
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname-def;
+       else
+         echo EXPORTS > $output_objdir/$soname-def;

package/base/gcc/gcc40/install_so.patch

@@ -0,0 +1,39 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/gcc/gcc34/install_so.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+--- ./install-sh.orig	2003-07-20 11:40:28.000000000 +0200
++++ ./install-sh	2003-11-02 17:04:13.000000000 +0100
+@@ -279,8 +279,15 @@
+       && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ 
+     # Now rename the file to the real destination.
+-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+-      || {
++    if echo $dstdir/$dstfile | grep -q 'lib/.*\.so' ; then
++	$doit $mvcmd $dsttmp $dstdir/$dstfile
++	rc=$?
++    else
++	$doit $rmcmd -f $dstdir/$dstfile &&
++	$doit $mvcmd $dsttmp $dstdir/$dstfile
++	rc=$?
++    fi
++    [ $rc -eq 0 ] || {
+ 	   # The rename failed, perhaps because mv can't rename something else
+ 	   # to itself, or perhaps because mv is so ancient that it does not
+ 	   # support -f.

package/base/gcc/gcc40/no-install-libiberty.patch

@@ -0,0 +1,36 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/gcc/gcc34/no-install-libiberty.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+--- ./libiberty/Makefile.in.orig	2003-03-23 06:16:03.000000000 -0400
++++ ./libiberty/Makefile.in	2003-05-15 17:02:18.000000000 -0400
+@@ -263,10 +263,10 @@
+ install: install_to_$(INSTALL_DEST) install-subdir
+ 
+ install_to_libdir: all
+-	${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR)
+-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
+-	( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
+-	mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)
++	#${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR)
++	#$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
++	#( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
++	#mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)
+ 	if test -n "${target_header_dir}"; then \
+ 	  case "${target_header_dir}" in \
+ 	    /*)    thd=${target_header_dir};; \

package/base/gcc/gcc40/no-install-zlib.patch

@@ -0,0 +1,30 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/gcc/gcc34/no-install-zlib.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+--- ./zlib/Makefile.in.orig	2002-11-25 21:28:45.000000000 +0200
++++ ./zlib/Makefile.in	2003-01-25 15:39:06.000000000 +0200
+@@ -510,7 +510,7 @@
+ 	for dir in "$(DESTDIR)$(toolexeclibdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+-install: install-am
++install:
+ install-exec: install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am

package/base/gcc/gcc41/auxbase.patch

@@ -0,0 +1,50 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/gcc/gcc34/auxbase.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+
+This fix is for passing -auxbase or -auxbase-strip thru the "gcc" driver
+programs (e.g. 'gcc') to the backend compilers (e.g. 'cc1'). We will need
+this for supporting feedback compilation using the ROCK toolchain...
+
+ - Clifford <clifford@clifford.at>
+
+--- ./gcc/gcc.h.orig	2004-09-24 15:42:27.000000000 +0200
++++ ./gcc/gcc.h	2004-09-24 15:43:24.000000000 +0200
+@@ -46,6 +46,7 @@
+  (!strcmp (STR, "Tdata") || !strcmp (STR, "Ttext")	\
+   || !strcmp (STR, "Tbss") || !strcmp (STR, "include")	\
+   || !strcmp (STR, "imacros") || !strcmp (STR, "aux-info") \
++  || !strcmp (STR, "auxbase") || !strcmp (STR, "auxbase-strip") \
+   || !strcmp (STR, "idirafter") || !strcmp (STR, "iprefix") \
+   || !strcmp (STR, "iwithprefix") || !strcmp (STR, "iwithprefixbefore") \
+   || !strcmp (STR, "isystem") || !strcmp (STR, "-param") \
+--- ./gcc/gcc.c.orig	2004-09-24 15:44:36.000000000 +0200
++++ ./gcc/gcc.c	2004-09-24 15:48:48.000000000 +0200
+@@ -788,9 +788,9 @@
+ /* NB: This is shared amongst all front-ends.  */
+ static const char *cc1_options =
+ "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
+- %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\
++ %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*}\
+  %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\
+- %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\
++ %{a*} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\
+  %{v:-version} %{pg:-p} %{p} %{f*} %{undef}\
+  %{Qn:-fno-ident} %{--help:--help}\
+  %{--target-help:--target-help}\

package/base/gcc/gcc41/head-tail.patch

@@ -0,0 +1,256 @@
+--- ./gcc/testsuite/ada/acats/run_all.sh.orig	2004-04-26 23:15:54.000000000 +0200
++++ ./gcc/testsuite/ada/acats/run_all.sh	2005-03-25 19:24:49.000000000 +0100
+@@ -229,7 +229,7 @@
+       ls ${i}?.adb > ${i}.lst 2> /dev/null
+       ls ${i}*m.adb >> ${i}.lst 2> /dev/null
+       ls ${i}.adb >> ${i}.lst 2> /dev/null
+-      main=`tail -1 ${i}.lst`
++      main=`tail -n 1 ${i}.lst`
+       binmain=`echo $main | sed -e 's/\(.*\)\..*/\1/g'`
+       echo "BUILD $main" >> $dir/acats.log
+       EXTERNAL_OBJECTS=""
+--- ./gcc/Makefile.in.orig	2005-02-17 09:47:19.000000000 +0100
++++ ./gcc/Makefile.in	2005-03-25 19:24:31.000000000 +0100
+@@ -3898,8 +3898,8 @@
+ 	    for file in $$dir/*$(objext); do \
+ 	      case "$@" in \
+ 		slowcompare* ) \
+-		  tail +16c ./$$file > tmp-foo1; \
+-		  tail +16c stage$$stage/$$file > tmp-foo2 \
++		  tail -n +16c ./$$file > tmp-foo1; \
++		  tail -n +16c stage$$stage/$$file > tmp-foo2 \
+ 		    && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
+ 		  ;; \
+ 		fastcompare* ) \
+--- ./gcc/configure.orig	2005-02-25 19:42:35.000000000 +0100
++++ ./gcc/configure	2005-03-25 19:24:32.000000000 +0100
+@@ -13489,7 +13489,7 @@
+   # and we got the correct data, then succeed.
+   if test x$gcc_cv_objdump != x \
+   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
+-     | tail -3 > conftest.got \
++     | tail -n 3 > conftest.got \
+   && { cmp conftest.lit conftest.got > /dev/null 2>&1 \
+     || cmp conftest.big conftest.got > /dev/null 2>&1; }
+   then
+--- ./gcc/configure.ac.orig	2005-02-25 19:42:35.000000000 +0100
++++ ./gcc/configure.ac	2005-03-25 19:24:33.000000000 +0100
+@@ -2211,7 +2211,7 @@
+   # and we got the correct data, then succeed.
+   if test x$gcc_cv_objdump != x \
+   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
+-     | tail -3 > conftest.got \
++     | tail -n 3 > conftest.got \
+   && { cmp conftest.lit conftest.got > /dev/null 2>&1 \
+     || cmp conftest.big conftest.got > /dev/null 2>&1; }
+   then
+--- ./config/acx.m4.orig	2004-08-14 00:31:45.000000000 +0200
++++ ./config/acx.m4	2005-03-25 19:25:10.000000000 +0100
+@@ -228,7 +228,7 @@
+ [AC_CACHE_CHECK([how to compare bootstrapped objects], gcc_cv_prog_cmp_skip,
+ [ echo abfoo >t1
+   echo cdfoo >t2
+-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
++  gcc_cv_prog_cmp_skip='tail -n +16c $$f1 > tmp-foo1; tail -n +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+   if cmp t1 t2 2 2 > /dev/null 2>&1; then
+     if cmp t1 t2 1 1 > /dev/null 2>&1; then
+       :
+--- ./contrib/test_summary.orig	2004-08-26 07:51:22.000000000 +0200
++++ ./contrib/test_summary	2005-03-25 19:25:10.628454344 +0100
+@@ -106,7 +106,7 @@
+     srcdir = configflags;
+     sub(/\/configure .*/, "", srcdir);
+     printf "LAST_UPDATED: ";
+-    system("tail -1 " srcdir "/LAST_UPDATED");
++    system("tail -n 1 " srcdir "/LAST_UPDATED");
+     print "";
+ 
+     sub(/^[^ ]*\/configure */, " ", configflags);
+--- ./libjava/acinclude.m4.orig	2004-09-23 03:14:00.000000000 +0200
++++ ./libjava/acinclude.m4	2005-03-25 19:25:17.422421504 +0100
+@@ -17,8 +17,8 @@
+ AC_MSG_CHECKING(whether 'ld' is at least 2.13)
+ LD_PROG=`$CC --print-prog-name=ld`
+ LD_VERSION=`$LD_PROG --version`
+-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
+-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
+ if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
+   LD_OK="ok"
+ else
+--- ./libjava/configure.orig	2005-03-20 00:15:42.000000000 +0100
++++ ./libjava/configure	2005-03-25 19:25:17.592395664 +0100
+@@ -5918,8 +5918,8 @@
+ echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6
+ LD_PROG=`$CC --print-prog-name=ld`
+ LD_VERSION=`$LD_PROG --version`
+-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
+-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
+ if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
+   LD_OK="ok"
+ else
+--- ./libstdc++-v3/scripts/check_survey.in.orig	2003-07-05 08:00:05.000000000 +0200
++++ ./libstdc++-v3/scripts/check_survey.in	2005-03-25 19:25:38.663192416 +0100
+@@ -182,9 +182,9 @@
+     function size_command()
+     {
+       case $1 in
+-        TEXT)  TEXT=$(size -B $EXENAME | tail -1 | awk '{print $1}')  ;;
+-        DATA)  DATA=$(size -B $EXENAME | tail -1 | awk '{print $2}')  ;;
+-        SIZE)  SIZE=$(size -B $EXENAME | tail -1 | awk '{print $4}')  ;;
++        TEXT)  TEXT=$(size -B $EXENAME | tail -n 1 | awk '{print $1}')  ;;
++        DATA)  DATA=$(size -B $EXENAME | tail -n 1 | awk '{print $2}')  ;;
++        SIZE)  SIZE=$(size -B $EXENAME | tail -n 1 | awk '{print $4}')  ;;
+       esac
+     }
+   else
+--- ./libstdc++-v3/acinclude.m4.orig	2005-02-24 19:55:16.000000000 +0100
++++ ./libstdc++-v3/acinclude.m4	2005-03-25 19:25:34.534820024 +0100
+@@ -241,7 +241,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+   changequote(,)
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+   changequote([,])
+   glibcxx_gnu_ld_version=`echo $ldver | \
+--- ./libstdc++-v3/configure.orig	2005-02-24 19:55:17.000000000 +0100
++++ ./libstdc++-v3/configure	2005-03-25 19:25:35.386690520 +0100
+@@ -9880,7 +9880,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -55252,7 +55252,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -76923,7 +76923,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -79292,7 +79292,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -81537,7 +81537,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -84550,7 +84550,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -86748,7 +86748,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -88995,7 +88995,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -91603,7 +91603,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -95660,7 +95660,7 @@
+   # Start by getting the version number.  I think the libtool test already
+   # does some of this, but throws away the result.
+ 
+-  ldver=`$LD --version 2>/dev/null | head -1 | \
++  ldver=`$LD --version 2>/dev/null | head -n 1 | \
+          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ 
+   glibcxx_gnu_ld_version=`echo $ldver | \
+--- ./ChangeLog.orig	2005-03-14 02:37:04.000000000 +0100
++++ ./ChangeLog	2005-03-25 19:25:09.070691160 +0100
+@@ -10853,7 +10853,7 @@
+ 	to i386-sco3.2v4.  Set TARGETS and CFLAGS for i386-sco3.2v4.
+ 	(all-cygnus, native, build-cygnus): Make
+ 	$(canonhost)-stamp-3stage-done, not $(host)....
+-	* test-build.mk (stamp-3stage-compared): Use tail +10c for
++	* test-build.mk (stamp-3stage-compared): Use tail -n +10c for
+ 	i386-sco3.2v4.  Added else true to if command.
+ 
+ Mon Dec 28 12:08:56 1992  Ken Raeburn  (raeburn@cygnus.com)
+--- ./configure.orig	2005-02-23 11:12:44.000000000 +0100
++++ ./configure	2005-03-25 19:25:09.490627320 +0100
+@@ -2158,7 +2158,7 @@
+ else
+    echo abfoo >t1
+   echo cdfoo >t2
+-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
++  gcc_cv_prog_cmp_skip='tail -n +16c $$f1 > tmp-foo1; tail -n +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+   if cmp t1 t2 2 2 > /dev/null 2>&1; then
+     if cmp t1 t2 1 1 > /dev/null 2>&1; then
+       :
+--- ./ltcf-c.sh.orig	2004-10-02 18:33:06.000000000 +0200
++++ ./ltcf-c.sh	2005-03-25 19:25:09.537620176 +0100
+@@ -153,7 +153,7 @@
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname-def;
+       else
+         echo EXPORTS > $output_objdir/$soname-def;
+--- ./ltcf-gcj.sh.orig	2004-04-27 08:14:30.000000000 +0200
++++ ./ltcf-gcj.sh	2005-03-25 19:25:09.554617592 +0100
+@@ -156,7 +156,7 @@
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname-def;
+       else
+         echo EXPORTS > $output_objdir/$soname-def;

package/base/gcc/gcc41/install_so.patch

@@ -0,0 +1,39 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/gcc/gcc34/install_so.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+--- ./install-sh.orig	2003-07-20 11:40:28.000000000 +0200
++++ ./install-sh	2003-11-02 17:04:13.000000000 +0100
+@@ -279,8 +279,15 @@
+       && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+ 
+     # Now rename the file to the real destination.
+-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+-      || {
++    if echo $dstdir/$dstfile | grep -q 'lib/.*\.so' ; then
++	$doit $mvcmd $dsttmp $dstdir/$dstfile
++	rc=$?
++    else
++	$doit $rmcmd -f $dstdir/$dstfile &&
++	$doit $mvcmd $dsttmp $dstdir/$dstfile
++	rc=$?
++    fi
++    [ $rc -eq 0 ] || {
+ 	   # The rename failed, perhaps because mv can't rename something else
+ 	   # to itself, or perhaps because mv is so ancient that it does not
+ 	   # support -f.

package/base/gcc/gcc41/no-install-libiberty.patch

@@ -0,0 +1,36 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/gcc/gcc34/no-install-libiberty.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+--- ./libiberty/Makefile.in.orig	2003-03-23 06:16:03.000000000 -0400
++++ ./libiberty/Makefile.in	2003-05-15 17:02:18.000000000 -0400
+@@ -263,10 +263,10 @@
+ install: install_to_$(INSTALL_DEST) install-subdir
+ 
+ install_to_libdir: all
+-	${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR)
+-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
+-	( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
+-	mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)
++	#${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR)
++	#$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
++	#( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n )
++	#mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)
+ 	if test -n "${target_header_dir}"; then \
+ 	  case "${target_header_dir}" in \
+ 	    /*)    thd=${target_header_dir};; \

package/base/gcc/gcc41/no-install-zlib.patch

@@ -0,0 +1,30 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/gcc/gcc34/no-install-zlib.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+--- ./zlib/Makefile.in.orig	2002-11-25 21:28:45.000000000 +0200
++++ ./zlib/Makefile.in	2003-01-25 15:39:06.000000000 +0200
+@@ -510,7 +510,7 @@
+ 	for dir in "$(DESTDIR)$(toolexeclibdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+-install: install-am
++install:
+ install-exec: install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am

package/base/gcc/parse-config

@@ -32,6 +32,7 @@ then
 	if [ "$ROCKCFG_PKG_GCC_STACKPRO" = 1 ] ; then
 		var_append GCC2_WRAPPER_INSERT " " "-fstack-protector"
 		var_append GCC3_WRAPPER_INSERT " " "-fstack-protector"
+		var_append GCC4_WRAPPER_INSERT " " "-fstack-protector"
 	fi
 fi
 
@@ -123,6 +124,9 @@ fi
 #
 var_insert GCC3_WRAPPER_REMOVE " " "-I/usr/include"
 var_insert GCC3_WRAPPER_REMOVE " " "-I/usr/local/include"
+#
+var_insert GCC4_WRAPPER_REMOVE " " "-I/usr/include"
+var_insert GCC4_WRAPPER_REMOVE " " "-I/usr/local/include"
 
 # Add the architecture gcc optimisation options
 #

package/base/gcc/pkgmapper.in

@@ -1,5 +1,5 @@
 
-if [ -z "${pkg##gcc[23]*}" ]; then
+if [ -z "${pkg##gcc[234]*}" ]; then
 	pkg=gcc
 fi
 

package/base/gcc/wrappers.in

@@ -29,6 +29,7 @@ gcc_build_wrapper() {
 		case "$ver" in
 			2.*) z="$x,GCC,GCC2" ;;
 			3.*) z="$x,GCC,GCC3" ;;
+			4.*) z="$x,GCC,GCC4" ;;
 			*)   continue ;;
 		esac
 
@@ -40,14 +41,14 @@ gcc_build_wrapper() {
 	done
 }
 
-gcc_build_wrapper CC ${arch_target}-cc ${arch_target}-gcc{-2,-32,-33,-34,}
-gcc_build_wrapper KCC ${arch_target}-kcc{-2,-32,-33,-34,}
+gcc_build_wrapper CC ${arch_target}-cc ${arch_target}-gcc{-2,-32,-33,-34,-40,-41,}
+gcc_build_wrapper KCC ${arch_target}-kcc{-2,-32,-33,-34,-40,-41,}
 
 if [ $stagelevel -gt 1 -o "$ROCKCFG_USE_CROSSCC" = 0 ]; then
-	gcc_build_wrapper CC  cc gcc{-2,-32,-33,-34,}
-	gcc_build_wrapper CXX {c,g}++{-2,-32,-33,-34,}
-	gcc_build_wrapper F77 {g,f}77{-2,-32,-33,-34,}
-	gcc_build_wrapper KCC kcc{-2,-32,-33,-34,}
+	gcc_build_wrapper CC  cc gcc{-2,-32,-33,-34,-40,-41,}
+	gcc_build_wrapper CXX {c,g}++{-2,-32,-33,-34,-40,-41,}
+	gcc_build_wrapper F77 {g,f}77{-2,-32,-33,-34,-40,-41,}
+	gcc_build_wrapper KCC kcc{-2,-32,-33,-34,-40,-41,}
 fi
 
 if [ $stagelevel -le 1 ]; then

package/base/gmp/gmp.conf

@@ -0,0 +1,4 @@
+
+# needed for gcc f95 compiler
+confopt="$confopt --enable-mpfr"
+