* configure: Rebuild after change to aclocal.m4.

1 files changed, 188 insertions, 187 deletions

diff --git a/sim/mips/configure b/sim/mips/configure
index a7c9da4..f8b6a04 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -1109,177 +1109,6 @@ case "${target}" in
 esac
 
 
-COMMON_MAKEFILE_FRAG=makefile-temp-$$
-cat > $COMMON_MAKEFILE_FRAG <<EOF
-VPATH = ${srcdir}
-srcdir = ${srcdir}
-srcroot = \$(srcdir)/../..
-
-prefix = ${prefix}
-exec_prefix = ${exec_prefix}
-
-host_alias = ${host_alias}
-target_alias = ${target_alias}
-program_transform_name = ${program_transform_name}
-bindir = ${bindir}
-
-libdir = ${libdir}
-tooldir = \$(libdir)/\$(target_alias)
-
-datadir = ${datadir}
-mandir = ${mandir}
-man1dir = \$(mandir)/man1
-infodir = ${infodir}
-includedir = ${includedir}
-
-SHELL = /bin/sh
-
-INSTALL = \$(srcroot)/install.sh -c
-INSTALL_PROGRAM = ${INSTALL_PROGRAM}
-INSTALL_DATA = ${INSTALL_DATA}
-INSTALL_XFORM = \$(INSTALL) -t='\$(program_transform_name)'
-INSTALL_XFORM1= \$(INSTALL_XFORM) -b=.1
-
-CC = ${CC}
-CC_FOR_BUILD = ${CC_FOR_BUILD}
-CFLAGS = ${CFLAGS}
-SIM_CFLAGS = ${sim_cflags}
-SIM_DEBUG = ${sim_debug}
-SIM_TRACE = ${sim_trace}
-SIM_BSWAP = ${sim_bswap}
-
-HDEFINES = ${HDEFINES}
-TDEFINES =
-
-AR = ${AR}
-AR_FLAGS = rc
-RANLIB = ${RANLIB}
-MAKEINFO = makeinfo
-
-# Each simulator's Makefile.in defines one or more of these variables
-# as necessary.  The SIM_AC_OUTPUT macro then inserts those values
-# at '## Config'.
-
-# List of object files, less common parts.
-#SIM_OBJS =
-# List of flags to always pass to \$(CC).
-#SIM_EXTRA_CFLAGS =
-# List of extra libraries to link with.
-#SIM_EXTRA_LIBS =
-# List of extra program dependencies.
-#SIM_EXTRA_LIBDEPS =
-# Dependency of 'all' to build any extra files.
-#SIM_EXTRA_ALL =
-# Dependency of 'install' to install any extra files.
-#SIM_EXTRA_INSTALL =
-# Dependency of 'clean' to clean any extra files.
-#SIM_EXTRA_CLEAN =
-
-CONFIG_CFLAGS = ${DEFS} \$(SIM_CFLAGS) \$(SIM_DEBUG) \$(SIM_TRACE) \$(SIM_BSWAP) \
-  \$(SIM_EXTRA_CFLAGS) \$(HDEFINES) \$(TDEFINES)
-CSEARCH = -I. -I\$(srcdir) -I../common -I\$(srcdir)/../common \
-  -I../../include -I\$(srcroot)/include \
-  -I../../bfd -I\$(srcroot)/bfd -I\$(srcroot)/gdb \
-  -I../../opcodes -I\$(srcroot)/opcodes
-ALL_CFLAGS = \$(CONFIG_CFLAGS) \$(CSEARCH) \$(CFLAGS)
-BUILD_CFLAGS = -g -O \$(CSEARCH)
-
-.NOEXPORT:
-MAKEOVERRIDES=
-
-LIBIBERTY_LIB = ../../libiberty/libiberty.a
-BFD_LIB = ../../bfd/libbfd.a
-OPCODES_LIB = ../../opcodes/libopcodes.a
-CONFIG_LIBS = ${LIBS}
-LIBDEPS = \$(BFD_LIB) \$(OPCODES_LIB) \$(LIBIBERTY_LIB) \
-	\$(SIM_EXTRA_LIBDEPS)
-EXTRA_LIBS = \$(BFD_LIB) \$(OPCODES_LIB) \$(LIBIBERTY_LIB) \
-	\$(CONFIG_LIBS) \$(SIM_EXTRA_LIBS)
-
-LIB_OBJS = callback.o targ-map.o \$(SIM_OBJS)
-
-all: run libsim.a \$(SIM_EXTRA_ALL)
-
-libsim.a: \$(LIB_OBJS)
-	rm -f libsim.a
-	\$(AR) \$(ARFLAGS) libsim.a \$(LIB_OBJS)
-	\$(RANLIB) libsim.a
-
-run: run.o libsim.a \$(LIBDEPS)
-	\$(CC) \$(ALL_CFLAGS) -o run \
-	  run.o libsim.a \$(EXTRA_LIBS)
-
-run.o: \$(srcdir)/../common/run.c config.h tconfig.h \
-	  \$(srcroot)/include/callback.h
-	\$(CC) -c \$(srcdir)/../common/run.c \$(ALL_CFLAGS)
-
-callback.o: \$(srcdir)/../common/callback.c config.h tconfig.h \
-	  \$(srcroot)/include/callback.h targ-vals.h
-	\$(CC) -c \$(srcdir)/../common/callback.c \$(ALL_CFLAGS)
-
-gentmap: \$(srcdir)/../common/gentmap.c targ-vals.def
-	\$(CC_FOR_BUILD) \$(srcdir)/../common/gentmap.c -o gentmap \$(BUILD_CFLAGS) -I\$(srcdir)/../common
-
-targ-vals.h: gentmap
-	rm -f targ-vals.h
-	./gentmap -h >targ-vals.h
-
-targ-map.c: gentmap
-	rm -f targ-map.c
-	./gentmap -c >targ-map.c
-
-install: install-common \$(SIM_EXTRA_INSTALL)
-
-install-common:
-	\$(INSTALL_XFORM) run \$(bindir)/run
-
-check:
-
-info:
-clean-info:
-install-info:
-
-tags etags: TAGS
-
-TAGS: force
-	etags *.c *.h
-
-clean: \$(SIM_EXTRA_CLEAN)
-	rm -f *.[oa] *~ core gentmap targ-map.c targ-vals.h 
-	rm -f run libsim.a
-
-distclean mostlyclean maintainer-clean realclean: clean
-	rm -f TAGS
-	rm -f Makefile config.cache config.log config.status
-	rm -f tconfig.h config.h stamp-h targ-vals.def
-
-.c.o:
-	\$(CC) -c \$(ALL_CFLAGS) \$<
-
-# Dummy target to force execution of dependent targets.
-force:
-
-Makefile: Makefile.in config.status
-	CONFIG_HEADERS= \$(SHELL) ./config.status
-
-config.status: configure
-	\$(SHELL) ./config.status --recheck
-
-config.h: stamp-h ; @true
-stamp-h: config.in config.status
-	CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \$(SHELL) ./config.status
-
-# We can't add dependencies to configure because it causes too much trouble
-# to end users if configure's timestamp is out of sync.
-.PHONY: run-autoconf
-run-autoconf:
-	cd \$(srcdir) && autoconf -l ../common
-EOF
-
-
-
-
-
 
 # Ensure a reasonable default simulator is constructed:
 case "${target}" in
@@ -1291,7 +1120,7 @@ esac
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1295: checking how to run the C preprocessor" >&5
+echo "configure:1124: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1306,13 +1135,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1310 "configure"
+#line 1139 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1323,13 +1152,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1327 "configure"
+#line 1156 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1355,17 +1184,17 @@ for ac_hdr in string.h strings.h stdlib.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1359: checking for $ac_hdr" >&5
+echo "configure:1188: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1364 "configure"
+#line 1193 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1392,7 +1221,7 @@ fi
 done
 
 echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6
-echo "configure:1396: checking for fabs in -lm" >&5
+echo "configure:1225: checking for fabs in -lm" >&5
 ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1400,7 +1229,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1404 "configure"
+#line 1233 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1411,7 +1240,7 @@ int main() {
 fabs()
 ; return 0; }
 EOF
-if { (eval echo configure:1415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1441,12 +1270,12 @@ fi
 for ac_func in aint anint sqrt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1445: checking for $ac_func" >&5
+echo "configure:1274: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1450 "configure"
+#line 1279 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1469,7 +1298,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1496,6 +1325,178 @@ done
 
 
 
+
+COMMON_MAKEFILE_FRAG=makefile-temp-$$
+cat > $COMMON_MAKEFILE_FRAG <<EOF
+VPATH = ${srcdir}
+srcdir = ${srcdir}
+srcroot = \$(srcdir)/../..
+
+prefix = ${prefix}
+exec_prefix = ${exec_prefix}
+
+host_alias = ${host_alias}
+target_alias = ${target_alias}
+program_transform_name = ${program_transform_name}
+bindir = ${bindir}
+
+libdir = ${libdir}
+tooldir = \$(libdir)/\$(target_alias)
+
+datadir = ${datadir}
+mandir = ${mandir}
+man1dir = \$(mandir)/man1
+infodir = ${infodir}
+includedir = ${includedir}
+
+SHELL = /bin/sh
+
+INSTALL = \$(srcroot)/install.sh -c
+INSTALL_PROGRAM = ${INSTALL_PROGRAM}
+INSTALL_DATA = ${INSTALL_DATA}
+INSTALL_XFORM = \$(INSTALL) -t='\$(program_transform_name)'
+INSTALL_XFORM1= \$(INSTALL_XFORM) -b=.1
+
+CC = ${CC}
+CC_FOR_BUILD = ${CC_FOR_BUILD}
+CFLAGS = ${CFLAGS}
+SIM_CFLAGS = ${sim_cflags}
+SIM_DEBUG = ${sim_debug}
+SIM_TRACE = ${sim_trace}
+SIM_BSWAP = ${sim_bswap}
+
+HDEFINES = ${HDEFINES}
+TDEFINES =
+
+AR = ${AR}
+AR_FLAGS = rc
+RANLIB = ${RANLIB}
+MAKEINFO = makeinfo
+
+# Each simulator's Makefile.in defines one or more of these variables
+# as necessary.  The SIM_AC_OUTPUT macro then inserts those values
+# at '## Config'.
+
+# List of object files, less common parts.
+#SIM_OBJS =
+# List of flags to always pass to \$(CC).
+#SIM_EXTRA_CFLAGS =
+# List of extra libraries to link with.
+#SIM_EXTRA_LIBS =
+# List of extra program dependencies.
+#SIM_EXTRA_LIBDEPS =
+# Dependency of 'all' to build any extra files.
+#SIM_EXTRA_ALL =
+# Dependency of 'install' to install any extra files.
+#SIM_EXTRA_INSTALL =
+# Dependency of 'clean' to clean any extra files.
+#SIM_EXTRA_CLEAN =
+
+CONFIG_CFLAGS = ${DEFS} \$(SIM_CFLAGS) \$(SIM_DEBUG) \$(SIM_TRACE) \$(SIM_BSWAP) \
+  \$(SIM_EXTRA_CFLAGS) \$(HDEFINES) \$(TDEFINES)
+CSEARCH = -I. -I\$(srcdir) -I../common -I\$(srcdir)/../common \
+  -I../../include -I\$(srcroot)/include \
+  -I../../bfd -I\$(srcroot)/bfd -I\$(srcroot)/gdb \
+  -I../../opcodes -I\$(srcroot)/opcodes
+ALL_CFLAGS = \$(CONFIG_CFLAGS) \$(CSEARCH) \$(CFLAGS)
+BUILD_CFLAGS = -g -O \$(CSEARCH)
+
+.NOEXPORT:
+MAKEOVERRIDES=
+
+LIBIBERTY_LIB = ../../libiberty/libiberty.a
+BFD_LIB = ../../bfd/libbfd.a
+OPCODES_LIB = ../../opcodes/libopcodes.a
+CONFIG_LIBS = ${LIBS}
+LIBDEPS = \$(BFD_LIB) \$(OPCODES_LIB) \$(LIBIBERTY_LIB) \
+	\$(SIM_EXTRA_LIBDEPS)
+EXTRA_LIBS = \$(BFD_LIB) \$(OPCODES_LIB) \$(LIBIBERTY_LIB) \
+	\$(CONFIG_LIBS) \$(SIM_EXTRA_LIBS)
+
+LIB_OBJS = callback.o targ-map.o \$(SIM_OBJS)
+
+all: run libsim.a \$(SIM_EXTRA_ALL)
+
+libsim.a: \$(LIB_OBJS)
+	rm -f libsim.a
+	\$(AR) \$(ARFLAGS) libsim.a \$(LIB_OBJS)
+	\$(RANLIB) libsim.a
+
+run: run.o libsim.a \$(LIBDEPS)
+	\$(CC) \$(ALL_CFLAGS) -o run \
+	  run.o libsim.a \$(EXTRA_LIBS)
+
+run.o: \$(srcdir)/../common/run.c config.h tconfig.h \
+	  \$(srcroot)/include/callback.h
+	\$(CC) -c \$(srcdir)/../common/run.c \$(ALL_CFLAGS)
+
+callback.o: \$(srcdir)/../common/callback.c config.h tconfig.h \
+	  \$(srcroot)/include/callback.h targ-vals.h
+	\$(CC) -c \$(srcdir)/../common/callback.c \$(ALL_CFLAGS)
+
+gentmap: \$(srcdir)/../common/gentmap.c targ-vals.def
+	\$(CC_FOR_BUILD) \$(srcdir)/../common/gentmap.c -o gentmap \$(BUILD_CFLAGS) -I\$(srcdir)/../common
+
+targ-vals.h: gentmap
+	rm -f targ-vals.h
+	./gentmap -h >targ-vals.h
+
+targ-map.c: gentmap
+	rm -f targ-map.c
+	./gentmap -c >targ-map.c
+
+install: install-common \$(SIM_EXTRA_INSTALL)
+
+install-common:
+	\$(INSTALL_XFORM) run \$(bindir)/run
+
+check:
+
+info:
+clean-info:
+install-info:
+
+tags etags: TAGS
+
+TAGS: force
+	etags *.c *.h
+
+clean: \$(SIM_EXTRA_CLEAN)
+	rm -f *.[oa] *~ core gentmap targ-map.c targ-vals.h 
+	rm -f run libsim.a
+
+distclean mostlyclean maintainer-clean realclean: clean
+	rm -f TAGS
+	rm -f Makefile config.cache config.log config.status
+	rm -f tconfig.h config.h stamp-h targ-vals.def
+
+.c.o:
+	\$(CC) -c \$(ALL_CFLAGS) \$<
+
+# Dummy target to force execution of dependent targets.
+force:
+
+Makefile: Makefile.in config.status
+	CONFIG_HEADERS= \$(SHELL) ./config.status
+
+config.status: configure
+	\$(SHELL) ./config.status --recheck
+
+config.h: stamp-h ; @true
+stamp-h: config.in config.status
+	CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \$(SHELL) ./config.status
+
+# We can't add dependencies to configure because it causes too much trouble
+# to end users if configure's timestamp is out of sync.
+.PHONY: run-autoconf
+run-autoconf:
+	cd \$(srcdir) && autoconf -l ../common
+EOF
+
+
+
+
+
  trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1653,10 +1654,10 @@ s%@sim_cflags@%$sim_cflags%g
 s%@sim_debug@%$sim_debug%g
 s%@sim_trace@%$sim_trace%g
 s%@sim_bswap@%$sim_bswap%g
-/@COMMON_MAKEFILE_FRAG@/r $COMMON_MAKEFILE_FRAG
-s%@COMMON_MAKEFILE_FRAG@%%g
 s%@SIMCONF@%$SIMCONF%g
 s%@CPP@%$CPP%g
+/@COMMON_MAKEFILE_FRAG@/r $COMMON_MAKEFILE_FRAG
+s%@COMMON_MAKEFILE_FRAG@%%g
 
 CEOF
 EOF