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.
This commit is contained in:
H.J. Lu 2000-08-25 20:24:11 +00:00
parent 1e8d20f4cc
commit dcb0bd0eef
3 changed files with 14 additions and 8 deletions

View File

@ -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.

View File

@ -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;

View File

@ -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.