* Makefile.in (*_FOR_TARGET, INSTALL_XFORM, install, uninstall): Rewrite

handling of program_transform_name.

* configure.in: Test for "unlink" and "delete", define USE_DELETE_FOR_UNLINK if
only the latter is found.  Not expected to be triggered on UNIX/POSIX systems.
* acconfig.h (USE_DELETE_FOR_UNLINK): Undef here, provide comments.

Update for autoconf 1.118:
* gdbinit.in: New file, created from old .gdbinit.
* .gdbinit: Deleted.
* aclocal.m4 (GAS_GDBINIT): Deleted.
* configure.in: Don't use it.  Instead, generate .gdbinit from gdbinit.in.
Don't substitute cpu_type, obj_format, emulation, atof.  Switched order of
AC_LINK_FILES arguments.  Use AC_PREREQ to ensure that older versions of
autoconf aren't used.
* Makefile.in: Added @configure_input@ line.
(configure): Deleted rule.

[regenerated conf.in, configure]

7 files changed, 287 insertions, 212 deletions

diff --git a/gas/.gdbinit b/gas/.gdbinit
deleted file mode 100644
index a8b88f4..0000000
--- a/gas/.gdbinit
+++ /dev/null
@@ -1,22 +0,0 @@
-break as_warn
-break as_bad
-break as_bad_where
-break as_fatal
-break as_perror
-break abort
-
-define pe
-call print_expr ($)
-end
-
-document pe
-Print $ as an expressionS, expanding parameters.
-end
-
-define ps
-call print_symbol_value ($)
-end
-
-document ps
-Print $ as a symbolS, including expression value.
-end
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 857db9b..afae00a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,25 @@
+Tue Sep 13 16:20:36 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* Makefile.in (*_FOR_TARGET, INSTALL_XFORM, install, uninstall):
+	Rewrite handling of program_transform_name.
+
+	* configure.in: Test for "unlink" and "delete", define
+	USE_DELETE_FOR_UNLINK if only the latter is found.  Not expected
+	to be triggered on UNIX/POSIX systems.
+	* acconfig.h (USE_DELETE_FOR_UNLINK): Undef here, provide
+	comments.
+
+	Update for autoconf 1.118:
+	* gdbinit.in: New file, created from old .gdbinit.
+	* .gdbinit: Deleted.
+	* aclocal.m4 (GAS_GDBINIT): Deleted.
+	* configure.in: Don't use it.  Instead, generate .gdbinit from
+	gdbinit.in.  Don't substitute cpu_type, obj_format, emulation,
+	atof.  Switched order of AC_LINK_FILES arguments.  Use AC_PREREQ
+	to ensure that older versions of autoconf aren't used.
+	* Makefile.in: Added @configure_input@ line.
+	(configure): Deleted rule.
+
 Tue Sep 13 12:08:20 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 
 	* config/obj-coff.c (fixup_segment): After handling the difference
diff --git a/gas/Makefile.in b/gas/Makefile.in
index c1aae96..94b4e24 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1,3 +1,4 @@
+## @configure_input@
 # Makefile for GNU Assembler
 #   Copyright (C) 1987-1992, 1993 Free Software Foundation, Inc.
 
@@ -59,7 +60,7 @@ SHELL = /bin/sh
 INSTALL = $${srcroot}/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
-INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
+INSTALL_XFORM = $(INSTALL) -t='-e "$(program_transform_name)"'
 INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
 
 AR = ar
@@ -82,10 +83,11 @@ CC_FOR_TARGET = ` \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CC); \
     else \
-      t='$(program_transform_name)'; echo gcc | sed $$t; \
+      echo gcc | sed '$(program_transform_name)'; \
     fi; \
   fi`
 
+NM=nm
 NM_FOR_TARGET = ` \
   if [ -f $${here}/../binutils/Makefile ] ; then \
     echo $${here}/../binutils/nm ; \
@@ -93,7 +95,7 @@ NM_FOR_TARGET = ` \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(NM); \
     else \
-       t='$(program_transform_name)'; echo nm | sed $$t ; \
+      echo nm | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -105,7 +107,7 @@ OBJDUMP_FOR_TARGET = ` \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(OBJDUMP); \
     else \
-       t='$(program_transform_name)'; echo objdump | sed $$t ; \
+      echo objdump | sed '$(program_transform_name)' ; \
     fi; \
   fi`
 
@@ -307,12 +309,6 @@ config.status: configure
 	  exit 1 ; \
 	fi
 
-configure: configure.in aclocal.m4 acconfig.h
-	(cd ${srcdir} && \
-	 autoheader configure.in > conf-in.h && \
-	 ../move-if-change conf-in.h conf.in)
-	(cd ${srcdir} && autoconf )
-
 config.h: config-stamp ; @true
 config-stamp: Makefile conf
 	-rm -f config.new config-stamp
@@ -461,7 +457,7 @@ install:
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
 	$(INSTALL_XFORM) as.new $(bindir)/as; \
 	$(INSTALL_XFORM1) $(srcdir)/doc/as.1 $(man1dir)/as.1; \
-	n=`t='$(program_transform_name)'; echo as | sed $$t`; \
+	n=`echo as | sed '$(program_transform_name)'`; \
 	if [ -d $(tooldir) ]; then \
 	  if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
 	  rm -f $(tooldir)/bin/as; \
@@ -470,7 +466,7 @@ install:
 	else true; fi
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
 	$(INSTALL_XFORM) gasp.new $(bindir)/gasp; \
-	n=`t='$(program_transform_name)'; echo gasp | sed $$t`; \
+	n=`echo gasp | sed '$(program_transform_name)' `; \
 	if [ -d $(tooldir) ]; then \
 	  if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
 	  rm -f $(tooldir)/bin/gasp; \
diff --git a/gas/acconfig.h b/gas/acconfig.h
index abae0b8..ea143b8 100644
--- a/gas/acconfig.h
+++ b/gas/acconfig.h
@@ -41,3 +41,8 @@
 
 /* Needed only for sparc configuration */
 #undef sparcv9
+
+/* VMS does not provide an "unlink" function, but "delete" is provided.
+   Autoconf will never set this (at least until we have an "autovms"),
+   but this provides a halfway reasonable machine-independent hook.  */
+#undef USE_DELETE_FOR_UNLINK
diff --git a/gas/conf.in b/gas/conf.in
index 07c9eb4..cdd97be 100644
--- a/gas/conf.in
+++ b/gas/conf.in
@@ -66,6 +66,11 @@
 /* Needed only for sparc configuration */
 #undef sparcv9
 
+/* VMS does not provide an "unlink" function, but "delete" is provided.
+   Autoconf will never set this (at least until we have an "autovms"),
+   but this provides a halfway reasonable machine-independent hook.  */
+#undef USE_DELETE_FOR_UNLINK
+
 /* Define if you have the <errno.h> header file.  */
 #undef HAVE_ERRNO_H
 
diff --git a/gas/configure b/gas/configure
index 25542f3..1aef432 100755
--- a/gas/configure
+++ b/gas/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 1.117 
+# Generated automatically using autoconf version 1.118 
 # Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
 #
 # This configure script is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 ac_help=
-ac_help="${ac_help}
+ac_help="$ac_help
     bfd-assembler	use BFD back end for writing object files"
 
 # Omit some internal or obsolete options to make the list less imposing.
@@ -218,7 +218,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 1.117"
+    echo "configure generated by autoconf version 1.118"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -350,9 +350,9 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: can not find sources in ${ac_confdir} or .." 1>&2; exit 1; }
+    { echo "configure: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
   else
-    { echo "configure: can not find sources in ${srcdir}" 1>&2; exit 1; }
+    { echo "configure: can not find sources in $srcdir" 1>&2; exit 1; }
   fi
 fi
 
@@ -385,8 +385,8 @@ fi
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='${CPP} $CPPFLAGS'
-ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS 1>&5 2>&5'
+ac_cpp='$CPP $CPPFLAGS'
+ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -400,7 +400,6 @@ else
   ac_n= ac_c='\c' ac_t=
 fi
 
-
 bfd_gas=no
 user_bfd_gas=
 # Check whether --enable-bfd-assembler or --disable-bfd-assembler was given.
@@ -417,23 +416,23 @@ fi
 
 
 ac_aux_dir=
-for ac_dir in `cd $srcdir;pwd`/.. ${srcdir}/`cd $srcdir;pwd`/..; do
+for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
-    ac_install_sh="${ac_aux_dir}/install-sh -c"
+    ac_install_sh="$ac_aux_dir/install-sh -c"
     break
   elif test -f $ac_dir/install.sh; then
     ac_aux_dir=$ac_dir
-    ac_install_sh="${ac_aux_dir}/install.sh -c"
+    ac_install_sh="$ac_aux_dir/install.sh -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: can not find install-sh or install.sh in `cd $srcdir;pwd`/.. ${srcdir}/`cd $srcdir;pwd`/.." 1>&2; exit 1; }
+  { echo "configure: can not find install-sh or install.sh in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/.." 1>&2; exit 1; }
 fi
-ac_config_guess=${ac_aux_dir}/config.guess
-ac_config_sub=${ac_aux_dir}/config.sub
-ac_configure=${ac_aux_dir}/configure # This should be Cygnus configure.
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
 # Do some error checking and defaulting for the host and target type.
@@ -459,25 +458,25 @@ esac
 
 
 # Make sure we can run config.sub.
-if ${ac_config_sub} sun4 >/dev/null 2>&1; then :
-else { echo "configure: can not run ${ac_config_sub}" 1>&2; exit 1; }
+if $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&4
 
 host_alias=$host
-case "${host_alias}" in
+case "$host_alias" in
 NONE)
   case $nonopt in
   NONE)
-    if host_alias=`${ac_config_guess}`; then :
+    if host_alias=`$ac_config_guess`; then :
     else { echo "configure: can not guess host type; you must specify one" 1>&2; exit 1; }
     fi ;;
   *) host_alias=$nonopt ;;
   esac ;;
 esac
 
-host=`${ac_config_sub} ${host_alias}`
+host=`$ac_config_sub $host_alias`
 host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
 host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
@@ -486,7 +485,7 @@ echo "$ac_t""$host" 1>&4
 echo $ac_n "checking target system type""... $ac_c" 1>&4
 
 target_alias=$target
-case "${target_alias}" in
+case "$target_alias" in
 NONE)
   case $nonopt in
   NONE) target_alias=$host_alias ;;
@@ -494,7 +493,7 @@ NONE)
   esac ;;
 esac
 
-target=`${ac_config_sub} ${target_alias}`
+target=`$ac_config_sub $target_alias`
 target_cpu=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
 target_vendor=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
 target_os=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
@@ -503,10 +502,10 @@ echo "$ac_t""$target" 1>&4
 echo $ac_n "checking build system type""... $ac_c" 1>&4
 
 build_alias=$build
-case "${build_alias}" in
+case "$build_alias" in
 NONE) build= build_alias= ;;
 *)
-build=`${ac_config_sub} ${build_alias}`
+build=`$ac_config_sub $build_alias`
 build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
 build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
 build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
@@ -514,25 +513,25 @@ build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
 esac
 echo "$ac_t""$build" 1>&4
 
-test "${host_alias}" != "${target_alias}" &&
-  test "${program_prefix}${program_suffix}${program_transform_name}" = \
+test "$host_alias" != "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONENONE && program_prefix=${target_alias}-
 
-test "${program_transform_name}" = NONE && program_transform_name=
-if test -n "${program_transform_name}"; then
+test "$program_transform_name" = NONE && program_transform_name=
+if test -n "$program_transform_name"; then
   # Double any \ or $.
   echo 's,\\,\\\\,g; s,\$,$$,g' > conftestsed
-  program_transform_name="`echo ${program_transform_name}|sed -f conftestsed`"
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
   rm -f conftestsed
 fi
-test "${program_prefix}" != NONE &&
-  program_transform_name="s,^,${program_prefix},; ${program_transform_name}"
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
 # Use a double $ so make ignores it.
-test "${program_suffix}" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; ${program_transform_name}"
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
 
 # sed with no file args requires a program.
-test "${program_transform_name}" = "" && program_transform_name="s,x,x,"
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 
 emulation=generic
@@ -764,7 +763,6 @@ case ${reject_dev_configs}-${dev} in
     ;;
 esac
 
-   
 
 
 case "${bfd_gas}" in
@@ -850,7 +848,7 @@ rm -f conftest*
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&4
-if test -z "${INSTALL}"; then
+if test -z "$INSTALL"; then
 if eval "test \"`echo '${'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
@@ -905,13 +903,13 @@ else
   CPP="${CC-cc} -E"
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
-  cat > conftest.${ac_ext} <<EOF
-#line 910 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 908 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 Syntax Error
 EOF
-eval "$ac_cpp conftest.${ac_ext} >/dev/null 2>conftest.out"
+eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -919,13 +917,13 @@ else
   echo "$ac_err" >&5
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.${ac_ext} <<EOF
-#line 924 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 922 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 Syntax Error
 EOF
-eval "$ac_cpp conftest.${ac_ext} >/dev/null 2>conftest.out"
+eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -945,17 +943,17 @@ echo "$ac_t""$CPP" 1>&4
 
 for ac_hdr in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h errno.h sys/types.h
 do
-ac_safe=`echo "${ac_hdr}" | tr './' '__'`
-echo $ac_n "checking for ${ac_hdr}""... $ac_c" 1>&4
+ac_safe=`echo "$ac_hdr" | tr './' '__'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
 if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 955 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 953 "configure"
 #include "confdefs.h"
-#include <${ac_hdr}>
+#include <$ac_hdr>
 EOF
-eval "$ac_cpp conftest.${ac_ext} >/dev/null 2>conftest.out"
+eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -971,7 +969,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&4
     ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
   cat >> confdefs.h <<EOF
-#define ${ac_tr_hdr} 1
+#define $ac_tr_hdr 1
 EOF
  
 else
@@ -1002,8 +1000,8 @@ else
   if test "$cross_compiling" = yes; then
   ac_cv_cross=yes
 else
-cat > conftest.${ac_ext} <<EOF
-#line 1007 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 1005 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
@@ -1025,8 +1023,8 @@ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&4
 if eval "test \"`echo '${'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1030 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1028 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() { return 0; }
@@ -1056,8 +1054,8 @@ echo $ac_n "checking for alloca""... $ac_c" 1>&4
 if eval "test \"`echo '${'ac_cv_func_alloca'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1061 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1059 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1114,8 +1112,8 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&4
 if eval "test \"`echo '${'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1119 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1117 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1124,7 +1122,7 @@ wenotbecray
 #endif
 
 EOF
-if (eval "$ac_cpp conftest.${ac_ext}") 2>&5 |
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "webecray" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_os_cray=yes
@@ -1141,8 +1139,8 @@ echo $ac_n "checking for _getb67""... $ac_c" 1>&4
 if eval "test \"`echo '${'ac_cv_func__getb67'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1146 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1144 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -1182,8 +1180,8 @@ echo $ac_n "checking for GETB67""... $ac_c" 1>&4
 if eval "test \"`echo '${'ac_cv_func_GETB67'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1187 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1185 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -1223,8 +1221,8 @@ echo $ac_n "checking for getb67""... $ac_c" 1>&4
 if eval "test \"`echo '${'ac_cv_func_getb67'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1228 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1226 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -1275,8 +1273,8 @@ else
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
 else
-cat > conftest.${ac_ext} <<EOF
-#line 1280 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 1278 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1316,8 +1314,8 @@ if eval "test \"`echo '${'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   if test "$GCC" = yes; then
-cat > conftest.${ac_ext} <<EOF
-#line 1321 "configure"
+cat > conftest.$ac_ext <<EOF
+#line 1319 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1347,6 +1345,92 @@ EOF
 fi
 
 
+# VMS needs this.
+echo $ac_n "checking for unlink""... $ac_c" 1>&4
+if eval "test \"`echo '${'ac_cv_func_unlink'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1355 "configure"
+#include "confdefs.h"
+#include <ctype.h> /* Arbitrary system header to define __stub macros. */
+int main() { return 0; }
+int t() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_unlink) || defined (__stub___unlink)
+choke me
+#else
+/* Override any gcc2 internal prototype to avoid an error.  */
+char unlink(); unlink();
+#endif
+
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_func_unlink=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_func_unlink=no"
+fi
+rm -f conftest*
+
+fi
+if eval "test \"`echo '$ac_cv_func_'unlink`\" = yes"; then
+  echo "$ac_t""yes" 1>&4
+  :
+else
+  echo "$ac_t""no" 1>&4
+echo $ac_n "checking for delete""... $ac_c" 1>&4
+if eval "test \"`echo '${'ac_cv_func_delete'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1393 "configure"
+#include "confdefs.h"
+#include <ctype.h> /* Arbitrary system header to define __stub macros. */
+int main() { return 0; }
+int t() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_delete) || defined (__stub___delete)
+choke me
+#else
+/* Override any gcc2 internal prototype to avoid an error.  */
+char delete(); delete();
+#endif
+
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_func_delete=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_func_delete=no"
+fi
+rm -f conftest*
+
+fi
+if eval "test \"`echo '$ac_cv_func_'delete`\" = yes"; then
+  echo "$ac_t""yes" 1>&4
+  cat >> confdefs.h <<\EOF
+#define USE_DELETE_FOR_UNLINK 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&4
+{ echo "configure: No unlink or delete function available on this system." 1>&2; exit 1; }
+fi
+
+fi
+
+
 # Some non-ANSI preprocessors botch requoting inside strings.  That's bad
 # enough, but on some of those systems, the assert macro relies on requoting
 # working properly!
@@ -1354,8 +1438,8 @@ echo $ac_n "checking for working assert macro""... $ac_c" 1>&4
 if eval "test \"`echo '${'gas_cv_assert_ok'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1359 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1443 "configure"
 #include "confdefs.h"
 #include <assert.h>
 #include <stdio.h>
@@ -1411,8 +1495,8 @@ echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&4
 if eval "test \"`echo '${'gas_cv_decl_needed_malloc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1416 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1500 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() { return 0; }
@@ -1447,8 +1531,8 @@ echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&4
 if eval "test \"`echo '${'gas_cv_decl_needed_free'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1452 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1536 "configure"
 #include "confdefs.h"
 $gas_test_headers
 int main() { return 0; }
@@ -1486,8 +1570,8 @@ echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&4
 if eval "test \"`echo '${'gas_cv_decl_needed_errno'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
-  cat > conftest.${ac_ext} <<EOF
-#line 1491 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1575 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ERRNO_H
@@ -1525,16 +1609,6 @@ EOF
 subdirs="testsuite"
 
 
-if test `cd $srcdir;pwd` = `pwd` ; then
-  rm -f .gdbinit
-  cat > .gdbinit << EOF
-dir $srcdir
-dir .
-source $srcdir/.gdbinit
-EOF
-fi
-
-
 if test -w $cache_file; then
 echo "updating cache $cache_file"
 cat > $cache_file <<\EOF
@@ -1580,9 +1654,9 @@ DEFS=-DHAVE_CONFIG_H
 # Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
 
-echo creating ${CONFIG_STATUS}
-rm -f ${CONFIG_STATUS}
-cat > ${CONFIG_STATUS} <<EOF
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
 #!/bin/sh
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
@@ -1594,7 +1668,7 @@ cat > ${CONFIG_STATUS} <<EOF
 # Compiler output produced by configure, useful for debugging
 # configure, is in ./config.log if it exists.
 
-ac_cs_usage="Usage: ${CONFIG_STATUS} [--recheck] [--version] [--help]"
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
 for ac_option
 do
   case "\$ac_option" in
@@ -1602,7 +1676,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "${CONFIG_STATUS} generated by autoconf version 1.117"
+    echo "$CONFIG_STATUS generated by autoconf version 1.118"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1613,7 +1687,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr doc/Makefile Makefile conf conftest*; exit 1' 1 2 15
+trap 'rm -fr Makefile doc/Makefile .gdbinit:gdbinit.in conf conftest*; exit 1' 1 2 15
 
 # Protect against being on the right side of a sed subst in config.status. 
 sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; 
@@ -1647,10 +1721,6 @@ s%@program_transform_name@%$program_transform_name%g
 s%@OPCODES_LIB@%$OPCODES_LIB%g
 /@target_frag@/r $target_frag
 s%@target_frag@%%g
-s%@cpu_type@%$cpu_type%g
-s%@obj_format@%$obj_format%g
-s%@emulation@%$emulation%g
-s%@atof@%$atof%g
 s%@BFDLIB@%$BFDLIB%g
 s%@ALL_OBJ_DEPS@%$ALL_OBJ_DEPS%g
 s%@CC@%$CC%g
@@ -1662,12 +1732,12 @@ s%@subdirs@%$subdirs%g
 
 CEOF
 EOF
-cat >> ${CONFIG_STATUS} <<EOF
+cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"doc/Makefile Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile .gdbinit:gdbinit.in"}
 EOF
-cat >> ${CONFIG_STATUS} <<\EOF
-for ac_file in .. ${CONFIG_FILES}; do if test "x$ac_file" != x..; then
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
   # Support "outfile[:infile]", defaulting infile="outfile.in".
   case "$ac_file" in
   *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
@@ -1701,31 +1771,13 @@ for ac_file in .. ${CONFIG_FILES}; do if test "x$ac_file" != x..; then
 
   case "$ac_given_INSTALL" in
   [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *)  INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
   esac
   echo creating "$ac_file"
   rm -f "$ac_file"
-  comment_str="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-    *.c | *.h | *.C | *.cc | *.cpp | *.hpp | *.m )
-    ac_comsub="1i\\
-/* $comment_str */" ;;
-    * ) # Add the comment on the second line of scripts, first line of others.
-    ac_comsub="
-1{
-s/^#!/&/
-t script
-i\\
-# $comment_str
-b done
-: script
-a\\
-# $comment_str
-: done
-}
-" ;;
-  esac
-  sed -e "$ac_comsub
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  sed -e "
+s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
 s%@INSTALL@%$INSTALL%g
@@ -1753,7 +1805,7 @@ ac_eC=' '
 ac_eD='%g'
 
 CONFIG_HEADERS=${CONFIG_HEADERS-"conf"}
-for ac_file in .. ${CONFIG_HEADERS}; do if test "x$ac_file" != x..; then
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
   # Support "outfile[:infile]", defaulting infile="outfile.in".
   case "$ac_file" in
   *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
@@ -1802,20 +1854,20 @@ do
   # grep -c gives empty output for an empty file on some AIX systems.
   if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
   # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> ${CONFIG_STATUS}
-  sed ${ac_max_here_lines}q conftest.vals >> ${CONFIG_STATUS}
+  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
   echo 'CEOF
   sed -f conftest.frag conftest.in > conftest.out
   rm -f conftest.in
   mv conftest.out conftest.in
-' >> ${CONFIG_STATUS}
+' >> $CONFIG_STATUS
   sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
   rm -f conftest.vals
   mv conftest.tail conftest.vals
 done
 rm -f conftest.vals
 
-cat >> ${CONFIG_STATUS} <<\EOF
+cat >> $CONFIG_STATUS <<\EOF
   rm -f conftest.frag conftest.h
   echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
   cat conftest.in >> conftest.h
@@ -1831,41 +1883,60 @@ fi; done
 
 EOF
 
-cat >> ${CONFIG_STATUS} <<EOF
-ac_dests="targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c"
+cat >> $CONFIG_STATUS <<EOF
 ac_sources="config/tc-${cpu_type}.c	config/tc-${cpu_type}.h \
 	config/obj-${obj_format}.h config/obj-${obj_format}.c \
 	config/te-${emulation}.h config/atof-${atof}.c"
+ac_dests="targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c"
 EOF
 
-cat >> ${CONFIG_STATUS} <<\EOF
+cat >> $CONFIG_STATUS <<\EOF
 srcdir=$ac_given_srcdir
-while test -n "${ac_sources}"; do
-  set ${ac_dests}; ac_dest=$1; shift; ac_dests=$*
-  set ${ac_sources}; ac_source=$1; shift; ac_sources=$*
+while test -n "$ac_sources"; do
+  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+  set $ac_sources; ac_source=$1; shift; ac_sources=$*
 
-  echo "linking ${ac_dest} to ${srcdir}/${ac_source}"
+  echo "linking $srcdir/$ac_source to $ac_dest"
+
+  if test ! -r $srcdir/$ac_source; then
+    { echo "configure: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
+  fi
+  rm -f $ac_dest
 
-  if test ! -r ${srcdir}/${ac_source}; then
-    { echo "configure: ${srcdir}/${ac_source}: File not found" 1>&2; exit 1; }
+  # Make relative symlinks.
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
+    # The dest file is in a subdirectory.
+    test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
+    ac_dest_dir_suffix="/$ac_dest_dir"
+    # A "../" for each directory in $ac_dest_dir_suffix.
+    ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dest_dir_suffix= ac_dots=
   fi
-  rm -f ${ac_dest}
+
+  case "$srcdir" in
+  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
+  *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
+  esac
+
   # Make a symlink if possible; otherwise try a hard link.
-  if ln -s ${srcdir}/${ac_source} ${ac_dest} 2>/dev/null ||
-    ln ${srcdir}/${ac_source} ${ac_dest}; then :
+  if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+    ln $srcdir/$ac_source $ac_dest; then :
   else
-    { echo "configure: can not link ${ac_dest} to ${srcdir}/${ac_source}" 1>&2; exit 1; }
+    { echo "configure: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
   fi
 done
 
 
 exit 0
 EOF
-chmod +x ${CONFIG_STATUS}
+chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} ${CONFIG_STATUS}
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS
 
-if test "${no_recursion}" != yes; then
+if test "$no_recursion" != yes; then
 
   # Remove --cache-file and --srcdir arguments so they do not pile up.
   ac_sub_configure_args=
@@ -1894,66 +1965,66 @@ if test "${no_recursion}" != yes; then
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
-    if test ! -d ${srcdir}/${ac_config_dir}; then
+    if test ! -d $srcdir/$ac_config_dir; then
       continue
     fi
 
-    echo configuring in ${ac_config_dir}
+    echo configuring in $ac_config_dir
 
-    case "${srcdir}" in
+    case "$srcdir" in
     .) ;;
     *)
-      if test -d ./${ac_config_dir} || mkdir ./${ac_config_dir}; then :;
+      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
       else
-        { echo "configure: can not create `pwd`/${ac_config_dir}" 1>&2; exit 1; }
+        { echo "configure: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
       fi
       ;;
     esac
 
     ac_popdir=`pwd`
-    cd ${ac_config_dir}
+    cd $ac_config_dir
 
-    case "${srcdir}" in
+    case "$srcdir" in
     .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=${srcdir} ;;
+      ac_sub_srcdir=$srcdir ;;
     /*) # Absolute path.
-      ac_sub_srcdir=${srcdir}/${ac_config_dir} ;;
+      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
     *) # Relative path.
-      ac_sub_srcdir=../${srcdir}/${ac_config_dir} ;;
+      ac_sub_srcdir=../$srcdir/$ac_config_dir ;;
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f ${ac_sub_srcdir}/configure; then
-      ac_sub_configure=${ac_sub_srcdir}/configure
-    elif test -f ${ac_sub_srcdir}/configure.in; then
-      ac_sub_configure=${ac_configure}
+    if test -f $ac_sub_srcdir/configure; then
+      ac_sub_configure=$ac_sub_srcdir/configure
+    elif test -f $ac_sub_srcdir/configure.in; then
+      ac_sub_configure=$ac_configure
     else
-      echo "configure: warning: no configuration information is in ${ac_config_dir}" 1>&2
+      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
       ac_sub_configure=
     fi
 
     # The recursion is here.
-    if test -n "${ac_sub_configure}"; then
+    if test -n "$ac_sub_configure"; then
 
       # Make the cache file name correct relative to the subdirectory.
-      # A "../" for each directory in /${ac_config_dir}.
-      ac_dots=`echo /${ac_config_dir}|sed 's%/[^/]*%../%g'`
+      # A "../" for each directory in /$ac_config_dir.
+      ac_dots=`echo /$ac_config_dir|sed 's%/[^/]*%../%g'`
       case "$cache_file" in
       /*) ac_sub_cache_file=$cache_file ;;
       *) # Relative path.
         ac_sub_cache_file="$ac_dots$cache_file" ;;
       esac
 
-      echo "running ${CONFIG_SHELL-/bin/sh} ${ac_sub_configure} ${ac_sub_configure_args} --cache-file=$ac_sub_cache_file --srcdir=${ac_sub_srcdir}"
+      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
       # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} ${ac_sub_configure} ${ac_sub_configure_args} --cache-file=$ac_sub_cache_file --srcdir=${ac_sub_srcdir}
+      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
       then :
       else
-        { echo "configure: ${ac_sub_configure} failed for ${ac_config_dir}" 1>&2; exit 1; }
+        { echo "configure: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
       fi
     fi
 
-    cd ${ac_popdir}
+    cd $ac_popdir
   done
 fi
 
diff --git a/gas/configure.in b/gas/configure.in
index 55e3650..7bc93f7 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -3,10 +3,9 @@ dnl
 dnl And be careful when changing it!  If you must add tests with square
 dnl brackets, be sure changequote invocations surround it.
 dnl
-dnl Remember to use "dnl" in each line before the AC_INIT call...
 dnl
-dnl
-AC_INIT(as.h)
+AC_PREREQ(1.118)dnl
+AC_INIT(as.h)dnl
 dnl
 bfd_gas=no
 user_bfd_gas=
@@ -254,14 +253,10 @@ case ${reject_dev_configs}-${dev} in
     ;;
 esac
 
-dnl Looks like the AC_MAKE_LINKS string is taken literally and put into the
-dnl  config.status file.  So the necessary variables also have to be
-dnl  exported.
-AC_SUBST(cpu_type) AC_SUBST(obj_format) AC_SUBST(emulation) AC_SUBST(atof)
-AC_LINK_FILES(targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c,
-	config/tc-${cpu_type}.c	config/tc-${cpu_type}.h \
+AC_LINK_FILES(config/tc-${cpu_type}.c	config/tc-${cpu_type}.h \
 	config/obj-${obj_format}.h config/obj-${obj_format}.c \
-	config/te-${emulation}.h config/atof-${atof}.c)
+	config/te-${emulation}.h config/atof-${atof}.c,
+	targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c)
 
 case "${bfd_gas}" in
   yes)	AC_DEFINE(BFD_ASSEMBLER)
@@ -313,6 +308,11 @@ dnl AC_CONST
 AC_FUNC_ALLOCA
 AC_C_INLINE
 
+# VMS needs this.
+AC_CHECK_FUNC(unlink,,
+  AC_CHECK_FUNC(delete,AC_DEFINE(USE_DELETE_FOR_UNLINK),
+    AC_MSG_ERROR(No unlink or delete function available on this system.)))
+
 # Some non-ANSI preprocessors botch requoting inside strings.  That's bad
 # enough, but on some of those systems, the assert macro relies on requoting
 # working properly!
@@ -348,9 +348,7 @@ GAS_CHECK_DECL_NEEDED(errno, f, int f, [
 
 AC_CONFIG_SUBDIRS(testsuite)
 
-GAS_GDBINIT
-
 dnl This must come last.
 dnl Apparently symlinks are checked for in the directory containing
 dnl  the last Makefile.  Thus the order used here...
-AC_OUTPUT(doc/Makefile Makefile)
+AC_OUTPUT(Makefile doc/Makefile .gdbinit:gdbinit.in)