diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2413f5b7ae..f7df81645e 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+Wed Aug 24 12:52:30 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* configure.in: Change i[34]86 to i[345]86.
+
+Sun Aug 21 16:17:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* emulparams/hp3hpux.sh: Define __DYNAMIC to be 0.
+
 Thu Aug 18 15:37:45 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 
 	Make the ELF linker handle orphaned sections reasonably.  Also,
diff --git a/ld/configure.in b/ld/configure.in
index 7c325400a7..71dc89e7d4 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -55,28 +55,29 @@ case "${targ}" in
   i960-wrs-vxworks5.0*) ld_target=i960 ;;
   i960-wrs-vxworks5*)   ld_target=i960coff ;;
   i960-wrs-vxworks*)    ld_target=i960 ;;
+  i960-*-coff)		ld_target=i960coff ;;
   i960-intel-nindy)	ld_target=i960 ;;
   m68*-sun-sunos[34]*)	ld_target=sun3 ;;
   m68*-wrs-vxworks*)    ld_target=vxworks68 ;;
   m68*-ericsson-ose)	ld_target=ose68 ;;
   *-tandem-none)	ld_target=st2000 ;; # FIXME needs better name
-  i[34]86-*-vsta)	ld_target=vsta ;;
-  i[34]86-*-go32)	ld_target=i386-go32 ;;
-  i[34]86-*-aix*)	ld_target=i386-coff ;;
-  i[34]86-*-sco*)	ld_target=i386-coff ;;
-  i[34]86-*-lynxos*)	ld_target=i386-lynx ;;
-  i[34]86-*-coff)	ld_target=i386-coff ;;
-  i[34]86-*-bsd)	ld_target=i386-bsd ;;
-  i[34]86-*-bsd386)	ld_target=i386-bsd ;;
-  i[34]86-*-aout)	ld_target=i386-aout ;;
-  i[34]86-*-linux)	ld_target=i386-linux ;;
-  i[34]86-*-sysv4*)	ld_target=i386-elf ;;
-  i[34]86-*-unixware)	ld_target=i386-elf ;;
-  i[34]86-*-netware)	ld_target=i386-elf ;;
-  i[34]86-*-elf*)	ld_target=i386-elf ;;
-  i[34]86-*-sysv*)	ld_target=i386-coff ;;
-  i[34]86-*-mach*)	ld_target=i386-mach ;;
-  i[34]86-*-gnu*)	ld_target=i386-mach ;;
+  i[345]86-*-vsta)	ld_target=vsta ;;
+  i[345]86-*-go32)	ld_target=i386-go32 ;;
+  i[345]86-*-aix*)	ld_target=i386-coff ;;
+  i[345]86-*-sco*)	ld_target=i386-coff ;;
+  i[345]86-*-lynxos*)	ld_target=i386-lynx ;;
+  i[345]86-*-coff)	ld_target=i386-coff ;;
+  i[345]86-*-bsd)	ld_target=i386-bsd ;;
+  i[345]86-*-bsd386)	ld_target=i386-bsd ;;
+  i[345]86-*-aout)	ld_target=i386-aout ;;
+  i[345]86-*-linux)	ld_target=i386-linux ;;
+  i[345]86-*-sysv4*)	ld_target=i386-elf ;;
+  i[345]86-*-unixware)	ld_target=i386-elf ;;
+  i[345]86-*-netware)	ld_target=i386-elf ;;
+  i[345]86-*-elf*)	ld_target=i386-elf ;;
+  i[345]86-*-sysv*)	ld_target=i386-coff ;;
+  i[345]86-*-mach*)	ld_target=i386-mach ;;
+  i[345]86-*-gnu*)	ld_target=i386-mach ;;
   m8*-*-*)		ld_target=m88k-bcs ;;
   a29k-*-udi)		ld_target=sa29200 ;;
   a29k-*-ebmon)		ld_target=ebmon29k ;;