aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-05-12 03:53:29 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-05-12 03:53:29 +0200
commitd2e47df90be24f5cdb72123508421ddffde43f61 (patch)
tree83f377dd8a6203eda20d428ea4eb7ec950140ab6
parent9b8c1fb4a3a2a9cac28ef1ce62e66b9ad9873c64 (diff)
downloadbuild-linaro-android-12.05-release.tar.gz
toolchain/build: Use --disable-libatomic for gcclinaro-android-12.05-release
libatomic can't currently be built for Android, breaking the gcc trunk (4.8) build process. Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 67ce550..b282328 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -466,7 +466,7 @@ ifeq ($(BUILD_ANDROID_GCC),yes)
GCC_CONFIG_ARGS += $(GCC_CONFIG_LIBSTDCXX_V3) --disable-libssp \
--disable-nls --disable-libmudflap \
--disable-shared --disable-sjlj-exceptions \
- --disable-libquadmath --disable-libitm
+ --disable-libquadmath --disable-libitm --disable-libatomic
CFLAGS_FOR_TARGET += -DTARGET_POSIX_IO -fno-short-enums
# We need to find pthread.h to build libgcc with threading support.
# -include .../sys/limits.h is a workaround for Bionic's ptherad.h requiring
@@ -597,7 +597,7 @@ stmp-config-bootstrap-gcc: config.status stmp-install-host-ppl stmp-build-target
export CFLAGS="-O2 -m32" ; \
export CXXFLAGS="-O2 -m32" ; \
$(call find-package-srcdir, $(GCC_VERSION))/configure \
- $(GCC_CONFIG_ARGS) --target=$$TARGET --enable-threads --enable-tls --disable-libgomp --disable-libstdc__-v3 --disable-libitm) && \
+ $(GCC_CONFIG_ARGS) --target=$$TARGET --enable-threads --enable-tls --disable-libgomp --disable-libstdc__-v3 --disable-libitm --disable-libatomic) && \
$(STAMP) $@
build-bootstrap-gcc: stmp-build-bootstrap-gcc
stmp-build-bootstrap-gcc: stmp-config-bootstrap-gcc
@@ -646,7 +646,7 @@ stmp-config-target-gcc: config.status stmp-patch-libgomp-for-android stmp-instal
export CFLAGS="-O2 -m32" ; \
export CXXFLAGS="-O2 -m32" ; \
$(call find-package-srcdir, $(GCC_VERSION))/configure \
- $(GCC_CONFIG_ARGS) --target=$$TARGET --enable-threads --enable-tls --enable-libgomp --disable-libitm --disable-libstdc__-v3) && \
+ $(GCC_CONFIG_ARGS) --target=$$TARGET --enable-threads --enable-tls --enable-libgomp --disable-libitm --disable-libatomic --disable-libstdc__-v3) && \
$(STAMP) $@
build-target-gcc: stmp-build-target-gcc
stmp-build-target-gcc: stmp-config-target-gcc
@@ -702,7 +702,7 @@ stmp-config-generic-target-gcc: config.status stmp-install-host-ppl stmp-build-t
export CFLAGS="-O2 -m32" ; \
export CXXFLAGS="-O2 -m32" ; \
$(call find-package-srcdir, $(GCC_VERSION))/configure \
- $(GCC_CONFIG_ARGS) --target=$$TARGET --enable-threads --enable-tls --disable-libgomp --disable-libstdc__-v3 --disable-libitm) && \
+ $(GCC_CONFIG_ARGS) --target=$$TARGET --enable-threads --enable-tls --disable-libgomp --disable-libstdc__-v3 --disable-libitm --disable-libatomic) && \
$(STAMP) $@
build-generic-target-gcc: stmp-build-generic-target-gcc
stmp-build-generic-target-gcc: stmp-config-generic-target-gcc