i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build_cross_tools_gcc4: enable posix threads.

Browse Source 
* 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.
This commit is contained in:
Jérôme Duval
2014-02-05 23:38:18 +01:00
parent 762b846cf8
commit 4f57b13404
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/build_cross_tools_gcc4
+17 -3
View File
@@ -16,6 +16,7 @@ installDir=$4
shift 4 shift 4
additionalMakeArgs=$* additionalMakeArgs=$*
kernelCcFlags="-D_KERNEL_MODE"
case $haikuMachine in case $haikuMachine in
x86_64-*) x86_64-*)
# GCC's default is to enable multilib, but there is a bug when # GCC's default is to enable multilib, but there is a bug when
@@ -23,7 +24,7 @@ x86_64-*)
# failure # failure
binutilsConfigureArgs="" binutilsConfigureArgs=""
gccConfigureArgs="" gccConfigureArgs=""
kernelCcFlags="-mno-red-zone" kernelCcFlags="$kernelCcFlags -mno-red-zone"
;; ;;
m68k-*) m68k-*)
binutilsConfigureArgs="--enable-multilib" binutilsConfigureArgs="--enable-multilib"
@@ -36,7 +37,6 @@ arm-*)
*) *)
binutilsConfigureArgs="--disable-multilib" binutilsConfigureArgs="--disable-multilib"
gccConfigureArgs="--disable-multilib" gccConfigureArgs="--disable-multilib"
kernelCcFlags=
;; ;;
esac esac
@@ -199,7 +199,7 @@ CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$gccSourceDir/configure" \
--prefix="$installDir" $buildHostSpec --target=$haikuMachine \ --prefix="$installDir" $buildHostSpec --target=$haikuMachine \
--disable-nls --disable-shared --with-system-zlib \ --disable-nls --disable-shared --with-system-zlib \
--enable-languages=c,c++ --enable-lto --enable-frame-pointer \ --enable-languages=c,c++ --enable-lto --enable-frame-pointer \
--with-sysroot="$sysrootDir" \ --with-sysroot="$sysrootDir" --enable-threads=posix \
$gccConfigureArgs \ $gccConfigureArgs \
|| exit 1 || exit 1
@@ -217,6 +217,8 @@ $MAKE $additionalMakeArgs install || {
# build libraries for the kernel if the target arch requires it # build libraries for the kernel if the target arch requires it
if [ -n "$kernelCcFlags" ]; then 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" clean
$MAKE -C "$haikuMachine/libgcc" CFLAGS="-g -O2 $kernelCcFlags" || { $MAKE -C "$haikuMachine/libgcc" CFLAGS="-g -O2 $kernelCcFlags" || {
echo "Error: Building kernel libgcc failed." >&2 echo "Error: Building kernel libgcc failed." >&2
@@ -227,6 +229,18 @@ if [ -n "$kernelCcFlags" ]; then
"$installDir/$haikuMachine/lib/libgcc-kernel.a" || exit 1 "$installDir/$haikuMachine/lib/libgcc-kernel.a" || exit 1
$MAKE -C "$haikuMachine/libstdc++-v3/libsupc++" clean $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" \ $MAKE -C "$haikuMachine/libstdc++-v3/libsupc++" CFLAGS="-g -O2 $kernelCcFlags" \
CXXFLAGS="-g -O2 $kernelCcFlags" || { CXXFLAGS="-g -O2 $kernelCcFlags" || {
echo "Error: Building kernel libsupc++ failed." >&2 echo "Error: Building kernel libsupc++ failed." >&2