From e0650f25c3c86e40fdb02a05714b73560d2b2328 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 20 Jul 2014 20:32:34 +0200 Subject: [PATCH] Build libsupc++-kernel without TLS --- build/scripts/build_cross_tools_gcc4 | 5 +++++ src/system/runtime_loader/Jamfile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4 index 20fdf38c00..162359599d 100755 --- a/build/scripts/build_cross_tools_gcc4 +++ b/build/scripts/build_cross_tools_gcc4 @@ -252,8 +252,13 @@ if [ -n "$kernelCcFlags" ]; then [ -f "$haikuMachine/32/libstdc++-v3/config.h" ] \ && sed -i '/.*_GLIBCXX_HAS_GTHREADS.*/c\#undef _GLIBCXX_HAS_GTHREADS' \ "$haikuMachine/32/libstdc++-v3/config.h" + [ -f "$haikuMachine/32/libstdc++-v3/include/$haikuMachine/bits/c++config.h" ] \ + && sed -i '/.*_GLIBCXX_HAS_TLS.*/c\#undef _GLIBCXX_HAS_TLS' \ + "$haikuMachine/32/libstdc++-v3/include/$haikuMachine/bits/c++config.h" sed -i '/.*_GLIBCXX_HAS_GTHREADS.*/c\#undef _GLIBCXX_HAS_GTHREADS' \ "$haikuMachine/libstdc++-v3/config.h" + sed -i '/.*_GLIBCXX_HAVE_TLS.*/c\#undef _GLIBCXX_HAVE_TLS' \ + "$haikuMachine/libstdc++-v3/include/$haikuMachine/bits/c++config.h" $MAKE -C "$haikuMachine/libstdc++-v3/libsupc++" CFLAGS="-g -O2 $kernelCcFlags" \ CXXFLAGS="-g -O2 $kernelCcFlags" || { echo "Error: Building kernel libsupc++ failed." >&2 diff --git a/src/system/runtime_loader/Jamfile b/src/system/runtime_loader/Jamfile index da25b1f0be..eee444b358 100644 --- a/src/system/runtime_loader/Jamfile +++ b/src/system/runtime_loader/Jamfile @@ -93,7 +93,7 @@ Ld runtime_loader : [ FGristFiles $(sources:S=$(SUFOBJ)) ] libruntime_loader.a libruntime_loader_$(TARGET_ARCH).a - $(HAIKU_STATIC_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) + $(HAIKU_KERNEL_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) $(HAIKU_GCC_LIBGCC_$(TARGET_PACKAGING_ARCH)) : $(HAIKU_TOP)/src/system/ldscripts/$(TARGET_ARCH)/runtime_loader.ld : --no-undefined -shared -soname=runtime_loader