Gets names to test from higher level makefile.

1 files changed, 32 insertions, 86 deletions

diff --git a/binutils/testsuite/Makefile.in b/binutils/testsuite/Makefile.in
index 9c5a1b2..2ab747f 100644
--- a/binutils/testsuite/Makefile.in
+++ b/binutils/testsuite/Makefile.in
@@ -42,93 +42,10 @@ SUBDIRS=
 
 RUNTEST = runtest
 RUNTESTFLAGS = 
-
-CC_FOR_TARGET = ` \
-  if [ -f $${rootme}../gcc/Makefile ] ; then \
-    echo $${rootme}../gcc/xgcc -B$${rootme}../gcc/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-
-GCC_FOR_TARGET = ` \
-  if [ -f $${rootme}../gcc/Makefile ] ; then \
-    echo $${rootme}../gcc/xgcc -B$${rootme}../gcc/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-
-$(start-sanitize-chill)
-CHILL_FOR_TARGET = ` \
-  if [ -f $${rootme}../gcc/Makefile ] ; then \
-    echo $${rootme}../gcc/xgcc -B$${rootme}../gcc/ -L$${rootme}../chillrt/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-$(end-sanitize-chill)
-
-CXX_FOR_TARGET = ` \
-  if [ -f $${rootme}../gcc/Makefile ] ; then \
-    echo $${rootme}../gcc/xgcc -B$${rootme}../gcc/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CXX); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-
-GDB = `if [ -f $${rootme}../gdb/gdb ] ; \
-	then echo $${rootme}../gdb/gdb ; \
-	else echo gdb; fi`
-GDBFLAGS =
-
-EXPECT = `if [ -f $${rootme}../expect/expect ] ; \
-	then echo $${rootme}../expect/expect ; \
-	else echo expect; fi`
+FLAGS_TO_PASS =
 
 #### host, target, and site specific Makefile frags come in here.
 
-FLAGS_TO_PASS = \
-	"AR=$(AR)" \
-	"AR_FLAGS=$(AR_FLAGS)" \
-	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
-	"CXX=$(CXX)" \
-	"CXXFLAGS=$(CXXFLAGS)" \
-	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
-	"CC=$(CC)" \
-	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
-	"CFLAGS=$(CFLAGS)" \
-	$(start-sanitize-chill)\
-	"CHILLFLAGS=$(CHILLFLAGS)" \
-	"CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
-	"CHILL_LIB=$(CHILL_LIB)" \
-	$(end-sanitize-chill)\
-	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
-	"INSTALL=$(INSTALL)" \
-	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-	"LDFLAGS=$(LDFLAGS)" \
-	"LINK=$(LINK)" \
-	"LEX=$(LEX)" \
-	"LOADLIBES=$(LOADLIBES)" \
-	"MAKEINFO=$(MAKEINFO)" \
-	"RANLIB=$(RANLIB)" \
-	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
-	"exec_prefix=$(exec_prefix)" \
-	"prefix=$(prefix)" 
-
 all:		subdirs
 
 .NOEXPORT:
@@ -137,12 +54,41 @@ info:
 	@rootme=`pwd`/ ; export rootme ; \
 	rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
 	$(MAKE) subdir_do DO=info "DODIRS=$(INFODIRS)" $(FLAGS_TO_PASS)
+
 install-info:
 	@rootme=`pwd`/ ; export rootme ; \
 	$(MAKE) subdir_do DO=install-info "DODIRS=$(INFODIRS)" $(FLAGS_TO_PASS)
 
-check: all
-	$(RUNTEST) $(RUNTESTFLAGS) --tool binutils --srcdir $(srcdir)
+check: site.exp all
+	$(RUNTEST) $(RUNTESTFLAGS) $(FLAGS_TO_PASS) --tool binutils --srcdir $(srcdir) --target $(target_canonical)
+
+site.exp: ./config.status Makefile
+	@echo "Making a new config file..."
+	-@rm -f ./tmp?
+	@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 tool binutils" >> ./tmp0
+	@echo "set srcdir ${srcdir}" >> ./tmp0
+	@echo "set objdir `pwd`" >> ./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 ./tmp?
 
 install:
 uninstall: force