diff options
| author | Elliott Hughes <enh@google.com> | 2015-07-29 17:39:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-29 17:39:29 +0000 |
| commit | 2a6be47f38e074f4e261b21191e2379050ec05ab (patch) | |
| tree | 4d7ea7dc707d18fcd8b0009c3ff6d94d75458e12 | |
| parent | 5ae0308a147ec3f6502fd321860524e634a647a6 (diff) | |
| parent | 7ed2aac0832375e28ced74b5e62959bce0b0bc88 (diff) | |
| download | toolchain_gcc-2a6be47f38e074f4e261b21191e2379050ec05ab.tar.gz toolchain_gcc-2a6be47f38e074f4e261b21191e2379050ec05ab.tar.bz2 toolchain_gcc-2a6be47f38e074f4e261b21191e2379050ec05ab.zip | |
Merge "Stop generating R_*_COPY relocations: Android dynamic loader does not support them."
| -rwxr-xr-x | gcc-4.9/gcc/configure | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc-4.9/gcc/configure b/gcc-4.9/gcc/configure index cb1d3004f..746c37556 100755 --- a/gcc-4.9/gcc/configure +++ b/gcc-4.9/gcc/configure @@ -27019,6 +27019,8 @@ if test $gcc_cv_ld_pie = yes ; then elif test x$gcc_cv_as != x -a x$gcc_cv_ld != x ; then # Check if linker supports -pie option with copy reloc case "$target" in + *android*) + ;; i?86-*-linux* | x86_64-*-linux*) cat > conftest1.s <<EOF .globl a_glob |