diff options
| author | Caroline Tice <cmtice@google.com> | 2017-01-28 11:06:17 -0800 |
|---|---|---|
| committer | Caroline Tice <cmtice@google.com> | 2017-01-29 20:50:54 -0800 |
| commit | 32c89c19b042a12b5a1bf0153299154ea5435c03 (patch) | |
| tree | 63f7c3583b755ddfe5fd77bfa5f448db385fa4e5 /build-gcc.sh | |
| parent | c82a2517402214b5c2fd9dd32554f568c60b1eeb (diff) | |
| download | toolchain_gcc-32c89c19b042a12b5a1bf0153299154ea5435c03.tar.gz toolchain_gcc-32c89c19b042a12b5a1bf0153299154ea5435c03.tar.bz2 toolchain_gcc-32c89c19b042a12b5a1bf0153299154ea5435c03.zip | |
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-x | build-gcc.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/build-gcc.sh b/build-gcc.sh index 24bb0bf90..cc216b88a 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 |