Merge branch 'master' into x86_64

Conflicts:
	build/jam/FloppyBootImage
	build/jam/OptionalBuildFeatures
	build/jam/OptionalPackages
	headers/private/shared/cpu_type.h
	src/bin/ps.c
	src/bin/sysinfo.cpp
	src/kits/tracker/PoseView.cpp
	src/preferences/appearance/DecorSettingsView.cpp
	src/preferences/virtualmemory/Settings.cpp
	src/servers/input/AddOnManager.cpp
	src/servers/input/InputServer.cpp
	src/servers/input/InputServerMethod.cpp
	src/system/boot/Jamfile
	src/system/boot/platform/raspberrypi_arm/mmu.cpp
	src/system/boot/platform/u-boot/arch/arm/Jamfile
	src/system/kernel/arch/x86/arch_cpu.cpp
	src/system/kernel/arch/x86/arch_thread.cpp
	src/system/kernel/cache/block_cache.cpp
	src/system/kernel/vm/VMAnonymousCache.cpp

build/scripts/build_cross_tools

@@ -89,12 +89,15 @@ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $tmpIncludeDir \
 	$tmpLibDir || exit 1
 mkdir -p $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion
 
+# force the POSIX locale, as the build (makeinfo) might choke otherwise
+export LC_ALL=POSIX
+
 # build binutils
 cd $binutilsObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/binutils/configure \
 	--prefix=$installDir --target=i586-pc-haiku --disable-nls \
 	--enable-shared=yes --disable-werror || exit 1
-make $additionalMakeArgs || exit 1
+make -j1 $additionalMakeArgs || exit 1
 make $additionalMakeArgs install || exit 1
 
 PATH=$PATH:$installDir/bin
@@ -109,7 +112,7 @@ copy_headers()
 	sourceDir=$1
 	targetDir=$2
 
-	headers="`find $sourceDir -name \*\.h | grep -v /.svn`"
+	headers="`find $sourceDir -name \*\.h`"
 	headers="`echo $headers | sed -e s@$sourceDir/@@g`"
 	for f in $headers; do
 		headerTargetDir=$targetDir/`dirname $f`
@@ -154,7 +157,7 @@ eval "sed $sedExpr Makefile.bak > Makefile" || exit 1
 rm Makefile.bak
 
 # make gcc
-make cross || {
+make -j1 cross || {
 	echo "ERROR: Building gcc failed." >&2
 	exit 1
 }

build/scripts/build_cross_tools_gcc4

@@ -113,6 +113,8 @@ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $stdcxxObjDir \
 	$tmpIncludeDir $tmpLibDir || exit 1
 mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion
 
+# force the POSIX locale, as the build (makeinfo) might choke otherwise
+export LC_ALL=POSIX
 
 # build binutils
 cd $binutilsObjDir
@@ -133,7 +135,7 @@ copy_headers()
 	sourceDir=$1
 	targetDir=$2
 
-	headers="$(find $sourceDir -name \*\.h | grep -v /.svn)"
+	headers="$(find $sourceDir -name \*\.h)"
 	headers="$(echo $headers | sed -e s@$sourceDir/@@g)"
 	for f in $headers; do
 		headerTargetDir=$targetDir/$(dirname $f)

build/scripts/build_haiku_image

@@ -16,7 +16,6 @@ set -o errexit
 # dontClearImage
 # isVMwareImage
 # optionalPackageDescriptions
-# stripOptionalPackageDebugSymbols
 #
 # addattr
 # copyattr
@@ -158,10 +157,11 @@ stripDebugInfo()
 
 extractFile()
 {
-	# extractFile <archive> <directory>
+	# extractFile <archive> <directory> <extractedSubDir> <stripDebugSymbols>
 	archiveFile=$1
 	targetExtractedDir=$2
 	extractedSubDir=$3
+	stripDebugSymbols=$4
 
 	echo "Extracting $archiveFile ..."
 
@@ -188,7 +188,7 @@ extractFile()
 		rm $extractDir/.OptionalPackageDescription
 	fi
 
-	if [ "$stripOptionalPackageDebugSymbols" = "1" ]; then
+	if [ "$stripDebugSymbols" = "1" ]; then
 		# strip executables in common/bin
 		if [ -d $extractDir/common/bin ]; then
 			for file in `find $extractDir/common/bin -type f -a -perm +100 \