This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

syncing ./ from gcc



Attached is approximately a list of patches that need to be imported
from gcc to src, and a diff of what will actually change.  I realize
it's a mess, but it seems consistent and correct to me.  If anyone
sees anything in here that will cause problems, let me know, else I'll
commit this in a few days (probably Monday).  This should bring gcc
and src in sync wrt these three files (config/* is already in sync).
I've already merged the src-only patches over to gcc.


2002-04-08  Tom Tromey  <tromey@redhat.com>

	* configure.in: Add FLAGS_FOR_TARGET to GCJ_FOR_TARGET.
	Fixes PR libgcj/6068.

2002-03-30  Krister Walfridsson  <cato@df.lth.se>

	* configure.in (i*86-*-netbsdelf*): Don't disable libgcj.

2002-03-27  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	* configure.in (alpha*-dec-osf*): Enable libgcj.

2002-03-24  Nick Clifton  <nickc@cambridge.redhat.com>

	Fix for: PR bootstrap/3591, target/5676
	* configure.in (mcore-pe): Disable the configuration of
	libstdc++-v3 since exceptions are not supported.

2002-03-20  Anthony Green  <green@redhat.com>

	* configure.in: Enable libgcj for xscale-elf target.

2002-02-28  Alexandre Oliva  <aoliva@redhat.com>

	* configure.in (libstdcxx_flags): Don't add libstdc++-v3 flags for
	libjava.
	(CXX_FOR_TARGET): Explain why -shared-libgcc here.

2002-02-22  Alexandre Oliva  <aoliva@redhat.com>

	* configure.in (CXX_FOR_TARGET): Add -shared-libgcc for
	libstdc++-v3 and libjava.

2002-02-11  Adam Megacz <adam@xwt.org>

	* gcc/Makefile.in: Removed libstdc++-v3 dependancy for libjava and
	boehm-gc

2002-02-09  Alexandre Oliva  <aoliva@redhat.com>

	* config.guess: Updated to 2002-01-30's version.
	* config.sub: Updated to 2002-02-01's version.
	Contribute sh64-elf.
	2000-12-01  Alexandre Oliva  <aoliva@redhat.com>
	* configure.in: Added sh64-*-*.

2002-01-17  H.J. Lu <hjl@gnu.org>

	* Makefile.in (all-fastjar): Also depend on all-libiberty.
	(all-target-fastjar): Also depend on all-target-libiberty.

Wed Dec  5 07:33:45 2001  Douglas B. Rupp  <rupp@gnat.com>

	* configure, configure.in: Use temp file for long sed commands.

2001-11-14  Hans-Peter Nilsson  <hp@bitrange.com>

	* configure.in (noconfigdirs) [h8300*-*-*, h8500-*-*]: Disable
	libf2c.

2001-11-03  Hans-Peter Nilsson  <hp@bitrange.com>

	* configure.in (noconfigdirs) [mmix-*-*]: Disable libgcj.

2001-10-11  Hans-Peter Nilsson  <hp@axis.com>

	* configure.in (noconfigdirs) [cris-*-*]: Disable libgcj.

2001-10-02  Joseph S. Myers  <jsm28@cam.ac.uk>

	* configure: Handle temporary files securely using mkdir.

2001-09-26  Will Cohen <wcohen@redhat.com>

	* configure.in (*-*-linux*): Disable configuration of target-newlib
	and target-libgloss.

2001-09-26  Alexandre Oliva  <aoliva@redhat.com>

	* Makefile.in (EXTRA_TARGET_FLAGS): Pass RANLIB_FOR_TARGET for
	RANLIB.

2001-08-11  Graham Stott  <grahams@redhat.com>

	* Makefile.in (check-c++): Add missing semicolon.

2001-07-25  Andrew Haley  <aph@cambridge.redhat.com>

	* configure.in (sh-*-linux*): New.

2001-07-12  Stephane Carrez  <Stephane.Carrez@worldnet.fr>

	* configure.in (noconfigdirs): Don't compile libiberty, libstdcxx
	and libgcj on m68hc11/m68hc12.

2001-06-27  H.J. Lu  (hjl@gnu.org)

	* Makefile (CFLAGS_FOR_BUILD): New.
	(EXTRA_GCC_FLAGS): Add CFLAGS_FOR_BUILD.

2001-06-01  Hans-Peter Nilsson  <hp@axis.com>

	* configure.in (libstdcxx_flags): Do not try to execute
	libstdc++-v3/testsuite_flags until it exists.

2001-05-18  Benjamin Kosnik  <bkoz@redhat.com>

	* configure.in (libstdcxx_flags): Remove reference to libstdc++.INC.

2001-05-09  Jeffrey Oldham  <oldham@codesourcery.com>

	* ltcf-cxx.sh: Add -nostdlib to IRIX 6 archive_cmds.

Mon Apr 23 09:15:03 2001  Anthony Green  <green@redhat.com>

	* configure.in: Move *-chorusos target case to the proper switch.
	Disable libgcj.

2001-04-13  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>

	* Makefile.in (STAGE1_CFLAGS): Pass down.

2001-04-13  Alan Modra  <amodra@one.net.au>

	* config.guess: Add hppa64-linux support.  Note for next import that
	this is already in the master file.
	* configure.in: Likewise.  Accept `parisc' alias for `hppa'.

2001-03-22  Colin Howell  <chowell@redhat.com>

	* Makefile.in (DO_X): Do not backslash single-quotes in
	backquotes (two places).

2001-03-18  Laurynas Biveinis  <lauras@softhome.net>

	* Makefile.in (DO_X): Quote nested quotes.

2001-03-15  Laurynas Biveinis  <lauras@softhome.net>

	* Makefile.in (DO_X): Use double quotes for quoting
	"RANLIB=$${RANLIB}".

2001-03-09  Nicola Pero <n.pero@mi.flashnet.it>

	* configure.in: Only use `lang_requires' for languages athat are
	actually enabled.

2001-03-07  Tom Tromey  <tromey@redhat.com>

	* configure.in: Allow config-lang.in to set `lang_requires' to list
	of other required languages.

2001-03-06  Laurynas Biveinis  <lauras@softhome.net>

	* Makefile.in: Remove RANLIB definition. Use RANLIB
	in RANLIB_FOR_TARGET, EXTRA_HOST_FLAGS, EXTRA_TARGET_FLAGS,
	EXTRA_GCC_FLAGS, $(DO_X) targets only when the RANLIB is set.

2001-02-28  Benjamin Kosnik  <bkoz@redhat.com>
	    Alexandre Oliva  <aoliva@redhat.com>

	* Makefile.in (check-c++): Use tabs, not spaces.

2001-02-19  Benjamin Kosnik  <bkoz@redhat.com>

	* Makefile.in (check-c++): New rule.

	* configure.in (target_libs): Remove libg++.
	(noconfigdirs): Remove libg++.
	(noconfigdirs): Same.
	(noconfigdirs): Same.
	(noconfigdirs): Same.

	* config-ml.in: Remove libg++ references.

	* Makefile.in (TARGET_CONFIGDIRS): Remove libio, libstdc++, libg++.
	(ALL_TARGET_MODULES): Same.
	(configure-target-libg++): Remove.
	(all-target-libg++): Remove.
	(configure-target-libio): Remove.
	(all-target-libio): Remove.
	(check-target-libio): Remove.
	(.PHONY): Remove.
	(libg++.tar.bz2): Remove.
	(all-target-cygmon): Remove libio.
	(all-target-libstdc++): Remove.
	(configure-target-libstdc++): Remove.
	(TARGET_LIB_PATH): Remove libstdc++.
	(ALL_GCC_CXX): Remove libstdc++.
	(all-target-gperf): Correct.

2001-02-15  Anthony Green  <green@redhat.com>

	* configure: Introduce GCJ_FOR_TARGET.
	* configure.in: Ditto.
	* Makefile.in: Ditto.

2001-02-08  Chandrakala Chavva <cchavva@redhat.com>

	* configure.in: for *-chorusos, don't config target-newlib and
	target-libgloss.

2001-02-04  Mark Mitchell  <mark@codesourcery.com>

	Remove V2 C++ library.
	* configure.in: Remove --enable-libstdcxx_v3 support.

2001-01-27  Richard Henderson  <rth@redhat.com>

	* configure.in (target_makefile_frag) [alpha*-*]: Use mt-alphaieee.

2001-01-26  Tom Tromey  <tromey@redhat.com>

	* configure.in: Allow libgcj to be built on Sparc Solaris.

2001-01-23  Bryce McKinlay  <bryce@albatross.co.nz>

	* configure.in: Enable libgcj on several additional platforms.

2001-01-22  Bryce McKinlay  <bryce@albatross.co.nz>

	* configure.in: Enable libgcj for linux targets.

2001-01-09  Mike Stump  <mrs@wrs.com>

	* Makefile.in (CONFIGURE_TARGET_MODULES): Pass back configuration
	failures of subdirectories.

2001-01-02  Laurynas Biveinis  <lauras@softhome.net>

	* configure: handle DOS-style absolute paths.

2001-01-02  Laurynas Biveinis  <lauras@softhome.net>

	* configure.in: remove supported directories from $noconfigdirs for DJGPP.

2000-12-18  Benjamin Kosnik  <bkoz@redhat.com>

	* Makefile.in (BASE_FLAGS_TO_PASS): Alphabetize.
	(libstdcxx_incdir): Pass down.
	* config.if: Remove expired bits for cxx_interface, add stub.
	(libstdcxx_incdir): Add variable for g++ include directory.
	* configure.in (gxx_include_dir): Use it.

2000-12-15  Andreas Jaeger  <aj@suse.de>

	* configure.in: Handle lang_dirs.

2000-12-13  Anthony Green  <green@redhat.com>

	* configure.in: Disable libgcj for any target not specifically
	listed.  Disable libgcj for x86 and Alpha Linux until compatible
	with g++ abi.

2000-12-13  Mike Stump  <mrs@wrs.com>

	* Makefile.in (local-distclean): Also remove fastjar.

2000-12-10  Anthony Green  <green@redhat.com>

	* configure.in: Define libgcj.  Disable libgcj target libraries for
	most targets.

2000-12-09  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* configure.in (target_libs): Revert 2000-12-08 patch.
	(noconfigdirs): Added target-libjava.

2000-12-09  Laurynas Biveinis  <lauras@softhome.net>

	* Makefile.in: handle DOS-style absolute paths.

2000-12-08  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* Makefile.in (TARGET_CONFIGDIRS): Wrong place. Removed note about
	libjava.
	* configure.in (target_libs): Removed `target-libjava'.

2000-12-08  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* Makefile.in (TARGET_CONFIGDIRS): Added note about libjava.
	(ALL_MODULES): Added fastjar.
	(NATIVE_CHECK_MODULES, INSTALL_MODULES, CLEAN_MODULES): Likewise.
	(all-target-libjava): all-fastjar replaces all-zip.
	(all-fastjar): Added.
	(configure-target-fastjar, all-target-fastjar): Likewise.
	* configure.in (host_tools): Added fastjar.

2000-12-07  Mike Stump  <mrs@wrs.com>

	* Makefile.in (local-distclean): Remove leftover built files.

2000-11-16  Fred Fish  <fnf@be.com>

	* configure.in (enable_libstdcxx_v3): Fix typo,
	libstd++ -> libstdc++.

2000-11-13  Joseph S. Myers  <jsm28@cam.ac.uk>

	* configure: Provide the original toplevel configure arguments
	(including $0) to subprocesses in the environment rather than
	through gcc/configargs.h.

2000-11-12  Mark Mitchell  <mark@codesourcery.com>

	* configure: Turn on libstdc++ V3 by default.

2000-10-16  Michael Meissner  <meissner@redhat.com>

	* configure (gcc/configargs.h): Only create if there is a build GCC
	directory created.

2000-10-05  Phil Edwards  <pme@gcc.gnu.org>

	* configure: Save configure arguments to gcc/configargs.h.

2000-10-04  Andris Pavenis  <pavenis@latnet.lv>

	* Makefile.in (bootstrap): avoid recursion if subdir missing
	(cross): ditto
	(do-proto-toplev): ditto

Wed Sep 13 11:11:29 2000  Jeffrey A Law  (law@cygnus.com)

	* configure.in: Do not build byacc for hppa64.  Provide paths to the
	X11 libraries for hppa64.

2000-09-02  Anthony Green  <green@cygnus.com>

	* Makefile.in (all-gcc): Depend on all-zlib.
	(CLEAN_MODULES): Add clean-zlib.
	(ALL_MODULES): Add all-zlib.
	* configure.in (host_libs): Add zlib.

2000-08-25  Alexandre Oliva  <aoliva@redhat.com>

	* configure.in (FLAGS_FOR_TARGET): Use $target_configdirs and
	$targargs to tell whether newlib is going to be built.

	* configure.in [disable-libstdcxx-v3] (libstdcxx_flags): Search
	$$r/TARGET_SUBDIR/libio for _G_config.h.

2000-08-14  Zack Weinberg  <zack@wolery.cumb.org>

	* configure.in (libstdcxx_flags): Remove -isystem $$s/libio/stdio.

	* configure: Make enable_threads and enable_shared defaults
	explicit.  Substitute enable_threads into generated Makefiles.
	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
	* libtool.m4: Accept *-*-linux* not just *-*-linux-gnu*.

2000-08-02  Manfred Hollstein  <manfredh@redhat.com>

	* configure.in: Re-enable all references to libg++ and librx.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/Makefile.in,v
retrieving revision 1.48
diff -p -2 -r1.48 Makefile.in
*** Makefile.in	7 Apr 2002 20:53:57 -0000	1.48
--- Makefile.in	13 Apr 2002 03:32:26 -0000
*************** CXXFLAGS = -g -O2
*** 94,97 ****
--- 94,98 ----
  LDFLAGS = 
  LIBCFLAGS = $(CFLAGS)
+ CFLAGS_FOR_BUILD = $(CFLAGS)
  CFLAGS_FOR_TARGET = $(CFLAGS)
  LDFLAGS_FOR_TARGET = 
*************** CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
*** 109,114 ****
  LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
  
- RANLIB = ranlib
- 
  DLLTOOL = dlltool
  WINDRES = windres
--- 110,113 ----
*************** OTHERS = 
*** 180,184 ****
  # This is set by the configure script to the list of directories which
  # should be built using the target tools.
! TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib libio librx libstdc++ libg++ winsup opcodes bsp libstub cygmon libf2c libchill libobjc
  
  # Target libraries are put under this directory:
--- 179,183 ----
  # This is set by the configure script to the list of directories which
  # should be built using the target tools.
! TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib librx winsup opcodes bsp libstub cygmon libf2c libchill libobjc
  
  # Target libraries are put under this directory:
*************** HOST_LIB_PATH = $$r/bfd:$$r/opcodes
*** 211,215 ****
  # This is the list of directories that may be needed in RPATH_ENVVAR
  # so that prorgams built for the target machine work.
! TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libstdc++
  
  # configure.in sets SET_LIB_PATH to this if --enable-shared was used.
--- 210,214 ----
  # This is the list of directories that may be needed in RPATH_ENVVAR
  # so that prorgams built for the target machine work.
! TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
  
  # configure.in sets SET_LIB_PATH to this if --enable-shared was used.
*************** CHILL_FOR_TARGET =
*** 240,243 ****
--- 239,243 ----
  CXX_FOR_TARGET =
  CXX_FOR_TARGET_FOR_RECURSIVE_MAKE =
+ GCJ_FOR_TARGET =
  
  # If GCC_FOR_TARGET is not overriden on the command line, then this
*************** BASE_FLAGS_TO_PASS = \
*** 363,366 ****
--- 363,367 ----
  	"CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
  	"CHILL_LIB=$(CHILL_LIB)" \
+ 	"GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
  	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
  	"CXXFLAGS=$(CXXFLAGS)" \
*************** BASE_FLAGS_TO_PASS = \
*** 400,403 ****
--- 401,406 ----
  	"libexecdir=$(libexecdir)" \
  	"lispdir=$(lispdir)" \
+ 	"libstdcxx_incdir=$(libstdcxx_incdir)" \
+ 	"libsubdir=$(libsubdir)" \
  	"localstatedir=$(localstatedir)" \
  	"mandir=$(mandir)" \
*************** BASE_FLAGS_TO_PASS = \
*** 412,417 ****
  	"gcc_version=$(gcc_version)" \
  	"gcc_version_trigger=$(gcc_version_trigger)" \
! 	"target_alias=$(target_alias)" \
! 	"libsubdir=$(libsubdir)"
  
  # For any flags above that may contain shell code that varies from one
--- 415,419 ----
  	"gcc_version=$(gcc_version)" \
  	"gcc_version_trigger=$(gcc_version_trigger)" \
! 	"target_alias=$(target_alias)" 
  
  # For any flags above that may contain shell code that varies from one
*************** EXTRA_HOST_FLAGS = \
*** 434,438 ****
  	'LD=$(LD)' \
  	'NM=$(NM)' \
! 	'RANLIB=$(RANLIB)' \
  	'WINDRES=$(WINDRES)'
  
--- 436,440 ----
  	'LD=$(LD)' \
  	'NM=$(NM)' \
! 	"`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
  	'WINDRES=$(WINDRES)'
  
*************** EXTRA_GCC_FLAGS = \
*** 488,494 ****
  	'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
  	'NM=$(NM)' \
! 	'RANLIB=$(RANLIB)' \
  	'WINDRES=$$(WINDRES_FOR_TARGET)' \
  	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
  	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
  	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \
--- 490,497 ----
  	'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
  	'NM=$(NM)' \
! 	"`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
  	'WINDRES=$$(WINDRES_FOR_TARGET)' \
  	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
+ 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
  	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
  	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \
*************** EXTRA_GCC_FLAGS = \
*** 499,502 ****
--- 502,506 ----
  	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \
  	"`echo 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \
+ 	"`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
  	"`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`"
  
*************** ALL_MODULES = \
*** 535,538 ****
--- 539,543 ----
  	all-dosutils \
  	all-etc \
+ 	all-fastjar \
  	all-fileutils \
  	all-findutils \
*************** NATIVE_CHECK_MODULES = \
*** 596,599 ****
--- 601,605 ----
  	check-bison \
  	check-byacc \
+ 	check-fastjar \
  	check-flex \
  	check-zip
*************** INSTALL_MODULES = \
*** 688,691 ****
--- 694,698 ----
  	install-dosutils \
  	install-etc \
+ 	install-fastjar \
  	install-fileutils \
  	install-findutils \
*************** INSTALL_X11_MODULES = \
*** 779,787 ****
  # using $(TARGET_FLAGS_TO_PASS).
  ALL_TARGET_MODULES = \
- 	all-target-libio \
- 	all-target-libstdc++ \
  	all-target-libstdc++-v3 \
  	all-target-librx \
- 	all-target-libg++ \
  	all-target-newlib \
  	all-target-libf2c \
--- 786,791 ----
*************** ALL_TARGET_MODULES = \
*** 806,814 ****
  # are compiled using the target tools.
  CONFIGURE_TARGET_MODULES = \
- 	configure-target-libio \
- 	configure-target-libstdc++ \
  	configure-target-libstdc++-v3 \
  	configure-target-librx \
- 	configure-target-libg++ \
  	configure-target-newlib \
  	configure-target-libf2c \
--- 810,815 ----
*************** CONFIGURE_TARGET_MODULES = \
*** 833,840 ****
  # compiled using $(TARGET_FLAGS_TO_PASS).
  CHECK_TARGET_MODULES = \
- 	check-target-libio \
- 	check-target-libstdc++ \
  	check-target-libstdc++-v3 \
- 	check-target-libg++ \
  	check-target-newlib \
  	check-target-libf2c \
--- 834,838 ----
*************** CHECK_TARGET_MODULES = \
*** 853,860 ****
  # compiled using $(TARGET_FLAGS_TO_PASS).
  INSTALL_TARGET_MODULES = \
- 	install-target-libio \
- 	install-target-libstdc++ \
  	install-target-libstdc++-v3 \
- 	install-target-libg++ \
  	install-target-newlib \
  	install-target-libf2c \
--- 851,855 ----
*************** CLEAN_MODULES = \
*** 891,894 ****
--- 886,890 ----
  	clean-dosutils \
  	clean-etc \
+ 	clean-fastjar \
  	clean-fileutils \
  	clean-findutils \
*************** CLEAN_MODULES = \
*** 943,951 ****
  # All of the target modules that can be cleaned
  CLEAN_TARGET_MODULES = \
- 	clean-target-libio \
- 	clean-target-libstdc++ \
  	clean-target-libstdc++-v3 \
  	clean-target-librx \
- 	clean-target-libg++ \
  	clean-target-newlib \
  	clean-target-libf2c \
--- 939,944 ----
*************** $(DO_X):
*** 1027,1031 ****
  	        $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
! 			"RANLIB=$${RANLIB}" \
  			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
  			$${target}); \
--- 1020,1024 ----
  	        $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
! 	                "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
  			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
  			$${target}); \
*************** $(DO_X):
*** 1045,1049 ****
  	        $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
! 			"RANLIB=$${RANLIB}" \
  			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
  			$${target}); \
--- 1038,1042 ----
  	        $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
! 	                "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \
  			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
  			$${target}); \
*************** local-distclean:
*** 1078,1081 ****
--- 1071,1079 ----
  	  rm -rf $(TARGET_SUBDIR); \
  	else true; fi
+ 	-rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
+ 	-rm -f texinfo/doc/Makefile texinfo/po/POTFILES
+ 	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
+ 	-rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
+ 	-rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
  
  local-maintainer-clean:
*************** $(CONFIGURE_TARGET_MODULES):
*** 1426,1429 ****
--- 1424,1428 ----
  	    CXX="$(CXX_FOR_TARGET)"; export CXX; \
  	    CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+ 	    GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
  	    DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
  	    LD="$(LD_FOR_TARGET)"; export LD; \
*************** $(CONFIGURE_TARGET_MODULES):
*** 1433,1439 ****
  	    WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
  	    echo Configuring in $(TARGET_SUBDIR)/$${dir}; \
! 	    cd $(TARGET_SUBDIR)/$${dir}; \
  	    case $(srcdir) in \
! 	    /*) \
  	      topdir=$(srcdir) ;; \
  	    *) \
--- 1432,1438 ----
  	    WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
  	    echo Configuring in $(TARGET_SUBDIR)/$${dir}; \
! 	    cd "$(TARGET_SUBDIR)/$${dir}" || exit 1; \
  	    case $(srcdir) in \
! 	    /* | [A-Za-z]:[\\/]*) \
  	      topdir=$(srcdir) ;; \
  	    *) \
*************** $(CONFIGURE_TARGET_MODULES):
*** 1477,1481 ****
  		$(TARGET_CONFIGARGS) $${srcdiroption} \
  		--with-target-subdir="$(TARGET_SUBDIR)"; \
! 	    fi; \
  	    if [ -f skip-this-dir ] ; then \
  	      sh skip-this-dir; \
--- 1476,1480 ----
  		$(TARGET_CONFIGARGS) $${srcdiroption} \
  		--with-target-subdir="$(TARGET_SUBDIR)"; \
! 	    fi || exit 1; \
  	    if [ -f skip-this-dir ] ; then \
  	      sh skip-this-dir; \
*************** check-gcc:
*** 1659,1662 ****
--- 1658,1673 ----
  	fi
  
+ .PHONY: check-c++
+ check-c++:
+ 	@if [ -f ./gcc/Makefile ] ; then \
+ 	  r=`pwd`; export r; \
+ 	  s=`cd $(srcdir); pwd`; export s; \
+ 	  $(SET_LIB_PATH) \
+ 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
+ 	  $(MAKE) check-target-libstdc++-v3; \
+ 	else \
+ 	  true; \
+ 	fi 
+ 
  .PHONY: install-gcc
  install-gcc:
*************** install-dosrel-fake:
*** 1699,1703 ****
  ALL_GCC = all-gcc
  ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
! ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++ all-target-libstdc++-v3
  
  # This is a list of inter-dependencies among modules.
--- 1710,1714 ----
  ALL_GCC = all-gcc
  ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
! ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3
  
  # This is a list of inter-dependencies among modules.
*************** all-bfd: all-libiberty all-intl
*** 1710,1714 ****
  all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl
  all-bison: all-texinfo
! configure-target-boehm-gc: $(ALL_GCC_CXX) configure-target-qthreads
  all-target-boehm-gc: configure-target-boehm-gc
  configure-target-bsp: $(ALL_GCC_C)
--- 1721,1725 ----
  all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl
  all-bison: all-texinfo
! configure-target-boehm-gc: $(ALL_GCC_C) configure-target-qthreads
  all-target-boehm-gc: configure-target-boehm-gc
  configure-target-bsp: $(ALL_GCC_C)
*************** all-cgen: all-libiberty
*** 1719,1723 ****
  all-cvssrc:
  configure-target-cygmon: $(ALL_GCC_C)
! all-target-cygmon: configure-target-cygmon all-target-libiberty all-target-libio all-target-libstub all-target-bsp
  all-db:
  all-dejagnu: all-tcl all-expect all-tk
--- 1730,1734 ----
  all-cvssrc:
  configure-target-cygmon: $(ALL_GCC_C)
! all-target-cygmon: configure-target-cygmon all-target-libiberty all-target-libstub all-target-bsp
  all-db:
  all-dejagnu: all-tcl all-expect all-tk
*************** all-ispell: all-emacs19
*** 1757,1767 ****
  all-itcl: all-tcl all-tk all-tcl8.1 all-tk8.1
  all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex all-intl
- configure-target-libg++: $(ALL_GCC_CXX) configure-target-librx
- all-target-libg++: configure-target-libg++ all-target-libiberty all-target-librx
  configure-target-libgloss: $(ALL_GCC)
  all-target-libgloss: configure-target-libgloss configure-target-newlib
- configure-target-libio: $(ALL_GCC_C)
- all-target-libio: configure-target-libio all-gas all-ld all-gcc all-target-libiberty all-target-newlib
- check-target-libio: all-target-libstdc++
  all-libgui: all-tcl all-tk all-tcl8.1 all-tk8.1 all-itcl
  all-libiberty:
--- 1768,1773 ----
*************** all-build-libiberty: configure-build-lib
*** 1771,1780 ****
  configure-target-libffi: $(ALL_GCC_C) 
  all-target-libffi: configure-target-libffi
! configure-target-libjava: $(ALL_GCC_CXX) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
! all-target-libjava: configure-target-libjava all-zip all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
  configure-target-librx: $(ALL_GCC_C)
  all-target-librx: configure-target-librx
- configure-target-libstdc++: $(ALL_GCC_C)
- all-target-libstdc++: configure-target-libstdc++ all-target-libiberty all-target-libio
  configure-target-libstdc++-v3: $(ALL_GCC_C)
  all-target-libstdc++-v3: configure-target-libstdc++-v3 all-target-libiberty
--- 1777,1784 ----
  configure-target-libffi: $(ALL_GCC_C) 
  all-target-libffi: configure-target-libffi
! configure-target-libjava: $(ALL_GCC_C) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
! all-target-libjava: configure-target-libjava all-fastjar all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
  configure-target-librx: $(ALL_GCC_C)
  all-target-librx: configure-target-librx
  configure-target-libstdc++-v3: $(ALL_GCC_C)
  all-target-libstdc++-v3: configure-target-libstdc++-v3 all-target-libiberty
*************** all-zlib:
*** 1829,1832 ****
--- 1833,1839 ----
  configure-target-zlib: $(ALL_GCC_C)
  all-target-zlib: configure-target-zlib
+ all-fastjar: all-zlib all-libiberty
+ configure-target-fastjar: configure-target-zlib
+ all-target-fastjar: configure-target-fastjar all-target-zlib all-target-libiberty
  configure-target-libiberty: $(ALL_GCC_C)
  all-target-libiberty: configure-target-libiberty
*************** gas+binutils.tar.bz2: $(DIST_SUPPORT) $(
*** 2075,2085 ****
  		MD5PROG="$(MD5PROG)" \
  		SUPPORT_FILES="$(GASB_SUPPORT_DIRS)"
- 
- .PHONY: libg++.tar.bz2
- LIBGXX_SUPPORT_DIRS=include libstdc++ libio librx libiberty
- libg++.tar.bz2: $(DIST_SUPPORT) libg++
- 	$(MAKE) -f Makefile.in taz TOOL=libg++ \
- 		MD5PROG="$(MD5PROG)" \
- 		SUPPORT_FILES="$(LIBGXX_SUPPORT_DIRS)"
  
  GNATS_SUPPORT_DIRS=include libiberty send-pr
--- 2082,2085 ----
Index: configure
===================================================================
RCS file: /cvs/src/src/configure,v
retrieving revision 1.13
diff -p -2 -r1.13 configure
*** configure	28 Nov 2001 19:55:01 -0000	1.13
--- configure	13 Apr 2002 03:32:27 -0000
***************
*** 4,8 ****
  
  # Configuration script
! # Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999
  # Free Software Foundation, Inc.
  
--- 4,8 ----
  
  # Configuration script
! # Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001
  # Free Software Foundation, Inc.
  
*************** configdirs=
*** 54,57 ****
--- 54,60 ----
  extraconfigdirs=
  diroptions=
+ enable_threads=no
+ enable_shared=no
+ enable_libstdcxx_v3=yes
  exec_prefix=
  exec_prefixoption=
*************** target_alias=NOTARGET
*** 87,91 ****
  target_makefile_frag=
  undefs=NOUNDEFS
! version="$Revision: 1.13 $"
  x11=default
  bindir='${exec_prefix}/bin'
--- 90,94 ----
  target_makefile_frag=
  undefs=NOUNDEFS
! version="$Revision: 1.40 $"
  x11=default
  bindir='${exec_prefix}/bin'
*************** if [ -n "$PWD" ]; then PWD=`pwd`; fi
*** 153,157 ****
  
  case "${progname}" in
! /*) ;;
  */*) ;;
  *)
--- 156,160 ----
  
  case "${progname}" in
! /* | [A-Za-z]:[\\/]* ) ;;
  */*) ;;
  *)
*************** case "${progname}" in
*** 160,163 ****
--- 163,170 ----
  esac
  
+ # Export original configure arguments for use by sub-configures.
+ TOPLEVEL_CONFIGURE_ARGUMENTS="$progname $@"
+ export TOPLEVEL_CONFIGURE_ARGUMENTS
+ 
  # Loop over all args
  
*************** esac
*** 657,661 ****
  
  # keep this filename short for &%*%$*# 14 char file names and 8+3 file names
! tmpfile=${TMPDIR}/cNf$$
  # Note that under many versions of sh a trap handler for 0 will *override* any
  # exit status you explicitly specify!  At this point, the only non-error exit
--- 664,670 ----
  
  # keep this filename short for &%*%$*# 14 char file names and 8+3 file names
! tmpdir=${TMPDIR}/cNf$$
! mkdir ${tmpdir} || exit 1
! tmpfile=${tmpdir}/cNf$$
  # Note that under many versions of sh a trap handler for 0 will *override* any
  # exit status you explicitly specify!  At this point, the only non-error exit
*************** tmpfile=${TMPDIR}/cNf$$
*** 663,667 ****
  # the "exit 1".  Don't use "exit 0" anywhere after this without resetting the
  # trap handler, or you'll lose.
! trap "rm -f Makefile.tem ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos; exit 1" 0 1 2 15
  
  # split ${srcdir}/configure.in into common, per-host, per-target,
--- 672,676 ----
  # the "exit 1".  Don't use "exit 0" anywhere after this without resetting the
  # trap handler, or you'll lose.
! trap "rm -rf Makefile.tem ${tmpdir}; exit 1" 0 1 2 15
  
  # split ${srcdir}/configure.in into common, per-host, per-target,
*************** if test -f skip-this-dir; then
*** 690,694 ****
  	# and reset the trap handler.
  	trap 0
! 	rm -f Makefile* ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
  	# Execute the final clean-up actions
  	${config_shell} skip-this-dir
--- 699,703 ----
  	# and reset the trap handler.
  	trap 0
! 	rm -rf Makefile* ${tmpdir}
  	# Execute the final clean-up actions
  	${config_shell} skip-this-dir
*************** if [ "${build}" != "${host}" ]; then
*** 908,912 ****
  
    tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD"
!   tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET"
    tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX"
    tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
--- 917,921 ----
  
    tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD"
!   tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET GCJ_FOR_TARGET"
    tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX"
    tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
*************** t loop
*** 943,946 ****
--- 952,956 ----
    CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc}
    CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
+   GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj}
    DLLTOOL=${DLLTOOL-${host_alias}-dlltool}
    DLLTOOL_FOR_TARGET=${DLLTOOL_FOR_TARGET-${target_alias}-dlltool}
*************** for subdir in . ${subdirs} ; do
*** 1096,1100 ****
          ".")  # no -srcdir option.  We're building in place.
                  makesrcdir=. ;;
!         /*) # absolute path
                  makesrcdir=`echo ${srcdir}/${subdir} | sed -e 's|/\.$||'`
                  ;;
--- 1106,1110 ----
          ".")  # no -srcdir option.  We're building in place.
                  makesrcdir=. ;;
!         /* | [A-Za-z]:[\\/]* ) # absolute path
                  makesrcdir=`echo ${srcdir}/${subdir} | sed -e 's|/\.$||'`
                  ;;
*************** EOF
*** 1292,1296 ****
              # real copy now in ${subdir}/Makefile.tem
  
!             # prepend warning about editting, and a bunch of variables.
              rm -f ${Makefile}
              cat > ${Makefile} <<EOF
--- 1302,1306 ----
              # real copy now in ${subdir}/Makefile.tem
  
!             # prepend warning about editing, and a bunch of variables.
              rm -f ${Makefile}
              cat > ${Makefile} <<EOF
*************** EOF
*** 1322,1326 ****
              case "${package_makefile_frag}" in
                "") ;;
!               /*) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
                *)  echo package_makefile_frag = ${invsubdir}${package_makefile_frag} >>${Makefile} ;;
              esac
--- 1332,1336 ----
              case "${package_makefile_frag}" in
                "") ;;
!               /* | [A-Za-z]:[\\/]* ) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
                *)  echo package_makefile_frag = ${invsubdir}${package_makefile_frag} >>${Makefile} ;;
              esac
*************** EOF
*** 1328,1332 ****
              case "${target_makefile_frag}" in
                "") ;;
!               /*) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
                *)  echo target_makefile_frag = ${invsubdir}${target_makefile_frag} >>${Makefile} ;;
              esac
--- 1338,1342 ----
              case "${target_makefile_frag}" in
                "") ;;
!               /* | [A-Za-z]:[\\/]* ) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
                *)  echo target_makefile_frag = ${invsubdir}${target_makefile_frag} >>${Makefile} ;;
              esac
*************** EOF
*** 1334,1338 ****
              case "${host_makefile_frag}" in
                "") ;;
!               /*) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
                *)  echo host_makefile_frag = ${invsubdir}${host_makefile_frag} >>${Makefile} ;;
              esac
--- 1344,1348 ----
              case "${host_makefile_frag}" in
                "") ;;
!               /* | [A-Za-z]:[\\/]* ) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
                *)  echo host_makefile_frag = ${invsubdir}${host_makefile_frag} >>${Makefile} ;;
              esac
*************** EOF
*** 1342,1351 ****
              fi 
  
! 	    # record if we want to build shared libs.
! 	    if test -z "${enable_shared}"; then
! 	        echo enable_shared = no >> ${Makefile}
! 	    else
! 	        echo enable_shared = ${enable_shared} >> ${Makefile}
! 	    fi
  	    # record if we want to rumtime library stuff installed in libsubdir.
  	    if test -z "${enable_version_specific_runtime_libs}"; then
--- 1352,1357 ----
              fi 
  
! 	    echo enable_shared = ${enable_shared} >> ${Makefile}
! 	    echo enable_threads = ${enable_threads} >> ${Makefile}
  	    # record if we want to rumtime library stuff installed in libsubdir.
  	    if test -z "${enable_version_specific_runtime_libs}"; then
*************** EOF
*** 1365,1371 ****
              if [ -z "${subdirs}" ]; then
                  rm -f ${subdir}/Makefile.tm2
!                 sed -e "s:^SUBDIRS[ 	]*=.*$:SUBDIRS = ${configdirs}:" \
!                     -e "s:^NONSUBDIRS[ 	]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \
                      ${subdir}/Makefile.tem > ${subdir}/Makefile.tm2
                  rm -f ${subdir}/Makefile.tem
                  mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem
--- 1371,1382 ----
              if [ -z "${subdirs}" ]; then
                  rm -f ${subdir}/Makefile.tm2
!                 sedtemp=sed.$$
!                 cat >$sedtemp <<EOF
! s:^SUBDIRS[ 	]*=.*$:SUBDIRS = ${configdirs}:
! s:^NONSUBDIRS[ 	]*=.*$:NONSUBDIRS = ${noconfigdirs}:
! EOF
!                 sed -f $sedtemp \
                      ${subdir}/Makefile.tem > ${subdir}/Makefile.tm2
+                 rm -f $sedtemp
                  rm -f ${subdir}/Makefile.tem
                  mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem
*************** if [ -z "${norecursion}" ] && [ -n "${co
*** 1550,1558 ****
                          case "${srcdir}" in
                          ".") newsrcdir=${srcdir} ;; # no -srcdir option.  We're building in place.
!                         /*) # absolute path
!                                 newsrcdir=${srcdir}/${cfg_dir}
!                                 srcdiroption="--srcdir=${newsrcdir}"
!                                 ;;
!                         ?:*) # absolute path on win32
                                  newsrcdir=${srcdir}/${cfg_dir}
                                  srcdiroption="--srcdir=${newsrcdir}"
--- 1561,1565 ----
                          case "${srcdir}" in
                          ".") newsrcdir=${srcdir} ;; # no -srcdir option.  We're building in place.
!                         /* | [A-Za-z]:[\\/]* ) # absolute path
                                  newsrcdir=${srcdir}/${cfg_dir}
                                  srcdiroption="--srcdir=${newsrcdir}"
*************** if [ -z "${norecursion}" ] && [ -n "${co
*** 1568,1575 ****
  			"") # empty
  				;;
! 			/*) # absolute path
! 				cache_file_option="--cache-file=${cache_file}"
! 				;;
! 			?:*) # absolute path on win32
  				cache_file_option="--cache-file=${cache_file}"
  				;;
--- 1575,1579 ----
  			"") # empty
  				;;
! 			/* | [A-Za-z]:[\\/]* ) # absolute path
  				cache_file_option="--cache-file=${cache_file}"
  				;;
*************** if [ -z "${norecursion}" ] && [ -n "${co
*** 1584,1590 ****
                          elif [ -f ${newsrcdir}/configure.in ] ; then
                                  case "${progname}" in
!                                 /*)     recprog=${progname} ;;
!                                 ?:*)    recprog=${progname} ;;
!                                 *)      recprog=../${progname} ;;
                                  esac
  			else
--- 1588,1593 ----
                          elif [ -f ${newsrcdir}/configure.in ] ; then
                                  case "${progname}" in
!                                 /* | [A-Za-z]:[\\/]* )  recprog=${progname} ;;
!                                 *)                      recprog=../${progname} ;;
                                  esac
  			else
*************** fi
*** 1612,1616 ****
  # Perform the same cleanup as the trap handler, minus the "exit 1" of course,
  # and reset the trap handler.
! rm -f ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
  trap 0
  
--- 1615,1619 ----
  # Perform the same cleanup as the trap handler, minus the "exit 1" of course,
  # and reset the trap handler.
! rm -rf ${tmpdir}
  trap 0
  
Index: configure.in
===================================================================
RCS file: /cvs/src/src/configure.in,v
retrieving revision 1.53
diff -p -2 -r1.53 configure.in
*** configure.in	10 Apr 2002 02:13:43 -0000	1.53
--- configure.in	13 Apr 2002 03:32:27 -0000
***************
*** 15,19 ****
  ## for 'Autoconf' (autoconf.texi) and 'Configure' (configure.texi).  
  
! #   Copyright (C) 1992-99, 2000, 2001 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify it
--- 15,20 ----
  ## for 'Autoconf' (autoconf.texi) and 'Configure' (configure.texi).  
  
! #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
! #   1999, 2000, 2001, 2002 Free Software Foundation, Inc.
  #
  # This file is free software; you can redistribute it and/or modify it
***************
*** 42,46 ****
  # these libraries are used by various programs built for the host environment
  #
! host_libs="intl mmalloc libiberty opcodes bfd readline gash db tcl tk tcl8.1 tk8.1 tclX itcl tix libgui"
  
  if [ "${enable_gdbgui}" = "yes" ] ; then
--- 43,47 ----
  # these libraries are used by various programs built for the host environment
  #
! host_libs="intl mmalloc libiberty opcodes bfd readline gash db tcl tk tcl8.1 tk8.1 tclX itcl tix libgui zlib"
  
  if [ "${enable_gdbgui}" = "yes" ] ; then
*************** libstdcxx_flags='`case $$dir in libstdc+
*** 55,59 ****
  # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
  # know that we are building the simulator.
! host_tools="texinfo byacc flex bison binutils ld gas gcc cgen sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find emacs emacs19 uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip"
  
  # these libraries are built for the target environment, and are built after
--- 56,67 ----
  # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
  # know that we are building the simulator.
! host_tools="texinfo byacc flex bison binutils ld gas gcc cgen sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find emacs emacs19 uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip fastjar"
! 
! # libgcj represents the runtime libraries only used by gcj.
! libgcj="target-libffi \
! 	target-boehm-gc \
! 	target-zlib \
! 	target-qthreads \
! 	target-libjava"
  
  # these libraries are built for the target environment, and are built after
*************** target_libs="target-libiberty \
*** 63,74 ****
  		target-libgloss \
  		target-newlib \
  		${libstdcxx_version} \
  		target-libf2c \
  		target-libchill \
! 		target-libffi \
! 		target-libjava \
! 		target-zlib \
! 		target-boehm-gc \
! 		target-qthreads \
  		target-libobjc"
  
--- 71,79 ----
  		target-libgloss \
  		target-newlib \
+ 		target-librx \
  		${libstdcxx_version} \
  		target-libf2c \
  		target-libchill \
! 		${libgcj}
  		target-libobjc"
  
*************** if false && [ "${host}" = "${target}" ] 
*** 277,280 ****
--- 282,293 ----
  fi
  
+ # hpux11 in 64bit mode has libraries in a weird place.  Arrange to find
+ # them automatically.
+ case "${host}" in
+   hppa*64*-*-hpux11*)	
+     withoptions="$withoptions -x-libraries=/usr/lib/pa20_64 -x-includes=/usr/X11R6/include"
+     ;;
+ esac
+ 
  case "${enable_shared}" in
    yes) shared=yes ;;
*************** if [ x${shared} = xyes ]; then
*** 292,296 ****
        host_makefile_frag="${host_makefile_frag} config/mh-armpic"
        ;;
!     hppa*-*-*)
        host_makefile_frag="${host_makefile_frag} config/mh-papic"
        ;;
--- 305,309 ----
        host_makefile_frag="${host_makefile_frag} config/mh-armpic"
        ;;
!     parisc*-*-* | hppa*-*-*)
        host_makefile_frag="${host_makefile_frag} config/mh-papic"
        ;;
*************** case "${target}" in
*** 348,352 ****
      target_makefile_frag="${target_makefile_frag} config/mt-netware"
      ;;
!   *-*-linux-gnu*)
      target_makefile_frag="${target_makefile_frag} config/mt-linux"
      ;;
--- 361,372 ----
      target_makefile_frag="${target_makefile_frag} config/mt-netware"
      ;;
!   alpha*-*-linux*)
!     target_makefile_frag="${target_makefile_frag} config/mt-linux"
!     target_makefile_frag="${target_makefile_frag} config/mt-alphaieee"
!     ;;
!   alpha*-*-*)
!     target_makefile_frag="${target_makefile_frag} config/mt-alphaieee"
!     ;;
!   *-*-linux*)
      target_makefile_frag="${target_makefile_frag} config/mt-linux"
      ;;
*************** noconfigdirs=""
*** 551,559 ****
  
  case "${host}" in
    i[3456]86-*-vsta)
      noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv gettext"
      ;;
    i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*)
!     noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv gettext libffi"
  	;;
    i[3456]86-*-mingw32*)
--- 571,582 ----
  
  case "${host}" in
+   hppa*64*-*-*)
+     noconfigdirs="$noconfigdirs byacc"
+     ;;
    i[3456]86-*-vsta)
      noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv gettext"
      ;;
    i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*)
!     noconfigdirs="tcl tk expect dejagnu send-pr uudecode guile apache inet itcl tix db snavigator gnuserv libffi"
  	;;
    i[3456]86-*-mingw32*)
*************** case "${host}" in
*** 578,582 ****
  esac
  
- 
  # Save it here so that, even in case of --enable-libgcj, if the Java
  # front-end isn't enabled, we still get libgcj disabled.
--- 601,604 ----
*************** esac
*** 596,599 ****
--- 618,624 ----
  
  case "${target}" in
+   *-*-chorusos)
+     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
+     ;;
    *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
      noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
*************** case "${target}" in
*** 605,621 ****
      # Skip some stuff that's unsupported on some NetBSD configurations.
      case "${target}" in
        *)
!         noconfigdirs="$noconfigdirs ${libgcj}"
  	;;
      esac
      ;;
    *-*-netware)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-newlib target-libiberty target-libgloss target-libffi"
      ;;
    *-*-rtems*)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    *-*-vxworks*)
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libffi"
      ;;
    alpha*-dec-osf*)
--- 630,647 ----
      # Skip some stuff that's unsupported on some NetBSD configurations.
      case "${target}" in
+       i*86-*-netbsdelf*) ;;
        *)
! 	noconfigdirs="$noconfigdirs ${libgcj}"
  	;;
      esac
      ;;
    *-*-netware)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-librx target-newlib target-libiberty target-libgloss ${libgcj}"
      ;;
    *-*-rtems*)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    *-*-vxworks*)
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
      ;;
    alpha*-dec-osf*)
*************** case "${target}" in
*** 626,630 ****
      ;;
    alpha*-*-*vms*)
!     noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss target-libffi"
      ;;
    alpha*-*-freebsd*)
--- 652,662 ----
      ;;
    alpha*-*-*vms*)
!     noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss ${libgcj}"
!     ;;
!   alpha*-*-linux*)
!     # newlib is not 64 bit ready
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
!     # linux has rx in libc
!     skipdirs="$skipdirs target-librx"
      ;;
    alpha*-*-freebsd*)
*************** case "${target}" in
*** 633,641 ****
    alpha*-*-*)
      # newlib is not 64 bit ready
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
      ;;
    sh*-*-pe|mips*-*-pe|*arm-wince-pe)
!     noconfigdirs="$noconfigdirs target-libjava target-libffi target-zlib"
!     noconfigdirs="$noconfigdirs target-boehm-gc target-qthreads target-examples"
      noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr"
      noconfigdirs="$noconfigdirs tcl tix tk itcl libgui sim"
--- 665,678 ----
    alpha*-*-*)
      # newlib is not 64 bit ready
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
      ;;
+   sh-*-linux*)
+     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+     # linux has rx in libc
+     skipdirs="$skipdirs target-librx"
+     ;;    
    sh*-*-pe|mips*-*-pe|*arm-wince-pe)
!     noconfigdirs="$noconfigdirs ${libgcj}"
!     noconfigdirs="$noconfigdirs target-examples"
      noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr"
      noconfigdirs="$noconfigdirs tcl tix tk itcl libgui sim"
*************** case "${target}" in
*** 651,713 ****
      ;;
    arc-*-*)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    arm-*-pe*)
!     noconfigdirs="$noconfigdirs target-libgloss"
      ;;
    arm-*-oabi*)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    thumb-*-coff)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    thumb-*-elf)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    thumb-*-oabi)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    strongarm-*-elf)
!     noconfigdirs="$noconfigdirs target-libffi"
!     if [ x${is_cross_compiler} != xno ] ; then
! 	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
!     fi
      ;;
    strongarm-*-coff)
!     noconfigdirs="$noconfigdirs target-libffi"
!     if [ x${is_cross_compiler} != xno ] ; then
! 	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
!     fi
      ;;
    xscale-*-elf)
!     noconfigdirs="$noconfigdirs target-libffi"
!     if [ x${is_cross_compiler} != xno ] ; then
! 	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
!     fi
      ;;
    xscale-*-coff)
!     noconfigdirs="$noconfigdirs target-libffi"
!     if [ x${is_cross_compiler} != xno ] ; then
! 	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
!     fi
      ;;
    thumb-*-pe)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    arm-*-riscix*)
!     noconfigdirs="$noconfigdirs ld target-libgloss target-libffi"
      ;;
    c4x-*-*)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
      ;;
    c54x*-*-* | tic54x-*-*)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi gcc gdb newlib"
      ;;
    d10v-*-*)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
      ;;
    d30v-*-*)
      ;;
    fr30-*-elf*)
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
--- 688,743 ----
      ;;
    arc-*-*)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    arm-*-pe*)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    arm-*-oabi*)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    thumb-*-coff)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    thumb-*-elf)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    thumb-*-oabi)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    strongarm-*-elf)
!     noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
    strongarm-*-coff)
!     noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
    xscale-*-elf)
!     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
      ;;
    xscale-*-coff)
!     noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
    thumb-*-pe)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    arm-*-riscix*)
!     noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
      ;;
    c4x-*-*)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-librx target-libgloss ${libgcj}"
      ;;
    c54x*-*-* | tic54x-*-*)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss ${libgcj} gcc gdb newlib"
!     ;;
!   cris-*-*)
!     noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
    d10v-*-*)
!     noconfigdirs="$noconfigdirs target-librx ${libstdcxx_version} target-libgloss ${libgcj}"
      ;;
    d30v-*-*)
+     noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
    fr30-*-elf*)
+     noconfigdirs="$noconfigdirs ${libgcj}"
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
*************** case "${target}" in
*** 718,727 ****
      ;;
    h8500-*-*)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
      ;;
    hppa*-*-*elf* | \
!   hppa*-*-linux-gnu* | \
    hppa*-*-lites* | \
    hppa*64*-*-*)
      # Do configure ld/binutils/gas for this case.
      ;;
--- 748,764 ----
      ;;
    h8500-*-*)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-librx target-libgloss ${libgcj} target-libf2c"
!     ;;
!   hppa*64*-*-linux* | parisc*64*-*-linux*)
!     # In this case, it's because the hppa64-linux target is for
!     # the kernel only at this point and has no libc, and thus no
!     # headers, crt*.o, etc., all of which are needed by these.
!     noconfigdirs="$noconfigdirs target-zlib"
      ;;
    hppa*-*-*elf* | \
!   parisc*-*-linux* | hppa*-*-linux* | \
    hppa*-*-lites* | \
    hppa*64*-*-*)
+     noconfigdirs="$noconfigdirs ${libgcj}"
      # Do configure ld/binutils/gas for this case.
      ;;
*************** case "${target}" in
*** 747,750 ****
--- 784,788 ----
      ;;
    i[3456]86-*-coff | i[3456]86-*-elf)
+     noconfigdirs="$noconfigdirs ${libgcj}"
      if [ x${is_cross_compiler} != xno ] ; then
           target_configdirs="${target_configdirs} target-libstub target-cygmon"
*************** case "${target}" in
*** 754,760 ****
      noconfigdirs="$noconfigdirs target-newlib target-libgloss"
      ;;
!   i[3456]86-*-go32* | i[3456]-*-msdosdjgpp*)
!     # but don't build gdb
!     noconfigdirs="$noconfigdirs gdb ${libstdcxx_version} target-libffi"
      ;;
    i[3456]86-*-mingw32*)
--- 792,799 ----
      noconfigdirs="$noconfigdirs target-newlib target-libgloss"
      ;;
!   *-*-linux*)
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
!     # linux has rx in libc
!     skipdirs="$skipdirs target-librx"
      ;;
    i[3456]86-*-mingw32*)
*************** case "${target}" in
*** 783,795 ****
      ;;    
    i[3456]86-*-pe)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
      ;;
    i[3456]86-*-sco3.2v5*)
      # The linker does not yet know about weak symbols in COFF,
      # and is not configured to handle mixed ELF and COFF.
!     noconfigdirs="$noconfigdirs ld target-libgloss target-libffi"
      ;;
    i[3456]86-*-sco*)
!     noconfigdirs="$noconfigdirs gprof target-libgloss target-libffi"
      ;;
    i[3456]86-*-solaris2*)
--- 822,834 ----
      ;;    
    i[3456]86-*-pe)
!     noconfigdirs="$noconfigdirs ${libstdcxx_version} target-librx target-libgloss ${libgcj}"
      ;;
    i[3456]86-*-sco3.2v5*)
      # The linker does not yet know about weak symbols in COFF,
      # and is not configured to handle mixed ELF and COFF.
!     noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
      ;;
    i[3456]86-*-sco*)
!     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
      ;;
    i[3456]86-*-solaris2*)
*************** case "${target}" in
*** 803,815 ****
      esac
      # but that's okay since emacs doesn't work anyway
!     noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss target-libffi"
      ;;
    i[3456]86-*-beos*)
       noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
       ;;
!  m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
!     noconfigdirs="$noconfigdirs target-libiberty target-librx target-libg++ target-libstdc++ target-libio target-libf2c target-libchill target-zlib target-libobjc"
      ;;
!  m68k-*-elf*)
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
--- 842,855 ----
      esac
      # but that's okay since emacs doesn't work anyway
!     noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss ${libgcj}"
      ;;
    i[3456]86-*-beos*)
       noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
       ;;
!   m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
!     noconfigdirs="$noconfigdirs target-libiberty ${libstdcxx_version} ${libgcj}"
      ;;
!   m68k-*-elf*)
!     noconfigdirs="$noconfigdirs ${libgcj}"
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
*************** case "${target}" in
*** 817,826 ****
      ;;
    m68k-*-coff*)
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
      fi
      ;;
    mn10200-*-*)
!     noconfigdirs="$noconfigdirs target-libffi"
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-libstub target-cygmon"
--- 857,875 ----
      ;;
    m68k-*-coff*)
+     noconfigdirs="$noconfigdirs ${libgcj}"
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
      fi
      ;;
+   mcore-*-pe*)
+   # The EPOC C++ environment does not support exceptions or rtti,
+   # and so building libstdc++-v3 tends not to always work.
+     noconfigdirs="$noconfigdirs target-libstdc++-v3"
+     ;;
+   mmix-*-*)
+     noconfigdirs="$noconfigdirs ${libgcj}"
+     ;;
    mn10200-*-*)
!     noconfigdirs="$noconfigdirs ${libgcj}"
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-libstub target-cygmon"
*************** case "${target}" in
*** 828,832 ****
      ;;
    mn10300-*-*)
!     noconfigdirs="$noconfigdirs target-libffi"
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
--- 877,881 ----
      ;;
    mn10300-*-*)
!     noconfigdirs="$noconfigdirs ${libgcj}"
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
*************** case "${target}" in
*** 835,843 ****
    powerpc-*-aix*)
      # copied from rs6000-*-* entry
      use_gnu_ld=yes
      ;;
    powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
      target_configdirs="$target_configdirs target-winsup"
!     noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix db snavigator gnuserv target-libffi"
      # always build newlib.
      skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
--- 884,893 ----
    powerpc-*-aix*)
      # copied from rs6000-*-* entry
+     noconfigdirs="$noconfigdirs gprof cvssrc target-libgloss ${libgcj}"
      use_gnu_ld=yes
      ;;
    powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
      target_configdirs="$target_configdirs target-winsup"
!     noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix db snavigator gnuserv ${libgcj}"
      # always build newlib.
      skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
*************** case "${target}" in
*** 845,854 ****
      # This is temporary until we can link against shared libraries
    powerpcle-*-solaris*)
!     noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix db snavigator gnuserv target-libffi"
      ;;
    powerpc-*-beos*)
!     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
      ;;
    powerpc-*-eabi)
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
--- 895,905 ----
      # This is temporary until we can link against shared libraries
    powerpcle-*-solaris*)
!     noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix db snavigator gnuserv ${libgcj}"
      ;;
    powerpc-*-beos*)
!     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
      ;;
    powerpc-*-eabi)
+     noconfigdirs="$noconfigdirs ${libgcj}"
      if [ x${is_cross_compiler} != xno ] ; then
  	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
*************** case "${target}" in
*** 857,876 ****
    rs6000-*-lynxos*)
      # The CVS server code doesn't work on the RS/6000
!     noconfigdirs="$noconfigdirs target-newlib gprof cvssrc target-libffi"
      ;;
    rs6000-*-aix*)
!     noconfigdirs="$noconfigdirs gprof target-libffi"
      use_gnu_ld=yes
      ;;
    rs6000-*-*)
!     noconfigdirs="$noconfigdirs gprof target-libffi"
      ;;
    m68k-apollo-*)
!     noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss target-libffi"
      ;;
    mips*-*-irix5*)
      # The GNU linker does not support shared libraries.
      # emacs is emacs 18, which does not work on Irix 5 (emacs19 does work)
!     noconfigdirs="$noconfigdirs ld gprof emacs target-libgloss"
      ;;
    mips*-*-irix6*)
--- 908,927 ----
    rs6000-*-lynxos*)
      # The CVS server code doesn't work on the RS/6000
!     noconfigdirs="$noconfigdirs target-newlib gprof cvssrc ${libgcj}"
      ;;
    rs6000-*-aix*)
!     noconfigdirs="$noconfigdirs gprof ${libgcj}"
      use_gnu_ld=yes
      ;;
    rs6000-*-*)
!     noconfigdirs="$noconfigdirs gprof ${libgcj}"
      ;;
    m68k-apollo-*)
!     noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss ${libgcj}"
      ;;
    mips*-*-irix5*)
      # The GNU linker does not support shared libraries.
      # emacs is emacs 18, which does not work on Irix 5 (emacs19 does work)
!     noconfigdirs="$noconfigdirs ld gprof emacs target-libgloss ${libgcj}"
      ;;
    mips*-*-irix6*)
*************** case "${target}" in
*** 884,894 ****
      ;;
    mips*-dec-bsd*)
!     noconfigdirs="$noconfigdirs gprof target-libgloss target-libffi"
      ;;
    mips*-*-bsd*)
!     noconfigdirs="$noconfigdirs gprof target-libgloss target-libffi"
      ;;
    mipstx39-*-*)
!     noconfigdirs="$noconfigdirs gprof target-libffi"   # same as generic mips
      target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
     ;;
--- 935,945 ----
      ;;
    mips*-dec-bsd*)
!     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
      ;;
    mips*-*-bsd*)
!     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
      ;;
    mipstx39-*-*)
!     noconfigdirs="$noconfigdirs gprof ${libgcj}"   # same as generic mips
      target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
     ;;
*************** case "${target}" in
*** 897,904 ****
      ;;
    mips*-*-*)
!     noconfigdirs="$noconfigdirs gprof target-libffi"
      ;;
    romp-*-*)
!     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss target-libffi"
      ;;
    sh-*-*)
--- 948,955 ----
      ;;
    mips*-*-*)
!     noconfigdirs="$noconfigdirs gprof ${libgcj}"
      ;;
    romp-*-*)
!     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
      ;;
    sh-*-*)
*************** case "${target}" in
*** 909,913 ****
        *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
      esac
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    sh64-*-*)
--- 960,964 ----
        *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
      esac
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    sh64-*-*)
*************** case "${target}" in
*** 923,927 ****
  	   target_configdirs="${target_configdirs} target-libstub target-cygmon"
      fi
-     noconfigdirs="$noconfigdirs target-libffi"
      ;;
    sparclite-*-*)
--- 974,977 ----
*************** case "${target}" in
*** 929,935 ****
  	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
      fi
!     noconfigdirs="$noconfigdirs target-libffi"
      ;;
    sparc-*-sunos4*)
      if [ x${is_cross_compiler} != xno ] ; then
             noconfigdirs="$noconfigdirs gdb gdbtest target-newlib target-libgloss"
--- 979,986 ----
  	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
      fi
!     noconfigdirs="$noconfigdirs ${libgcj}"
      ;;
    sparc-*-sunos4*)
+     noconfigdirs="$noconfigdirs ${libgcj}"
      if [ x${is_cross_compiler} != xno ] ; then
             noconfigdirs="$noconfigdirs gdb gdbtest target-newlib target-libgloss"
*************** case "${target}" in
*** 950,972 ****
      ;;
    v810-*-*)
!     noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld ${libstdcxx_version} opcodes target-libgloss target-libffi"
      ;;
    v850-*-*)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    v850e-*-*)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    v850ea-*-*)
!     noconfigdirs="$noconfigdirs target-libgloss target-libffi"
      ;;
    vax-*-vms)
!     noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss target-libffi"
      ;;
    vax-*-*)
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libffi"
      ;;
    *-*-lynxos*)
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libffi"
      ;; 
    *-*-macos* | \
--- 1001,1023 ----
      ;;
    v810-*-*)
!     noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld ${libstdcxx_version} opcodes target-libgloss ${libgcj}"
      ;;
    v850-*-*)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    v850e-*-*)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    v850ea-*-*)
!     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
      ;;
    vax-*-vms)
!     noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss ${libgcj}"
      ;;
    vax-*-*)
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
      ;;
    *-*-lynxos*)
!     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
      ;; 
    *-*-macos* | \
*************** case "${target}" in
*** 974,979 ****
      # Macs want a resource compiler.
      configdirs="$configdirs grez"
!     noconfigdirs="$noconfigdirs target-libffi"
      ;;    
  esac
  
--- 1025,1033 ----
      # Macs want a resource compiler.
      configdirs="$configdirs grez"
!     noconfigdirs="$noconfigdirs ${libgcj}"
      ;;    
+   *-*-*)
+     noconfigdirs="$noconfigdirs ${libgcj}"
+     ;;
  esac
  
*************** fi
*** 1019,1022 ****
--- 1073,1108 ----
  enable_languages=`echo "${enable_languages}" | sed -e 's/[ 	,][ 	,]*/,/g' -e 's/,$//'`
  
+ # First scan to see if an enabled language requires some other language.
+ # We assume that a given config-lang.in will list all the language
+ # front ends it requires, even if some are required indirectly.
+ for lang in ${srcdir}/gcc/*/config-lang.in ..
+ do
+    case $lang in
+     ..)
+        ;;
+     # The odd quoting in the next line works around
+     # an apparent bug in bash 1.12 on linux.
+     ${srcdir}/gcc/[*]/config-lang.in)
+        ;;
+     *)
+        lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^ 	]*\).*$,\1,p' $lang`
+        this_lang_requires=`sed -n -e 's,^lang_requires=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^lang_requires=\([^ 	]*\).*$,\1,p' $lang`
+        for other in $this_lang_requires
+        do
+ 	  case ,${enable_languages}, in
+ 	   *,$other,*)
+ 	      ;;
+ 	   *,all,*)
+ 	      ;;
+ 	   *,$lang_alias,*)
+ 	      echo " \`$other' language required by \`$lang_alias'; enabling" 1>&2
+ 	      enable_languages="$enable_languages,$other"
+ 	      ;;
+ 	  esac
+        done
+        ;;
+    esac
+ done
+ 
  subdirs=
  for lang in ${srcdir}/gcc/*/config-lang.in ..
*************** do
*** 1030,1033 ****
--- 1116,1120 ----
  	  lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^ 	]*\).*$,\1,p' $lang`
  	  this_lang_libs=`sed -n -e 's,^target_libs=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^target_libs=\([^ 	]*\).*$,\1,p' $lang`
+ 	  this_lang_dirs=`sed -n -e 's,^lang_dirs=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^lang_dirs=\([^ 	]*\).*$,\1,p' $lang`
  	  build_by_default=`sed -n -e 's,^build_by_default=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^build_by_default=\([^ 	]*\).*$,\1,p' $lang`
  	  if test "x$lang_alias" = x
*************** do
*** 1045,1049 ****
  	      eval target_libs='"$target_libs "'\"$this_lang_libs\"
  	  else
! 	      eval noconfigdirs='"$noconfigdirs "'\"$this_lang_libs\"
  	  fi
  	  ;;
--- 1132,1136 ----
  	      eval target_libs='"$target_libs "'\"$this_lang_libs\"
  	  else
! 	      eval noconfigdirs='"$noconfigdirs "'\"$this_lang_libs $this_lang_dirs\"
  	  fi
  	  ;;
*************** do
*** 1051,1055 ****
  done
  
- 
  # Remove the entries in $skipdirs and $noconfigdirs from $configdirs and
  # $target_configdirs.
--- 1138,1141 ----
*************** fi
*** 1186,1190 ****
  if [ x${shared} = xyes ]; then
    case "${target}" in
!     hppa*)
        target_makefile_frag="${target_makefile_frag} config/mt-papic"
        ;;
--- 1272,1276 ----
  if [ x${shared} = xyes ]; then
    case "${target}" in
!     hppa* | parisc*)
        target_makefile_frag="${target_makefile_frag} config/mt-papic"
        ;;
*************** case "${host}" in
*** 1243,1247 ****
    sparc-sun-solaris2*)
        CCBASE="`echo ${CC-cc} | sed 's/ .*$//'`"
!       if [ "`type $CCBASE | sed 's/^[^/]*//'`" = "/usr/ucb/cc" ] ; then 
            could_use=
            [ -d /opt/SUNWspro/bin ] && could_use="/opt/SUNWspro/bin"
--- 1329,1333 ----
    sparc-sun-solaris2*)
        CCBASE="`echo ${CC-cc} | sed 's/ .*$//'`"
!       if [ "`type $CCBASE | sed 's/^[^/]*//'`" = "/usr/ucb/cc" ] ; then
            could_use=
            [ -d /opt/SUNWspro/bin ] && could_use="/opt/SUNWspro/bin"
*************** targargs="--cache-file=../config.cache -
*** 1325,1329 ****
  # provide a proper gxx_include_dir.
  # Note, if you change the default, make sure to fix both here and in
! # the gcc, libio, and libstdc++ subdirectories.
  # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
  gxx_include_dir=
--- 1411,1415 ----
  # provide a proper gxx_include_dir.
  # Note, if you change the default, make sure to fix both here and in
! # the gcc and libstdc++-v3 subdirectories.
  # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
  gxx_include_dir=
*************** if test x${gxx_include_dir} = x; then
*** 1346,1350 ****
    else
      . ${topsrcdir}/config.if
!     gxx_include_dir='${prefix}/include/g++'-${libstdcxx_interface}
    fi
  else
--- 1432,1436 ----
    else
      . ${topsrcdir}/config.if
!     gxx_include_dir='${prefix}/include/${libstdcxx_incdir}'
    fi
  else
*************** case " $skipdirs " in
*** 1356,1359 ****
--- 1442,1449 ----
  *" target-newlib "*) ;;
  *)
+  case " $target_configdirs " in
+  *" newlib "*)
+   case " $targargs " in
+   *" --with-newlib "*)
     case "$target" in
     *-cygwin*)
*************** case " $skipdirs " in
*** 1399,1402 ****
--- 1489,1496 ----
     esac
     ;;
+   esac
+   ;;
+  esac
+  ;;
  esac
  
*************** case $CHILL_FOR_TARGET in
*** 1447,1450 ****
--- 1541,1558 ----
  esac
  
+ if test "x${GCJ_FOR_TARGET+set}" = xset; then
+   :
+ elif test -d ${topsrcdir}/gcc; then
+   GCJ_FOR_TARGET='$$r/gcc/gcj -B$$r/gcc/'
+ elif test "$host" = "$target"; then
+   GCJ_FOR_TARGET='gcj'
+ else
+   GCJ_FOR_TARGET=`echo gcj | sed -e 's/x/x/' ${program_transform_name}`
+ fi
+ case $GCJ_FOR_TARGET in
+ *' $(FLAGS_FOR_TARGET)') ;;
+ *) GCJ_FOR_TARGET=$GCJ_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
+ esac
+ 
  if test "x${CXX_FOR_TARGET+set}" = xset; then
    :
*************** qCXX_FOR_TARGET=`echo "$CXX_FOR_TARGET" 
*** 1473,1489 ****
  qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
  
! sed -e "s:^TARGET_CONFIGDIRS[ 	]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
!     -e "s%^TARGET_CONFIGARGS[ 	]*=.*$%TARGET_CONFIGARGS = ${targargs}%" \
!     -e "s%^FLAGS_FOR_TARGET[ 	]*=.*$%FLAGS_FOR_TARGET = ${FLAGS_FOR_TARGET}%" \
!     -e "s%^CC_FOR_TARGET[ 	]*=.*$%CC_FOR_TARGET = ${CC_FOR_TARGET}%" \
!     -e "s%^CHILL_FOR_TARGET[ 	]*=.*$%CHILL_FOR_TARGET = ${CHILL_FOR_TARGET}%" \
!     -e "s%^CXX_FOR_TARGET[ 	]*=.*$%CXX_FOR_TARGET = ${qCXX_FOR_TARGET}%" \
!     -e "s%^CXX_FOR_TARGET_FOR_RECURSIVE_MAKE[ 	]*=.*$%CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = ${qqCXX_FOR_TARGET}%" \
!     -e "s%^TARGET_SUBDIR[ 	]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \
!     -e "s%^BUILD_SUBDIR[ 	]*=.*$%BUILD_SUBDIR = ${build_subdir}%" \
!     -e "s%^BUILD_CONFIGARGS[ 	]*=.*$%BUILD_CONFIGARGS = ${buildargs}%" \
!     -e "s%^gxx_include_dir[ 	]*=.*$%gxx_include_dir=${gxx_include_dir}%" \
!        Makefile > Makefile.tem
! rm -f Makefile
  mv -f Makefile.tem Makefile
  
--- 1581,1601 ----
  qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
  
! sedtemp=sed.$$
! cat >$sedtemp <<EOF
! s:^TARGET_CONFIGDIRS[ 	]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:
! s%^TARGET_CONFIGARGS[ 	]*=.*$%TARGET_CONFIGARGS = ${targargs}%
! s%^FLAGS_FOR_TARGET[ 	]*=.*$%FLAGS_FOR_TARGET = ${FLAGS_FOR_TARGET}%
! s%^CC_FOR_TARGET[ 	]*=.*$%CC_FOR_TARGET = ${CC_FOR_TARGET}%
! s%^CHILL_FOR_TARGET[ 	]*=.*$%CHILL_FOR_TARGET = ${CHILL_FOR_TARGET}%
! s%^GCJ_FOR_TARGET[      ]*=.*$%GCJ_FOR_TARGET = ${GCJ_FOR_TARGET}%
! s%^CXX_FOR_TARGET[ 	]*=.*$%CXX_FOR_TARGET = ${qCXX_FOR_TARGET}%
! s%^CXX_FOR_TARGET_FOR_RECURSIVE_MAKE[ 	]*=.*$%CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = ${qqCXX_FOR_TARGET}%
! s%^TARGET_SUBDIR[ 	]*=.*$%TARGET_SUBDIR = ${target_subdir}%
! s%^BUILD_SUBDIR[ 	]*=.*$%BUILD_SUBDIR = ${build_subdir}%
! s%^BUILD_CONFIGARGS[ 	]*=.*$%BUILD_CONFIGARGS = ${buildargs}%
! s%^gxx_include_dir[ 	]*=.*$%gxx_include_dir=${gxx_include_dir}%
! EOF
! sed -f $sedtemp Makefile > Makefile.tem
! rm -f Makefile $sedtemp
  mv -f Makefile.tem Makefile
  


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]