diff options
| author | Maxim Kuvyrkov <maxim@codesourcery.com> | 2012-11-16 04:00:40 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim@codesourcery.com> | 2012-11-16 04:00:40 +0000 |
| commit | 95f62b081b5f49f8e816062495cbfb75910fe504 (patch) | |
| tree | f2989ae739f1d5ba28f33b690ffa0787bbd9e94b | |
| parent | cc2dcd6c95f0d19ab2a084c406c43390507681fa (diff) | |
| download | binutils-95f62b081b5f49f8e816062495cbfb75910fe504.tar.gz | |
Port lib32 arangement from Debian.
* emulparams/elf_i386.sh: Include lib32 directories in library search
path.
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/emulparams/elf_i386.sh | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 2b0a3e41e..fa4b9d073 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2012-11-15 Maxim Kuvyrkov <maxim@codesourcery.com> + + Port lib32 arangement from Debian. + * emulparams/elf_i386.sh: Include lib32 directories in library search + path. + 2012-11-15 Simon Baldwin <simonb@google.com> * ldmain.c (main): Add start_sbrk set to sbrk(0) on entry. diff --git a/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh index 665a1ad36..add700ff5 100644 --- a/ld/emulparams/elf_i386.sh +++ b/ld/emulparams/elf_i386.sh @@ -13,3 +13,13 @@ GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 12 ? 12 : 0" IREL_IN_PLT= + +# Linux modify the default library search path to first include +# a 32-bit specific directory. +case "$target" in + x86_64*-linux* | i[3-7]86*-linux*) + case "$EMULATION_NAME" in + *i386*) LIBPATH_SUFFIX=32 ;; + esac + ;; +esac |