From 4f57b13404058b625c7af418b1ca39b05c404a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Wed, 5 Feb 2014 23:20:59 +0100
Subject: [PATCH] build_cross_tools_gcc4: enable posix threads.

* build kernel libgcc and libsupc++ with disabled posix threads for all
architectures. We currently change the configuration manually, as gcc
doesn't easily let us reconfigure without a full rebuild.
---
 build/scripts/build_cross_tools_gcc4 | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4
index 346c9dae8d..2be22ab924 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -16,6 +16,7 @@ installDir=$4
 shift 4
 additionalMakeArgs=$*
 
+kernelCcFlags="-D_KERNEL_MODE"
 case $haikuMachine in
 x86_64-*)
 	# GCC's default is to enable multilib, but there is a bug when
@@ -23,7 +24,7 @@ x86_64-*)
 	# failure
 	binutilsConfigureArgs=""
 	gccConfigureArgs=""
-	kernelCcFlags="-mno-red-zone"
+	kernelCcFlags="$kernelCcFlags -mno-red-zone"
 	;;
 m68k-*)
 	binutilsConfigureArgs="--enable-multilib"
@@ -36,7 +37,6 @@ arm-*)
 *)
 	binutilsConfigureArgs="--disable-multilib"
 	gccConfigureArgs="--disable-multilib"
-	kernelCcFlags=
 	;;
 esac
 
@@ -199,7 +199,7 @@ CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$gccSourceDir/configure" \
 	--prefix="$installDir" $buildHostSpec --target=$haikuMachine \
 	--disable-nls --disable-shared --with-system-zlib \
 	--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
-	--with-sysroot="$sysrootDir" \
+	--with-sysroot="$sysrootDir" --enable-threads=posix \
 	$gccConfigureArgs \
 	|| exit 1
 
@@ -217,6 +217,8 @@ $MAKE $additionalMakeArgs install || {
 
 # build libraries for the kernel if the target arch requires it
 if [ -n "$kernelCcFlags" ]; then
+	# switch threads config to single for libgcc
+	ln -sf "$gccSourceDir/libgcc/gthr-single.h" "$haikuMachine/libgcc/gthr-default.h"
 	$MAKE -C "$haikuMachine/libgcc" clean
 	$MAKE -C "$haikuMachine/libgcc" CFLAGS="-g -O2 $kernelCcFlags" || {
 		echo "Error: Building kernel libgcc failed." >&2
@@ -227,6 +229,18 @@ if [ -n "$kernelCcFlags" ]; then
 		"$installDir/$haikuMachine/lib/libgcc-kernel.a" || exit 1
 
 	$MAKE -C "$haikuMachine/libstdc++-v3/libsupc++" clean
+
+	# switch threads config to single for libsupc++
+	[ -f "$haikuMachine/32/libstdc++-v3/include/$haikuMachine/bits/gthr-default.h" ] \
+		&& cp -f "$haikuMachine/32/libstdc++-v3/include/$haikuMachine/bits/gthr-single.h" \
+		"$haikuMachine/32/libstdc++-v3/include/$haikuMachine/bits/gthr-default.h"
+	cp -f "$haikuMachine/libstdc++-v3/include/$haikuMachine/bits/gthr-single.h" \
+		"$haikuMachine/libstdc++-v3/include/$haikuMachine/bits/gthr-default.h"
+	[ -f "$haikuMachine/32/libstdc++-v3/config.h" ] \
+		&& sed -i '/.*_GLIBCXX_HAS_GTHREADS.*/c\#undef _GLIBCXX_HAS_GTHREADS' \
+		"$haikuMachine/32/libstdc++-v3/config.h"
+	sed -i '/.*_GLIBCXX_HAS_GTHREADS.*/c\#undef _GLIBCXX_HAS_GTHREADS' \
+		"$haikuMachine/libstdc++-v3/config.h"
 	$MAKE -C "$haikuMachine/libstdc++-v3/libsupc++" CFLAGS="-g -O2 $kernelCcFlags" \
 		CXXFLAGS="-g -O2 $kernelCcFlags" || {
 		echo "Error: Building kernel libsupc++ failed." >&2