Index: trunk/src/gcc/boehm-gc/Makefile.am
===================================================================
--- trunk/src/gcc/boehm-gc/Makefile.am	(revision 63)
+++ trunk/src/gcc/boehm-gc/Makefile.am	(revision 64)
@@ -136,5 +136,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
Index: trunk/src/gcc/boehm-gc/Makefile.in
===================================================================
--- trunk/src/gcc/boehm-gc/Makefile.in	(revision 63)
+++ trunk/src/gcc/boehm-gc/Makefile.in	(revision 64)
@@ -616,5 +616,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
Index: trunk/src/gcc/libf2c/Makefile.in
===================================================================
--- trunk/src/gcc/libf2c/Makefile.in	(revision 63)
+++ trunk/src/gcc/libf2c/Makefile.in	(revision 64)
@@ -123,5 +123,9 @@
 
 all: all-unilib
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="all-unilib"
+else
 	: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="all-unilib"
+endif        
 
 # `all-unilib' is the overall target in the absence of multilibs,
Index: trunk/src/gcc/libffi/Makefile.am
===================================================================
--- trunk/src/gcc/libffi/Makefile.am	(revision 63)
+++ trunk/src/gcc/libffi/Makefile.am	(revision 64)
@@ -187,5 +187,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
Index: trunk/src/gcc/libffi/Makefile.in
===================================================================
--- trunk/src/gcc/libffi/Makefile.in	(revision 63)
+++ trunk/src/gcc/libffi/Makefile.in	(revision 64)
@@ -735,5 +735,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
Index: trunk/src/gcc/libiberty/Makefile.in
===================================================================
--- trunk/src/gcc/libiberty/Makefile.in	(revision 63)
+++ trunk/src/gcc/libiberty/Makefile.in	(revision 64)
@@ -103,5 +103,9 @@
 # FIXME: add @BUILD_INFO@ once we're sure it works for everyone.
 all: stamp-picdir $(TARGETLIB) needed-list required-list all-subdir
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
+else
 	@: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
+endif
 
 .PHONY: check installcheck
Index: trunk/src/gcc/libjava/Makefile.am
===================================================================
--- trunk/src/gcc/libjava/Makefile.am	(revision 63)
+++ trunk/src/gcc/libjava/Makefile.am	(revision 64)
@@ -1956,5 +1956,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
Index: trunk/src/gcc/libjava/Makefile.in
===================================================================
--- trunk/src/gcc/libjava/Makefile.in	(revision 63)
+++ trunk/src/gcc/libjava/Makefile.in	(revision 64)
@@ -3529,5 +3529,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
Index: trunk/src/gcc/libobjc/Makefile.in
===================================================================
--- trunk/src/gcc/libobjc/Makefile.in	(revision 63)
+++ trunk/src/gcc/libobjc/Makefile.in	(revision 64)
@@ -138,5 +138,9 @@
 
 all: libobjc.la $(OBJC_BOEHM_GC)
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
+else
 	: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
+endif    
 
 # User-visible header files.
Index: trunk/src/gcc/libstdc++-v3/Makefile.am
===================================================================
--- trunk/src/gcc/libstdc++-v3/Makefile.am	(revision 63)
+++ trunk/src/gcc/libstdc++-v3/Makefile.am	(revision 64)
@@ -109,5 +109,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
Index: trunk/src/gcc/libstdc++-v3/Makefile.in
===================================================================
--- trunk/src/gcc/libstdc++-v3/Makefile.in	(revision 63)
+++ trunk/src/gcc/libstdc++-v3/Makefile.in	(revision 64)
@@ -533,5 +533,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
Index: trunk/src/gcc/libstdc++-v3/testsuite/Makefile.in
===================================================================
--- trunk/src/gcc/libstdc++-v3/testsuite/Makefile.in	(revision 63)
+++ trunk/src/gcc/libstdc++-v3/testsuite/Makefile.in	(revision 64)
@@ -11,4 +11,6 @@
 # PARTICULAR PURPOSE.
 
+all-none:
+all: all-none
 
 SHELL = @SHELL@
@@ -148,7 +150,7 @@
 
 
-RUNTESTFLAGS = 
-
-CXX_fake = @glibcpp_CXX@ 
+RUNTESTFLAGS =
+
+CXX_fake = @glibcpp_CXX@
 CXX = `echo $(CXX_fake) | sed 's/xgcc/g++/g'`
 CXXLINK = \
@@ -160,13 +162,13 @@
 INCLUDES = \
 	-nostdinc++ \
-	@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ 
+	@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@
 
 @GLIBCPP_BUILD_ABI_CHECK_TRUE@noinst_PROGRAMS = @GLIBCPP_BUILD_ABI_CHECK_TRUE@abi_check
-@GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS = 
+@GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS =
 abi_check_SOURCES = abi_check.cc
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-@GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS = 
+CONFIG_CLEAN_FILES =
+@GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS =
 PROGRAMS =  $(noinst_PROGRAMS)
 
@@ -178,6 +180,6 @@
 abi_check_OBJECTS =  abi_check.$(OBJEXT)
 abi_check_LDADD = $(LDADD)
-abi_check_DEPENDENCIES = 
-abi_check_LDFLAGS = 
+abi_check_DEPENDENCIES =
+abi_check_LDFLAGS =
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -194,8 +196,8 @@
 OBJECTS = $(abi_check_OBJECTS)
 
-all: all-redirect
+all-: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .cc .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus testsuite/Makefile
 
@@ -355,5 +357,5 @@
 installcheck-am:
 installcheck: installcheck-am
-install-info-am: 
+install-info-am:
 install-info: install-info-am
 install-exec-am:
Index: trunk/src/gcc/zlib/Makefile.am
===================================================================
--- trunk/src/gcc/zlib/Makefile.am	(revision 63)
+++ trunk/src/gcc/zlib/Makefile.am	(revision 64)
@@ -77,5 +77,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
Index: trunk/src/gcc/zlib/Makefile.in
===================================================================
--- trunk/src/gcc/zlib/Makefile.in	(revision 63)
+++ trunk/src/gcc/zlib/Makefile.in	(revision 64)
@@ -480,5 +480,9 @@
 
 all-multi:
+ifeq "$(BUILD_PLATFORM)" "OS2"
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+else
 	: $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
+endif    
 install-multi:
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
