* configure.tgt, configure.host: Change alpha-*-* to alpha*-*-*;

        config.guess now recognizes alphaev5 etc.

3 files changed, 24 insertions, 66 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1cd1fb5..944f96f 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+Wed Oct  8 12:37:05 1997  Richard Henderson  <rth@cygnus.com>
+
+	* configure.tgt, configure.host: Change alpha-*-* to alpha*-*-*;
+	config.guess now recognizes alphaev5 etc.
+
+Fri Oct  3 14:23:02 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* emultempl/aix.em (gld${EMULATION_NAME}_parse_args): Don't treat
+	-s and -u as -static and -unix.
+
 Thu Oct  2 18:40:28 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ldlang.c (wild_doit): Rewrite flag handling for clarity.  If we
diff --git a/ld/configure.host b/ld/configure.host
index 8c7f160..8f739f6 100644
--- a/ld/configure.host
+++ b/ld/configure.host
@@ -8,9 +8,6 @@
 #  HOSTING_CRT0		crt0.o file used for bootstrapping
 #  HOSTING_LIBS		libraries used for bootstrapping
 #  NATIVE_LIB_DIRS	library directories to search on this host
-#  HLDFLAGS		link flags to use on this host
-#  HLDENV		environment variable to set when linking for the host
-#  RPATH_ENVVAR		environment variable used to find shared libraries
 
 HDEFINES=
 HOSTING_CRT0=/lib/crt0.o
@@ -19,11 +16,11 @@ NATIVE_LIB_DIRS=
 
 case "${host}" in
 
-alpha-*-linux*)
-  HOSTING_CRT0=/usr/lib/crt0.o
+alpha*-*-linux*)
+  HOSTING_CRT0=/usr/lib/crt1.o
   ;;
 
-alpha-*-*)
+alpha*-*-*)
   HOSTING_CRT0=/usr/ccs/lib/crt0.o
   NATIVE_LIB_DIRS=/usr/ccs/lib
   ;;
@@ -157,52 +154,3 @@ sparc*-*-solaris2*)
   ;;
 
 esac
-
-HLDFLAGS=
-HLDENV=
-RPATH_ENVVAR=LD_LIBRARY_PATH
-# If we have shared libraries, try to set rpath reasonably.
-if test "${shared}" = "true"; then
-  case "${host}" in
-  *-*-hpux*)
-    HLDFLAGS='-Wl,+s,+b,$(libdir)'
-    RPATH_ENVVAR=SHLIB_PATH
-    ;;
-  *-*-irix[56]*)
-    HLDFLAGS='-Wl,-rpath,$(libdir)'
-    ;;
-  *-*-linux*aout*)
-    ;;
-  *-*-linux*)
-    HLDFLAGS='-Wl,-rpath,$(libdir)'
-    ;;
-  *-*-solaris*)
-    HLDFLAGS='-R $(libdir)'
-    ;;
-  *-*-sysv4*)
-    HLDENV='if test -z "$${LD_RUN_PATH}"; then LD_RUN_PATH=$(libdir); else LD_RUN_PATH=$${LD_RUN_PATH}:$(libdir); fi; export LD_RUN_PATH;'
-    ;;
-  esac
-fi
-
-# On SunOS, if the linker supports the -rpath option, use it to
-# prevent ../bfd and ../opcodes from being included in the run time
-# search path.
-case "${host}" in
-  *-*-sunos*)
-    echo 'main () { }' > conftest.c
-    ${CC} -o conftest -Wl,-rpath= conftest.c >/dev/null 2>conftest.t
-    if grep 'unrecognized' conftest.t >/dev/null 2>&1; then
-      :
-    elif grep 'No such file' conftest.t >/dev/null 2>&1; then
-      :
-    elif grep 'do not mix' conftest.t >/dev/null 2>&1; then
-      :
-    elif test "${shared}" = "true"; then
-      HLDFLAGS='-Wl,-rpath=$(libdir)'
-    else
-      HLDFLAGS='-Wl,-rpath='
-    fi
-    rm -f conftest.t conftest.c conftest
-    ;;
-esac
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 7850ce2..1df274c 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -104,7 +104,7 @@ h8300-*-hms)		targ_emul=h8300; targ_extra_emuls="h8300h h8300s"
 h8500-*-hms)		targ_emul=h8500
 			targ_extra_emuls="h8500s h8500b h8500m h8500c"
 			;;
-sh-*-elf*)		targ_emul=shelf
+sh-*-elf*|sh-*-rtems*)	targ_emul=shelf
 			targ_extra_emuls="shlelf sh shl"
 			;;
 sh-*-*)			targ_emul=sh; targ_extra_emuls=shl ;;
@@ -134,7 +134,7 @@ hppa*-*-rtems*)		targ_emul=hppaelf ;;
 vax-dec-ultrix* | vax-dec-bsd*) targ_emul=vax ;;
 mips*-dec-ultrix*)	targ_emul=mipslit ;;
 mips*-dec-osf*)		targ_emul=mipslit ;;
-mips*-sgi-irix[56]*)	targ_emul=elf32bmip ;;
+mips*-sgi-irix[56]*)	targ_emul=elf32bsmip ;;
 mips*-sgi-irix*)	targ_emul=mipsbig ;;
 mips*el-*-ecoff*)	targ_emul=mipsidtl ;;
 mips*-*-ecoff*)		targ_emul=mipsidt ;;
@@ -153,24 +153,24 @@ mips*r5900*-*-elf*)	targ_emul=elf32l4300 ;;
 mips*el-*-elf*)		targ_emul=elf32elmip ;;
 mips*-*-elf*)		targ_emul=elf32ebmip ;;
 mips*-*-rtems*)		targ_emul=elf32ebmip ;;
-mips*el-*-linux*)	targ_emul=elf32lmip
-			targ_extra_emuls="elf32bmip mipslit mipsbig"
+mips*el-*-linux*)	targ_emul=elf32lsmip
+			targ_extra_emuls="elf32bsmip mipslit mipsbig"
 			;;
-mips*-*-linux*)		targ_emul=elf32bmip
-			targ_extra_emuls="elf32lmip mipsbig mipslit"
+mips*-*-linux*)		targ_emul=elf32bsmip
+			targ_extra_emuls="elf32lsmip mipsbig mipslit"
 			;;
 mips*-*-lnews*)		targ_emul=mipslnews ;;
 mn10200-*-*)		targ_emul=mn10200 ;;
 mn10300-*-*)		targ_emul=mn10300 ;;
-alpha-*-linuxecoff*)	targ_emul=alpha targ_extra_emuls=elf64alpha
+alpha*-*-linuxecoff*)	targ_emul=alpha targ_extra_emuls=elf64alpha
 			tdir_elf64alpha=`echo ${targ_alias} | sed -e 's/ecoff//'`
 			;;
-alpha-*-linux*)		targ_emul=elf64alpha targ_extra_emuls=alpha
+alpha*-*-linux*)	targ_emul=elf64alpha targ_extra_emuls=alpha
 			tdir_alpha=`echo ${targ_alias} | sed -e 's/linux/linuxecoff/'`
 			;;
-alpha-*-osf*)		targ_emul=alpha ;;
-alpha-*-gnu*)		targ_emul=elf64alpha ;;
-alpha-*-netware*)	targ_emul=alpha ;;
+alpha*-*-osf*)		targ_emul=alpha ;;
+alpha*-*-gnu*)		targ_emul=elf64alpha ;;
+alpha*-*-netware*)	targ_emul=alpha ;;
 z8k-*-coff) 		targ_emul=z8002; targ_extra_emuls=z8001 ;;
 ns32k-pc532-mach* | ns32k-pc532-ux*)	targ_emul=pc532macha ;;
 ns32k-pc532-netbsd* | ns32k-pc532-lites*) targ_emul=ns32knbsd ;;