diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-18 01:25:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-18 01:25:37 +0000 |
| commit | e90dcf26a383753557eced2a3323c2397627e595 (patch) | |
| tree | 72839b2ee9682c2df5fcadf7dc2a009efc021e6c | |
| parent | d5e086a3c56c6ed7db946cb0bea09e4404d9749c (diff) | |
| parent | 6706e57f51bf3a953d26071ef98a93cd2173d0a2 (diff) | |
| download | toolchain_gcc-e90dcf26a383753557eced2a3323c2397627e595.tar.gz toolchain_gcc-e90dcf26a383753557eced2a3323c2397627e595.tar.bz2 toolchain_gcc-e90dcf26a383753557eced2a3323c2397627e595.zip | |
Merge "Fix GCC4.4.3/4.6/4.7 to supress -export-dynamic for statically linked programs"
| -rw-r--r-- | gcc-4.4.3/gcc/config/arm/linux-elf.h | 5 | ||||
| -rw-r--r-- | gcc-4.6/gcc/config/arm/linux-elf.h | 5 | ||||
| -rw-r--r-- | gcc-4.7/gcc/config/arm/linux-elf.h | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/gcc-4.4.3/gcc/config/arm/linux-elf.h b/gcc-4.4.3/gcc/config/arm/linux-elf.h index 07455ee87..97e90618c 100644 --- a/gcc-4.4.3/gcc/config/arm/linux-elf.h +++ b/gcc-4.4.3/gcc/config/arm/linux-elf.h @@ -69,8 +69,9 @@ %{static:-Bstatic} \ %{shared:-shared} \ %{symbolic:-Bsymbolic} \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + %{!static: \ + %{rdynamic:-export-dynamic} \ + %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ -X \ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ SUBTARGET_EXTRA_LINK_SPEC diff --git a/gcc-4.6/gcc/config/arm/linux-elf.h b/gcc-4.6/gcc/config/arm/linux-elf.h index e74a02e3e..587e2849b 100644 --- a/gcc-4.6/gcc/config/arm/linux-elf.h +++ b/gcc-4.6/gcc/config/arm/linux-elf.h @@ -68,8 +68,9 @@ %{static:-Bstatic} \ %{shared:-shared} \ %{symbolic:-Bsymbolic} \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER " \ + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ -X \ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ SUBTARGET_EXTRA_LINK_SPEC diff --git a/gcc-4.7/gcc/config/arm/linux-elf.h b/gcc-4.7/gcc/config/arm/linux-elf.h index 270e12bc5..0082d5682 100644 --- a/gcc-4.7/gcc/config/arm/linux-elf.h +++ b/gcc-4.7/gcc/config/arm/linux-elf.h @@ -65,8 +65,9 @@ %{static:-Bstatic} \ %{shared:-shared} \ %{symbolic:-Bsymbolic} \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " GNU_USER_DYNAMIC_LINKER " \ + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \ -X \ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ SUBTARGET_EXTRA_LINK_SPEC |