diff options
| author | Richard Henderson <rth@redhat.com> | 1999-06-20 14:12:08 +0000 |
|---|---|---|
| committer | Richard Henderson <rth@redhat.com> | 1999-06-20 14:12:08 +0000 |
| commit | f97f73002970e20650a4f9ccf635be632b9555de (patch) | |
| tree | 6047044f794ff82c5d379a1609b3d6056964b0af /ld | |
| parent | f800e11d880713fc418a5ee6837b942d8632b5a0 (diff) | |
| download | gdb-f97f73002970e20650a4f9ccf635be632b9555de.zip gdb-f97f73002970e20650a4f9ccf635be632b9555de.tar.gz gdb-f97f73002970e20650a4f9ccf635be632b9555de.tar.bz2 | |
* emultempl/armelf.em: Watch EMULATION_LIBPATH instead of
DEFAULT_EMULATION.
* emultempl/elf32.em: Likewise.
* emultempl/sunos.em: Likewise.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/emultempl/armelf.em | 18 | ||||
| -rw-r--r-- | ld/emultempl/elf32.em | 18 | ||||
| -rw-r--r-- | ld/emultempl/sunos.em | 12 |
4 files changed, 39 insertions, 16 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 7539942..734397a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +Sun Jun 20 14:10:33 1999 Richard Henderson <rth@cygnus.com> + + * emultempl/armelf.em: Watch EMULATION_LIBPATH instead of + DEFAULT_EMULATION. + * emultempl/elf32.em: Likewise. + * emultempl/sunos.em: Likewise. + Fri Jun 18 15:24:48 1999 Richard Henderson <rth@cygnus.com> * Makefile.am (GENSCRIPTS): Pass EMULATION_LIBPATH, not EMUL. diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 6512ee3..ee6aa76 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -193,7 +193,8 @@ gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry) EOF if [ "x${host}" = "x${target}" ] ; then - if [ "x${DEFAULT_EMULATION}" = "x${EMULATION_NAME}" ] ; then + case " ${EMULATION_LIBPATH} " in + *" ${EMULATION_NAME} "*) cat >>e${EMULATION_NAME}.c <<EOF /* For a native linker, check the file /etc/ld.so.conf for directories @@ -278,7 +279,8 @@ gld${EMULATION_NAME}_check_ld_so_conf (name, force) } EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <<EOF @@ -368,13 +370,15 @@ gld${EMULATION_NAME}_after_open () } EOF if [ "x${host}" = "x${target}" ] ; then - if [ "x${DEFAULT_EMULATION}" = "x${EMULATION_NAME}" ] ; 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; EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <<EOF len = strlen (l->name); @@ -394,12 +398,14 @@ cat >>e${EMULATION_NAME}.c <<EOF break; EOF if [ "x${host}" = "x${target}" ] ; then - if [ "x${DEFAULT_EMULATION}" = "x${EMULATION_NAME}" ] ; then + case " ${EMULATION_LIBPATH} " in + *" ${EMULATION_NAME} "*) cat >>e${EMULATION_NAME}.c <<EOF if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force)) break; EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <<EOF } diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index 0358676..41073d2 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -139,7 +139,8 @@ gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry) EOF if [ "x${host}" = "x${target}" ] ; then - if [ "x${DEFAULT_EMULATION}" = "x${EMULATION_NAME}" ] ; then + case " ${EMULATION_LIBPATH} " in + *" ${EMULATION_NAME} "*) cat >>e${EMULATION_NAME}.c <<EOF /* For a native linker, check the file /etc/ld.so.conf for directories @@ -224,7 +225,8 @@ gld${EMULATION_NAME}_check_ld_so_conf (name, force) } EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <<EOF @@ -309,13 +311,15 @@ gld${EMULATION_NAME}_after_open () } EOF if [ "x${host}" = "x${target}" ] ; then - if [ "x${DEFAULT_EMULATION}" = "x${EMULATION_NAME}" ] ; 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; EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <<EOF len = strlen (l->name); @@ -335,12 +339,14 @@ cat >>e${EMULATION_NAME}.c <<EOF break; EOF if [ "x${host}" = "x${target}" ] ; then - if [ "x${DEFAULT_EMULATION}" = "x${EMULATION_NAME}" ] ; then + case " ${EMULATION_LIBPATH} " in + *" ${EMULATION_NAME} "*) cat >>e${EMULATION_NAME}.c <<EOF if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force)) break; EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <<EOF } diff --git a/ld/emultempl/sunos.em b/ld/emultempl/sunos.em index 8e9599c..61a5c01 100644 --- a/ld/emultempl/sunos.em +++ b/ld/emultempl/sunos.em @@ -100,7 +100,8 @@ gld${EMULATION_NAME}_set_symbols () { EOF if [ "x${host}" = "x${target}" ] ; then - if [ "x${DEFAULT_EMULATION}" = "x${EMULATION_NAME}" ] ; then + case " ${EMULATION_LIBPATH} " in + *" ${EMULATION_NAME} "*) cat >>e${EMULATION_NAME}.c <<EOF const char *env; @@ -125,7 +126,8 @@ cat >>e${EMULATION_NAME}.c <<EOF } } EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <<EOF } @@ -464,7 +466,8 @@ gld${EMULATION_NAME}_after_open () } EOF if [ "x${host}" = "x${target}" ] ; then - if [ "x${DEFAULT_EMULATION}" = "x${EMULATION_NAME}" ] ; then + case " ${EMULATION_LIBPATH} " in + *" ${EMULATION_NAME} "*) cat >>e${EMULATION_NAME}.c <<EOF { const char *lib_path; @@ -474,7 +477,8 @@ cat >>e${EMULATION_NAME}.c <<EOF continue; } EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <<EOF if (command_line.rpath != NULL) |