From 8b066eb1d1aafb559890836e254ebf1ebd7de9a5 Mon Sep 17 00:00:00 2001
From: Caroline Tice <cmtice@google.com>
Date: Sat, 28 Jan 2017 11:06:17 -0800
Subject: 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
---
 build-gcc.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'build-gcc.sh')

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
-- 
cgit v1.1