darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* emultempl/armelf.em: Watch EMULATION_LIBPATH instead of

Browse source 
DEFAULT_EMULATION.
        * emultempl/elf32.em: Likewise.
        * emultempl/sunos.em: Likewise.
This commit is contained in:
Richard Henderson 1999-06-20 14:12:08 +00:00
parent f800e11d88
commit f97f730029
4 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ld/ChangeLog
View file

@ -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> Fri Jun 18 15:24:48 1999 Richard Henderson <rth@cygnus.com>
* Makefile.am (GENSCRIPTS): Pass EMULATION_LIBPATH, not EMUL. * Makefile.am (GENSCRIPTS): Pass EMULATION_LIBPATH, not EMUL.

18
ld/emultempl/armelf.em
View file

@ -193,7 +193,8 @@ gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
EOF EOF
if [ "x${host}" = "x${target}" ] ; then 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 cat >>e${EMULATION_NAME}.c <<EOF
/* For a native linker, check the file /etc/ld.so.conf for directories /* 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 EOF
fi ;;
esac
fi fi
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
@ -368,13 +370,15 @@ gld${EMULATION_NAME}_after_open ()
} }
EOF EOF
if [ "x${host}" = "x${target}" ] ; then 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 cat >>e${EMULATION_NAME}.c <<EOF
lib_path = (const char *) getenv ("LD_LIBRARY_PATH"); lib_path = (const char *) getenv ("LD_LIBRARY_PATH");
if (gld${EMULATION_NAME}_search_needed (lib_path, l->name, force)) if (gld${EMULATION_NAME}_search_needed (lib_path, l->name, force))
break; break;
EOF EOF
fi ;;
esac
fi fi
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
len = strlen (l->name); len = strlen (l->name);
@ -394,12 +398,14 @@ cat >>e${EMULATION_NAME}.c <<EOF
break; break;
EOF EOF
if [ "x${host}" = "x${target}" ] ; then 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 cat >>e${EMULATION_NAME}.c <<EOF
if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force)) if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
break; break;
EOF EOF
fi ;;
esac
fi fi
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
} }

18
ld/emultempl/elf32.em
View file

@ -139,7 +139,8 @@ gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
EOF EOF
if [ "x${host}" = "x${target}" ] ; then 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 cat >>e${EMULATION_NAME}.c <<EOF
/* For a native linker, check the file /etc/ld.so.conf for directories /* 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 EOF
fi ;;
esac
fi fi
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
@ -309,13 +311,15 @@ gld${EMULATION_NAME}_after_open ()
} }
EOF EOF
if [ "x${host}" = "x${target}" ] ; then 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 cat >>e${EMULATION_NAME}.c <<EOF
lib_path = (const char *) getenv ("LD_LIBRARY_PATH"); lib_path = (const char *) getenv ("LD_LIBRARY_PATH");
if (gld${EMULATION_NAME}_search_needed (lib_path, l->name, force)) if (gld${EMULATION_NAME}_search_needed (lib_path, l->name, force))
break; break;
EOF EOF
fi ;;
esac
fi fi
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
len = strlen (l->name); len = strlen (l->name);
@ -335,12 +339,14 @@ cat >>e${EMULATION_NAME}.c <<EOF
break; break;
EOF EOF
if [ "x${host}" = "x${target}" ] ; then 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 cat >>e${EMULATION_NAME}.c <<EOF
if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force)) if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
break; break;
EOF EOF
fi ;;
esac
fi fi
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
} }

12
ld/emultempl/sunos.em
View file

@ -100,7 +100,8 @@ gld${EMULATION_NAME}_set_symbols ()
{ {
EOF EOF
if [ "x${host}" = "x${target}" ] ; then 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 cat >>e${EMULATION_NAME}.c <<EOF
const char *env; const char *env;
@ -125,7 +126,8 @@ cat >>e${EMULATION_NAME}.c <<EOF
} }
} }
EOF EOF
fi ;;
esac
fi fi
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
} }
@ -464,7 +466,8 @@ gld${EMULATION_NAME}_after_open ()
} }
EOF EOF
if [ "x${host}" = "x${target}" ] ; then 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 cat >>e${EMULATION_NAME}.c <<EOF
{ {
const char *lib_path; const char *lib_path;
@ -474,7 +477,8 @@ cat >>e${EMULATION_NAME}.c <<EOF
continue; continue;
} }
EOF EOF
fi ;;
esac
fi fi
cat >>e${EMULATION_NAME}.c <<EOF cat >>e${EMULATION_NAME}.c <<EOF
if (command_line.rpath != NULL) if (command_line.rpath != NULL)