From f97f73002970e20650a4f9ccf635be632b9555de Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sun, 20 Jun 1999 14:12:08 +0000 Subject: [PATCH] * emultempl/armelf.em: Watch EMULATION_LIBPATH instead of DEFAULT_EMULATION. * emultempl/elf32.em: Likewise. * emultempl/sunos.em: Likewise. --- ld/ChangeLog | 7 +++++++ ld/emultempl/armelf.em | 18 ++++++++++++------ ld/emultempl/elf32.em | 18 ++++++++++++------ ld/emultempl/sunos.em | 12 ++++++++---- 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 7539942ea6..734397a887 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +Sun Jun 20 14:10:33 1999 Richard Henderson + + * 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 * Makefile.am (GENSCRIPTS): Pass EMULATION_LIBPATH, not EMUL. diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 6512ee38c4..ee6aa7697f 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 <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <name, force)) break; EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <name); @@ -394,12 +398,14 @@ cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <name, force)) break; EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <name, force)) break; EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <name); @@ -335,12 +339,14 @@ cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <name, force)) break; EOF - fi + ;; + esac fi cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <