aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-08-07 22:20:32 +0159
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2011-08-07 22:20:32 +0159
commit1a137aa85ad4c16fefd9ad9aee2fa5ca44292682 (patch)
tree1e47dff8fbdbff63d7cc636044f944bcb03864f9
parenta064001dcc46fe4b4c29b9b3dd93cb9894319e37 (diff)
downloadbuild-1a137aa85ad4c16fefd9ad9aee2fa5ca44292682.tar.gz
Fixes for building Android thread support
-rw-r--r--Makefile.in8
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 9565667..866dc73 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -403,6 +403,14 @@ GCC_CONFIG_ARGS += $(GCC_CONFIG_LIBSTDCXX_V3) --disable-libssp \
--disable-libstdc__-v3 --disable-sjlj-exceptions --disable-shared \
--disable-tls
CFLAGS_FOR_TARGET += -DTARGET_POSIX_IO -fno-short-enums
+# We need to find pthread.h to build libgcc with threading support.
+# Fortunately bionic pretty much relies on static headers, so we can skip
+# the step of building a bootstrap compiler and using that to build
+# bionic.
+# -include .../sys/limits.h is a workaround for Bionic's ptherad.h requiring
+# LONG_BIT, which usually comes in through limits.h -- but gcc has its own
+# version of that which fails to include sys/limits.h
+CFLAGS_FOR_TARGET += -isystem $(abs_srcdir)/../bionic/libc/include -isystem $(abs_srcdir)/../bionic/libc/kernel/common -isystem $(abs_srcdir)/../bionic/libc/kernel/arch-$(target_cpu) -isystem $(abs_srcdir)/../bionic/libc/arch-$(target_cpu)/include -include $(abs_srcdir)/../bionic/libc/include/sys/limits.h
# ARM specific options.
ifeq ($(target_cpu),arm)
GCC_CONFIG_ARGS += --with-float=soft --with-fpu=vfp --with-arch=armv5te \