Ticket #2982: build_system_new_gcc-4.3.2.2.patch

build/scripts/build_cross_tools_gcc4

@@ -4 +4 @@
 
 # get and check the parameters
 if [ $# -lt 3 ]; then
-    echo Usage: $0 '<machine> <haiku sourcedir> <buildtools dir> [ <haiku output dir> ]' >&2
+    echo "\033[1m\E[37;33mUsage: \033[0m$0 '<machine> <haiku sourcedir> <buildtools dir> [ <haiku output dir> ]'" >&2
     exit 1
 fi
 
@@ -29 +29 @@
 fi
 
 if [ ! -d $haikuSourceDir ]; then
-    echo "No such directory: \"$haikuSourceDir\"" >&2
+    echo "\033[1m\E[37;31mERROR: \033[0mNo such directory: \"$haikuSourceDir\"" >&2
     exit 1
 fi
 
 if [ ! -d $buildToolsDir ]; then
-    echo "No such directory: \"$buildToolsDir\"" >&2
+    echo "\033[1m\E[37;31mERROR: \033[0mNo such directory: \"$buildToolsDir\"" >&2
     exit 1
 fi
 
@@ -57 +57 @@
 cd $haikuOutputDir
 haikuOutputDir=$(pwd)
 
-binutilsSourceDir=$buildToolsDir/binutils
-gccSourceDir=$buildToolsDir/gcc
+#binutilsSourceDir=$buildToolsDir/binutils
+binutilsSourceDir=$buildToolsDir/binutils-2.18
+gmpSourceDir=$buildToolsDir/gmp-4.2.4
+mpfrSourceDir=$buildToolsDir/mpfr-2.3.2
+#gccSourceDir=$buildToolsDir/gcc
+gccSourceDir=$buildToolsDir/gcc-4.3.2
 
 
 # get gcc version
 gccVersion=$(cat $gccSourceDir/gcc/BASE-VER)
 
 if [ -z "$gccVersion" ]; then
-    echo "Failed to find out gcc version." >&2
+    echo "\033[1m\E[37;31mERROR: \033[0mFailed to find out gcc version." >&2
     exit 1
 fi
 
@@ -73 +77 @@
 # create the object and installation directories for the cross compilation tools
 installDir=$haikuOutputDir/cross-tools
 objDir=$haikuOutputDir/cross-tools-build
+gmpObjDir=$objDir/gmp
+mpfrObjDir=$objDir/mpfr
 binutilsObjDir=$objDir/binutils
 gccObjDir=$objDir/gcc
 tmpIncludeDir=$objDir/sysincludes
@@ -80 +86 @@
 
 rm -rf $installDir $objDir
 
-mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $tmpIncludeDir \
-    $tmpLibDir || exit 1
+mkdir -p $installDir $objDir $gmpObjDir $mpfrObjDir $binutilsObjDir $gccObjDir \
+    $tmpIncludeDir $tmpLibDir $installDir/bin || exit 1
 mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion
 
+export PATH=$PATH:$installDir/bin
 
+# build gmp
+cd $gmpObjDir
+echo "\033[1m\E[37;32mBuilding GMP...\033[0m"
+CFLAGS="-O2" CXXFLAGS="-O2" $gmpSourceDir/configure \
+    --prefix=$installDir || exit 1
+$MAKE || exit 1
+$MAKE install || exit 1
+
+# build mpfr
+cd $mpfrObjDir
+echo "\033[1m\E[37;32mBuilding MPFR...\033[0m"
+CFLAGS="-O2" CXXFLAGS="-O2" $mpfrSourceDir/configure \
+    --prefix=$installDir --with-gmp=$installDir || exit 1
+$MAKE || exit 1
+$MAKE install || exit 1
+
 # build binutils
 cd $binutilsObjDir
+echo "\033[1m\E[37;32mBuilding binutils for target $haikuMachine\033[0m"
 CFLAGS="-O2" CXXFLAGS="-O2" $binutilsSourceDir/configure \
     --prefix=$installDir --target=$haikuMachine --disable-nls \
+    --with-mpfr=$installDir --with-gmp=$installDir \
     --disable-shared || exit 1
 $MAKE || exit 1
 $MAKE install || exit 1
 
-export PATH=$PATH:$installDir/bin
-
-
 # build gcc
 
 # prepare the include files
@@ -118 +140 @@
 
 # configure gcc
 cd $gccObjDir
+echo "\033[1m\E[37;32mBuilding gcc for target $haikuMachine\033[0m"
 CFLAGS="-O2" CXXFLAGS="-O2" $gccSourceDir/configure --prefix=$installDir \
     --target=$haikuMachine --disable-nls --disable-shared \
     --enable-languages=c,c++ --with-headers=$tmpIncludeDir \
-    --with-libs=$tmpLibDir || exit 1
+    --with-libs=$tmpLibDir --with-gmp=$installDir \
+    --with-mpfr=$installDir --with-dwarf2 || exit 1
 
-# make gcc
+make gcc
 $MAKE || {
-    echo "ERROR: Building gcc failed." >&2
+    echo "\033[1m\E[37;31mERROR: \033[0mBuilding gcc failed." >&2
     exit 1
 }
 
-# install gcc
+ install gcc
 $MAKE install || {
-    echo "ERROR: Installing the cross compiler failed." >&2
+    echo "\033[1m\E[37;31mERROR: \033[0mInstalling the cross compiler failed." >&2
     exit 1
 }
 
@@ -142 +166 @@
 sysIncludeDir=$installDir/$haikuMachine/sys-include
 rm -rf $sysIncludeDir/be $sysIncludeDir/posix
 
+echo "\033[1m\E[37;32mApplying gcc 4.3.2 fixes...\033[0m"
+# gcc-4.3 fix:
+# restore {sys}limits.h from gcc new include-fixed dir
+# into old include
+
+tmpGccIncludeDir=$installDir/lib/gcc/$haikuMachine/$gccVersion
+cp $tmpGccIncludeDir/include-fixed/*.h $tmpGccIncludeDir/include
+
+# gcc-4.3 fix:
+# this version has a bug with #include_next, simply it includes c++ headers before c headers
+# so this makes error when including c++ c* headers (cstddef for example), it tryies
+# to #include_next <stddef}.h> which can't be found due to includes order issue
+# TODO: remove this ugly hack, when it will be fixed
+
+fix_include()
+{
+    headerToFix=$1
+    headerToFixTmp="${headerToFix}.tmp"
+    mv $headerToFix $headerToFixTmp
+    sed s/include_next/include/g < $headerToFixTmp > $headerToFix
+    rm $headerToFixTmp
+}
+
+tmpGccIncludeDir=$installDir/$haikuMachine/include/c++/$gccVersion
+fix_include "$tmpGccIncludeDir/cassert"
+fix_include "$tmpGccIncludeDir/cctype"
+fix_include "$tmpGccIncludeDir/cerrno"
+fix_include "$tmpGccIncludeDir/cfloat"
+fix_include "$tmpGccIncludeDir/climits"
+fix_include "$tmpGccIncludeDir/clocale"
+fix_include "$tmpGccIncludeDir/cmath"
+fix_include "$tmpGccIncludeDir/csetjmp"
+fix_include "$tmpGccIncludeDir/csignal"
+fix_include "$tmpGccIncludeDir/cstdbool"
+fix_include "$tmpGccIncludeDir/cstdio"
+fix_include "$tmpGccIncludeDir/cstdlib"
+fix_include "$tmpGccIncludeDir/cstring"
+fix_include "$tmpGccIncludeDir/ctime"
+fix_include "$tmpGccIncludeDir/cwchar"
+fix_include "$tmpGccIncludeDir/cwctype"
+
 # remove the objects dir
 rm -rf $objDir
 
-
-echo "binutils and gcc for cross compilation have been built successfully!"
+echo "\033[1m\E[37;32mGMP, MPFR, Binutils and GCC for cross compilation have been built successfully!\033[0m"

configure

@@ -132 +132 @@
             haikuSharedLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.so`
             haikuStaticLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.a`
             haikuSharedLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.so`
-            local headers=$gccdir/../../../../include/c++/$haikuGCCVersion
+            # local headers=$gccdir/../../../../include/c++/$haikuGCCVersion
+            local headers=$outputDir/cross-tools/$haikuGCCMachine/include/c++/$haikuGCCVersion
             haikuCxxHeadersDir=$headers
             for d in $haikuGCCMachine backward ext; do
                 # Note: We need the line break, otherwise the line might become
@@ -267 +268 @@
             buildCrossTools=$3
             buildCrossToolsScript="${buildCrossToolsScript}_gcc4"
             case "$2" in
+                arm)    haikuGCCMachine=arm-unknow-haiku;;
                 x86)    haikuGCCMachine=i586-pc-haiku;;
                 ppc)    haikuGCCMachine=powerpc-apple-haiku;;
                 m68k)   haikuGCCMachine=m68k-unknown-haiku;;