* Makefile.in (FLAGS_TO_PASS): pass CHECK_MULTI on * gcc/Makefile.in (SET_TARGET_BOARD): new variable: if CHECK_MULTI is not empty nor `n' nor `no', sets target_board to unix{...}, where `...' expands to a comma-separated list of multilib options. (TARGET_BOARD): new variable: expands to --target_board "$target_board", iff target_board is set (check-g++, check-gcc, check_g77): use SET_TARGET_BOARD and TARGET_BOARD Index: Makefile.in =================================================================== RCS file: /egcs/carton/cvsfiles/egcs/Makefile.in,v retrieving revision 1.16 diff -u -r1.16 Makefile.in --- Makefile.in 1998/02/18 00:18:26 1.16 +++ Makefile.in 1998/03/03 00:22:44 @@ -324,6 +324,7 @@ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ "CFLAGS=$(CFLAGS)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "CHECK_MULTI=$(CHECK_MULTI)" \ "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ "CXXFLAGS=$(CXXFLAGS)" \ "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ Index: gcc/Makefile.in =================================================================== RCS file: /egcs/carton/cvsfiles/egcs/gcc/Makefile.in,v retrieving revision 1.69 diff -u -r1.69 Makefile.in --- Makefile.in 1998/02/19 19:12:33 1.69 +++ Makefile.in 1998/03/03 00:22:46 @@ -2468,35 +2468,50 @@ rm -rf testsuite/site.exp cp site.exp testsuite/site.exp +SET_TARGET_BOARD = case "$(CHECK_MULTI)" in \ + ""|n|no) unset target_board;; \ + *) target_board="\"unix`\ + $(GCC_FOR_TARGET) -print-multi-lib | \ + sed -e 's/.*\;//' -e 's/@/-/' -e 's/@/ -/g' | \ + tr '\012' ',' | \ + sed -e 's/,$$//' -e 's/^/{/' -e 's/$$/}/' -e 's/{}//' \ + `\"";; \ + esac + +TARGET_BOARD = $${target_board+--target_board} $${target_board+"$$target_board"} + check-g++: testsuite/site.exp -rootme=`pwd`; export rootme; \ + $(SET_TARGET_BOARD); \ srcdir=`cd ${srcdir}; pwd` ; export srcdir ; \ cd testsuite; \ EXPECT=${EXPECT} ; export EXPECT ; \ if [ -f $${rootme}/../expect/expect ] ; then \ TCL_LIBRARY=$${srcdir}/../tcl/library ; \ export TCL_LIBRARY ; fi ; \ - $(RUNTEST) --tool g++ $(RUNTESTFLAGS) + $(RUNTEST) --tool g++ $(TARGET_BOARD) $(RUNTESTFLAGS) check-gcc: testsuite/site.exp -rootme=`pwd`; export rootme; \ + $(SET_TARGET_BOARD); \ srcdir=`cd ${srcdir}; pwd` ; export srcdir ; \ cd testsuite; \ EXPECT=${EXPECT} ; export EXPECT ; \ if [ -f $${rootme}/../expect/expect ] ; then \ TCL_LIBRARY=$${srcdir}/../tcl/library ; \ export TCL_LIBRARY ; fi ; \ - $(RUNTEST) --tool gcc $(RUNTESTFLAGS) + $(RUNTEST) --tool gcc $(TARGET_BOARD) $(RUNTESTFLAGS) check-g77: testsuite/site.exp -rootme=`pwd`; export rootme; \ + $(SET_TARGET_BOARD); \ srcdir=`cd ${srcdir}; pwd` ; export srcdir ; \ cd testsuite; \ EXPECT=${EXPECT} ; export EXPECT ; \ if [ -f $${rootme}/../expect/expect ] ; then \ TCL_LIBRARY=$${srcdir}/../tcl/library ; \ export TCL_LIBRARY ; fi ; \ - $(RUNTEST) --tool g77 $(RUNTESTFLAGS) + $(RUNTEST) --tool g77 $(TARGET_BOARD) $(RUNTESTFLAGS) # These exist for maintenance purposes.