diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-19 12:04:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-19 12:04:58 +0000 |
| commit | ede27b275d55a33fb8c20e5c5eff20187474af52 (patch) | |
| tree | 52057f579b484eed066cfe1633aae77075f91b44 | |
| parent | 28f1414b93999db591a445c6eb9f15eb17c5f410 (diff) | |
| parent | 5db5ac7764a633d1e9a4e45b03536128c32ebffe (diff) | |
| download | ndk-ede27b275d55a33fb8c20e5c5eff20187474af52.tar.gz | |
Merge "Enable indirect functions when building gcc."
| -rwxr-xr-x | build/tools/build-gcc.sh | 6 | ||||
| -rwxr-xr-x | build/tools/build-host-gcc.sh | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/build/tools/build-gcc.sh b/build/tools/build-gcc.sh index 47bb1090d..2e0041d64 100755 --- a/build/tools/build-gcc.sh +++ b/build/tools/build-gcc.sh @@ -312,6 +312,12 @@ case "$TOOLCHAIN" in *) EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-libgomp" ;; esac +# Enable indirect functions in the compilers that support it (4.6 and above) +case "$TOOLCHAIN" in + *-4.4.3) ;; + *) EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-gnu-indirect-function" ;; +esac + # Disable libcilkrts which needs C++ for now, because libstdlibc++ in NDK is built separately... case "$TOOLCHAIN" in x86*-4.9) EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --disable-libcilkrts" diff --git a/build/tools/build-host-gcc.sh b/build/tools/build-host-gcc.sh index f9ec1e3d7..9d0fd6af9 100755 --- a/build/tools/build-host-gcc.sh +++ b/build/tools/build-host-gcc.sh @@ -1328,7 +1328,7 @@ build_host_gcc_core () esac ARGS=$ARGS" --with-gnu-as --with-gnu-ld" - ARGS=$ARGS" --enable-threads --disable-libssp --disable-libmudflap" + ARGS=$ARGS" --enable-threads --disable-libssp --disable-libmudflap --disable-libcilkrts --enable-gnu-indirect-function" ARGS=$ARGS" --disable-libstdc__-v3 --disable-sjlj-exceptions" ARGS=$ARGS" --disable-tls" ARGS=$ARGS" --disable-libquadmath --disable-libitm --disable-bootstrap" |