diff --git a/gas/testsuite/Makefile.in b/gas/testsuite/Makefile.in
index cee420ed7c2..fdfae04f295 100644
--- a/gas/testsuite/Makefile.in
+++ b/gas/testsuite/Makefile.in
@@ -92,17 +92,14 @@ site.exp: ./Makefile
 	@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 set OBJDUMPFLAGS \"${OBJDUMPFLAGS}\"		>> ./tmp0
 	@echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0
-	        @cat ./tmp0 > site.exp
-	@cat site.bak | sed \
-	                -e '1,/^## All variables above are.*##/ d' >> site.exp
-	@rm -f ./tmp1 ./tmp0
+	@sed -e '1,/^## All variables above are.*##/ d' < site.bak >> ./tmp0
+	@mv -f ./tmp0 site.exp
 
 check:  site.exp
-	$(RUNTEST) $(RUNTEST_FLAGS) --tool gas AS=$(AS_FOR_TARGET)
+	$(RUNTEST) $(RUNTEST_FLAGS) --tool gas AS=$(AS_FOR_TARGET) ASFLAGS="$(ASFLAGS)"
 
 force: