diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2000-08-25 20:24:11 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2000-08-25 20:24:11 +0000 |
| commit | dcb0bd0eef10207754cb0fa64af3f2b965a1a589 (patch) | |
| tree | f4780681dec6f11c9b1d6dd49546f53ee75f8230 | |
| parent | 1e8d20f4cc9ca76341801e68c7759805e370c18a (diff) | |
| download | fsf-binutils-gdb-dcb0bd0eef10207754cb0fa64af3f2b965a1a589.zip fsf-binutils-gdb-dcb0bd0eef10207754cb0fa64af3f2b965a1a589.tar.gz fsf-binutils-gdb-dcb0bd0eef10207754cb0fa64af3f2b965a1a589.tar.bz2 | |
2000-08-24 H.J. Lu <hjl@gnu.org>
* emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Don't
check -rpath nor LD_RUN_PATH for cross link.
* ld.texinfo: Document the change.
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/emultempl/elf32.em | 12 | ||||
| -rw-r--r-- | ld/ld.texinfo | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 1a95b68..89e1c34 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2000-08-25 H.J. Lu <hjl@gnu.org> + + * emultempl/elf32.em (gld${EMULATION_NAME}_after_open): Don't + check -rpath nor LD_RUN_PATH for cross link. + * ld.texinfo: Document the change. + 2000-08-24 Hans-Peter Nilsson <hp@axis.com> * NEWS: Mention support for CRIS. diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 9698e9f..b6e9856 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -620,7 +620,6 @@ gld${EMULATION_NAME}_after_open () their use. See gld${EMULATION_NAME}_vercheck comment. */ for (force = 0; force < 2; force++) { - const char *lib_path; size_t len; search_dirs_type *search; EOF @@ -628,6 +627,7 @@ if [ "x${host}" = "x${target}" ] ; then case " ${EMULATION_LIBPATH} " in *" ${EMULATION_NAME} "*) cat >>e${EMULATION_NAME}.c <<EOF + const char *lib_path; struct bfd_link_needed_list *rp; int found; EOF @@ -639,6 +639,11 @@ cat >>e${EMULATION_NAME}.c <<EOF if (gld${EMULATION_NAME}_search_needed (command_line.rpath_link, l->name, force)) break; +EOF +if [ "x${host}" = "x${target}" ] ; then + case " ${EMULATION_LIBPATH} " in + *" ${EMULATION_NAME} "*) +cat >>e${EMULATION_NAME}.c <<EOF if (gld${EMULATION_NAME}_search_needed (command_line.rpath, l->name, force)) break; @@ -650,11 +655,6 @@ cat >>e${EMULATION_NAME}.c <<EOF force)) break; } -EOF -if [ "x${host}" = "x${target}" ] ; then - case " ${EMULATION_LIBPATH} " in - *" ${EMULATION_NAME} "*) -cat >>e${EMULATION_NAME}.c <<EOF lib_path = (const char *) getenv ("LD_LIBRARY_PATH"); if (gld${EMULATION_NAME}_search_needed (lib_path, l->name, force)) break; diff --git a/ld/ld.texinfo b/ld/ld.texinfo index e3ecaa4..5f8e054 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -1089,11 +1089,11 @@ Any directories specified by @code{-rpath} options. The difference between @code{-rpath} and @code{-rpath-link} is that directories specified by @code{-rpath} options are included in the executable and used at runtime, whereas the @code{-rpath-link} option is only effective -at link time. +at link time. It is for the native linker only. @item On an ELF system, if the @code{-rpath} and @code{rpath-link} options were not used, search the contents of the environment variable -@code{LD_RUN_PATH}. +@code{LD_RUN_PATH}. It is for the native linker only. @item On SunOS, if the @code{-rpath} option was not used, search any directories specified using @code{-L} options. |