aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2013-08-07 21:11:42 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-08-07 21:11:43 +0000
commitd5da71a438ffedf9ee77e1823801e0d50bd230ab (patch)
treed1fe4fe2c3fe96de5e311b50310880c31020188a
parent5785a231d03ad973fc3477ab45d8e1019aec1074 (diff)
parent8885fc003a915b15c158a0ff21f6319eee3c3de4 (diff)
downloadndk-d5da71a438ffedf9ee77e1823801e0d50bd230ab.tar.gz
Merge "Build GCC which always enable --eh-frame-hdr"
-rwxr-xr-xbuild/tools/build-gcc.sh3
-rwxr-xr-xbuild/tools/build-host-gcc.sh1
2 files changed, 4 insertions, 0 deletions
diff --git a/build/tools/build-gcc.sh b/build/tools/build-gcc.sh
index 2611e11d1..d6c2ad560 100755
--- a/build/tools/build-gcc.sh
+++ b/build/tools/build-gcc.sh
@@ -338,6 +338,9 @@ case "$TOOLCHAIN" in
;;
esac
+# Enable linker option -eh-frame-hdr also for static executable
+EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-eh-frame-hdr-for-static"
+
cd $BUILD_OUT && run \
$BUILD_SRCDIR/configure --target=$ABI_CONFIGURE_TARGET \
--enable-initfini-array \
diff --git a/build/tools/build-host-gcc.sh b/build/tools/build-host-gcc.sh
index 30b56a4b6..5d1827993 100755
--- a/build/tools/build-host-gcc.sh
+++ b/build/tools/build-host-gcc.sh
@@ -1398,6 +1398,7 @@ build_host_gcc_core ()
ARGS=$ARGS" --disable-nls"
ARGS=$ARGS" --disable-werror"
ARGS=$ARGS" --enable-target-optspace"
+ ARGS=$ARGS" --enable-eh-frame-hdr-for-static"
# TODO: Build fails for libsanitizer which appears in 4.8. Disable for now.
ARGS=$ARGS" --disable-libsanitizer"