* Makefile.in (OBJDUMP_FOR_TARGET): Define similar to AS_FOR_TARGET.

(check): Don't pass ASFLAGS variable.
(site.exp): Put ASFLAGS, OBJDUMP, OBJDUMPFLAGS into site.exp.

diff --git a/gas/testsuite/Makefile.in b/gas/testsuite/Makefile.in
index b1342531d25e4a0930ebcc55d7876ec42b74d725..978210f4f46042bd70d18a767d6f35cfc26cf260 100644 (file)
--- a/gas/testsuite/Makefile.in
+++ b/gas/testsuite/Makefile.in
@@ -49,6 +49,16 @@ AS_FOR_TARGET = ` \
       (set -e ; t='$(program_transform_name)'; echo as | sed -e '' $$t); \
     fi; \
   fi`
+OBJDUMP_FOR_TARGET = ` \
+  if [ -f ../../binutils/Makefile ] ; then \
+    echo ../../binutils/objdump ; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(OBJDUMP); \
+    else \
+      (set -e ; t='$(program_transform_name)'; echo objdump | sed -e '' $$t); \
+    fi; \
+  fi`
 
 #### host, target, and site specific Makefile frags come in here.
 
@@ -66,22 +76,25 @@ site.exp: ./Makefile
        @touch site.exp
        -@mv site.exp site.bak
        @echo "## these variables are automatically generated by make ##" > ./tmp0
-       @echo "# Do not edit here. If you wish to override these values" >> ./tmp0
-       @echo "# add them to the last section" >> ./tmp0
-       @echo "set host_os ${host_os}" >> ./tmp0
-       @echo "set host_alias ${host_alias}" >> ./tmp0
-       @echo "set host_cpu ${host_cpu}" >> ./tmp0
-       @echo "set host_vendor ${host_vendor}" >> ./tmp0
-       @echo "set target_os ${target_os}" >> ./tmp0
-       @echo "set target_alias ${target_alias}" >> ./tmp0
-       @echo "set target_cpu ${target_cpu}" >> ./tmp0
-       @echo "set target_vendor ${target_vendor}" >> ./tmp0
-       @echo "set host_triplet ${host_canonical}" >> ./tmp0
-       @echo "set target_triplet ${target_canonical}" >> ./tmp0
-       @echo "set target_canonical ${target_canonical}" >> ./tmp0
-       @echo "set srcdir ${srcdir}" >> ./tmp0
-       @echo "set exec_prefix ${exec_prefix}" >> ./tmp0
-       @echo "set objdir `pwd`" >> ./tmp0
+       @echo "# Do not edit here. If you wish to override these values," >> ./tmp0
+       @echo "# do so in the last section."                    >> ./tmp0
+       @echo set host_os ${host_os}                            >> ./tmp0
+       @echo set host_alias ${host_alias}                      >> ./tmp0
+       @echo set host_cpu ${host_cpu}                          >> ./tmp0
+       @echo set host_vendor ${host_vendor}                    >> ./tmp0
+       @echo set target_os ${target_os}                        >> ./tmp0
+       @echo set target_alias ${target_alias}                  >> ./tmp0
+       @echo set target_cpu ${target_cpu}                      >> ./tmp0
+       @echo set target_vendor ${target_vendor}                >> ./tmp0
+       @echo set host_triplet ${host_canonical}                >> ./tmp0
+       @echo set target_triplet ${target_canonical}            >> ./tmp0
+       @echo set target_canonical ${target_canonical}          >> ./tmp0
+       @echo set srcdir ${srcdir}                              >> ./tmp0
+       @echo set exec_prefix ${exec_prefix}                    >> ./tmp0
+       @echo set objdir `pwd`                                  >> ./tmp0
+       @echo set ASFLAGS ${ASFLAGS}                            >> ./tmp0
+       @echo set OBJDUMP ${OBJDUMP_FOR_TARGET}                 >> ./tmp0
+       @echo set OBJDUMPFLAGS ${OBJDUMPFLAGS}                  >> ./tmp0
        @echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0
                @cat ./tmp0 > site.exp
        @cat site.bak | sed \
@@ -89,7 +102,7 @@ site.exp: ./Makefile
        @rm -f ./tmp1 ./tmp0
 
 check:  site.exp
-       $(RUNTEST) $(RUNTESTFLAGS) --tool gas AS=$(AS_FOR_TARGET) ASFLAGS=
+       $(RUNTEST) $(RUNTESTFLAGS) --tool gas AS=$(AS_FOR_TARGET)
 
 force: