aboutsummaryrefslogtreecommitdiffstats
path: root/build-gcc.sh
diff options
context:
space:
mode:
authorCaroline Tice <cmtice@google.com>2017-01-28 19:06:17 (GMT)
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 00:47:43 (GMT)
commit8b066eb1d1aafb559890836e254ebf1ebd7de9a5 (patch)
tree462d4f570ef836cf0f5e8f7e9a853de3b4c3ad25 /build-gcc.sh
parent4bd43c54babe00722e71026a039cdd238fa420f3 (diff)
downloadtoolchain_gcc-8b066eb1d1aafb559890836e254ebf1ebd7de9a5.zip
toolchain_gcc-8b066eb1d1aafb559890836e254ebf1ebd7de9a5.tar.gz
toolchain_gcc-8b066eb1d1aafb559890836e254ebf1ebd7de9a5.tar.bz2
Fix GCC bug PR 46639, for kernel security
The kernel security team asked us to fix this bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46639 This CL does that. Note: This CL depends on https://android-review.googlesource.com/329799 Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46639 Test: Ran build.py for all toolchain versions; used resulting compilers to build bullhead, angler and fugu plaform images. Ran checkbuild.py. Change-Id: I1e1abf594cff56c6ed6dc228a1d084da18c11420
Diffstat (limited to 'build-gcc.sh')
-rwxr-xr-xbuild-gcc.sh11
1 files changed, 10 insertions, 1 deletions
diff --git a/build-gcc.sh b/build-gcc.sh
index 24bb0bf..cc216b8 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -386,6 +386,14 @@ else
INCLUDE_VERSION=$GCC_VERSION
fi
+
+MULTILIB_FLAG=""
+if [[ ${ABI_CONFIGURE_TARGET} == "mips64el-linux-android" ]] ; then
+ MULTILIB_FLAG="--disable-multilib"
+elif [[ ${ABI_CONFIGURE_TARGET} == "mipsel-linux-android" ]] ; then
+ MULTILIB_FLAG="--disable-multilib"
+fi
+
cd $BUILD_OUT && run \
$BUILD_SRCDIR/configure --target=$ABI_CONFIGURE_TARGET \
--enable-bionic-libs \
@@ -407,7 +415,8 @@ $BUILD_SRCDIR/configure --target=$ABI_CONFIGURE_TARGET \
--enable-languages=$ENABLE_LANGUAGES \
$EXTRA_CONFIG_FLAGS \
$ABI_CONFIGURE_EXTRA_FLAGS \
- --disable-multilib
+ $MULTILIB_FLAG
+
if [ $? != 0 ] ; then
dump "Error while trying to configure toolchain build. See $TMPLOG"
exit 1