aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaroline Tice <cmtice@google.com>2017-01-28 11:02:11 -0800
committerCaroline Tice <cmtice@google.com>2017-01-28 11:15:42 -0800
commit58be6006bb71abb97d7cdff7be3e73d55bbc22b8 (patch)
tree4c1aa463459939ac6fa45c510ffe58adf2345d9a
parentf280657461aee54b6d2807881d8a77832f4e794c (diff)
downloadbuild-ndk-r15-release.tar.gz
It turns out that x86 & x86_64 need to be built with multilib (at least to make fugu happy). But they can't build with -mx32. Removing -mx32 allows x86 & x86_64 to build happily with multilib. Note: This CL depends on the changes to build-gcc.sh in https://android-review.googlesource.com/329549 Bug: None Test: Tested with toolchain/gcc/build.py & using the resulting prebuilts to build angler, bullhead and fugu platforms. Change-Id: If70a7b753913faa5ef271534a743a244b008c706
-rw-r--r--Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 21f33d7..c7f1a4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -468,7 +468,7 @@ endif
ifeq ($(target_cpu),x86_64)
GCC_CONFIG_ARGS += --with-arch=x86-64 --with-tune=intel --with-fpmath=sse \
- --with-multilib-list=m32,m64,mx32
+ --with-multilib-list=m32,m64
endif
# ARM specific options.