Merge branch 'master' into sam460ex

build/jam/BuildSetup

@@ -145,6 +145,12 @@ if $(HAIKU_GCC_VERSION[1]) >= 4 {
 	HAIKU_GCC_BASE_FLAGS += -Wno-array-bounds ;
 }
 
+# activating graphite optimizations
+if $(HAIKU_USE_GCC_GRAPHITE) = 1 {
+	HAIKU_GCC_BASE_FLAGS += -floop-interchange -ftree-loop-distribution
+		-floop-strip-mine -floop-block ;
+}
+
 if $(HOST_GCC_VERSION[1]) >= 3 {
 	HOST_GCC_BASE_FLAGS += -fno-strict-aliasing -fno-tree-vrp ;
 }

build/scripts/build_cross_tools_gcc4

@@ -95,8 +95,7 @@ fi
 # (which apparently doesn't work reliably on all the different host 
 # configurations and changes files which in turn appear as local changes
 # to the VCS).
-find $binutilsSourceDir -name \*.info -print0 | xargs -0 touch
-find $gccSourceDir -name \*.info -print0 | xargs -0 touch
+find $binutilsSourceDir $gccSourceDir -name \*.info -print0 | xargs -0 touch
 
 # create the object and installation directories for the cross compilation tools
 installDir=$haikuOutputDir/cross-tools
@@ -113,6 +112,22 @@ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $stdcxxObjDir \
 	$tmpIncludeDir $tmpLibDir || exit 1
 mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion
 
+if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
+	cloogSourceDir=$buildToolsDir/cloog
+	gmpSourceDir=$buildToolsDir/gcc/gmp
+	pplSourceDir=$buildToolsDir/ppl
+
+	pplObjDir=$objDir/ppl
+	gmpObjDir=$objDir/gmp
+	cloogObjDir=$objDir/cloog
+	mkdir -p $pplObjDir $gmpObjDir $cloogObjDir || exit 1
+	
+	gccConfigureArgs="$gccConfigureArgs --with-cloog=$installDir \
+		--enable-cloog-backend=isl --with-ppl=$installDir \
+		--disable-cloog-version-check --with-gmp=$installDir \
+		--with-host-libstdcxx=\"-lstdc++\""
+fi
+
 # force the POSIX locale, as the build (makeinfo) might choke otherwise
 export LC_ALL=POSIX
 
@@ -126,6 +141,32 @@ $MAKE $additionalMakeArgs install || exit 1
 
 export PATH=$PATH:$installDir/bin
 
+if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
+	# build gmp
+	cd $gmpObjDir
+	$gmpSourceDir/configure --prefix=$installDir \
+		--disable-shared --enable-cxx || exit 1
+	$MAKE $additionalMakeArgs || exit 1
+	$MAKE $additionalMakeArgs install || exit 1
+	
+	# build ppl
+	cd $pplObjDir
+	CFLAGS="-O2" CXXFLAGS="-O2" $pplSourceDir/configure --prefix=$installDir \
+		--disable-nls --disable-shared --disable-watchdog \
+		--disable-maintainer-mode || exit 1
+	$MAKE $additionalMakeArgs AUTOCONF:=true AUTOHEADER:=true ACLOCAL:=true \
+		AUTOMAKE:=true || exit 1
+	$MAKE $additionalMakeArgs install AUTOCONF:=true AUTOHEADER:=true \
+		ACLOCAL:=true AUTOMAKE:=true || exit 1
+
+	# build cloog
+	cd $cloogObjDir
+	CFLAGS="-O2" CXXFLAGS="-O2" $cloogSourceDir/configure \
+		--prefix=$installDir --disable-nls --disable-shared \
+		--with-gmp-prefix=$installDir || exit 1
+	$MAKE $additionalMakeArgs || exit 1
+	$MAKE $additionalMakeArgs install || exit 1
+fi
 
 # build gcc