This commit was manufactured by cvs2svn to create tagcarlton_dictionary-20030416-merge

'carlton_dictionary-20030416-merge'.

Sprout from kettenis_i386newframe-20030419-branch 2003-04-19 00:19:41 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2003-04-11 03:58:39 UTC Alexandre Oliva <aoliva@redhat.com> '* libtool.m4 (lt_cv_deplibs_check_method): Use pass_all on mips*.':
    ChangeLog
    Makefile.in
    Makefile.tpl
    configure
    configure.in

5 files changed, 16 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index 3008cc64e..d9688b1e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,3 @@
-2003-04-18  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
-
-	* Makefile.tpl (MAKEINFOFLAGS): Default to --split-size=5000000.
-	* Makefile.in: Regenerate.
-
-2003-04-18  Jakub Jelinek  <jakub@redhat.com>
-
-	* configure.in (powerpc64*-*-linux*): Remove.
-	* configure: Rebuilt.
-
-2003-04-17  Phil Edwards  <pme@gcc.gnu.org>
-
-	* Makefile.tpl (GCC_STRAP_TARGETS):  New variable containing all the
-	previous bootstrap targets, plus bubblestrap, quickstrap, cleanstrap,
-	and restrap.
-	* Makefile.in:  Regenerate.
-
-2003-04-16  Richard Earnshaw  <rearnsha@arm.com>
-
-	* configure.in (arm-*-netbsdelf*): Enable building java libraries.
-	* configure: Regenerated.
-
 2003-04-11  Alexandre Oliva  <aoliva@redhat.com>
 
 	* libtool.m4 (lt_cv_deplibs_check_method): Use pass_all on mips*.
diff --git a/Makefile.in b/Makefile.in
index 1b993f59e..f70250dd8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -203,8 +203,7 @@ USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
 # using the makeinfo from the object tree.
-# (Default to avoid splitting info files by setting the threshold high.)
-MAKEINFOFLAGS = --split-size=5000000
+MAKEINFOFLAGS =
 
 EXPECT = `if [ -f $$r/expect/expect ] ; \
 	then echo $$r/expect/expect ; \
@@ -7265,9 +7264,8 @@ all-gcc: configure-gcc
 # In theory, on an SMP all those dependencies can be resolved
 # in parallel.
 #
-GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
-.PHONY: $(GCC_STRAP_TARGETS)
-$(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
+.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
+bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap: all-bootstrap configure-gcc
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
 	$(SET_LIB_PATH) \
diff --git a/Makefile.tpl b/Makefile.tpl
index 314c44977..72e24983c 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -206,8 +206,7 @@ USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
 # using the makeinfo from the object tree.
-# (Default to avoid splitting info files by setting the threshold high.)
-MAKEINFOFLAGS = --split-size=5000000
+MAKEINFOFLAGS =
 
 EXPECT = `if [ -f $$r/expect/expect ] ; \
 	then echo $$r/expect/expect ; \
@@ -1190,9 +1189,8 @@ all-gcc: configure-gcc
 # In theory, on an SMP all those dependencies can be resolved
 # in parallel.
 #
-GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
-.PHONY: $(GCC_STRAP_TARGETS)
-$(GCC_STRAP_TARGETS): all-bootstrap configure-gcc
+.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
+bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap: all-bootstrap configure-gcc
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
 	$(SET_LIB_PATH) \
diff --git a/configure b/configure
index 045ad147f..3fc3a7278 100755
--- a/configure
+++ b/configure
@@ -1009,7 +1009,6 @@ case "${target}" in
     # Skip some stuff that's unsupported on some NetBSD configurations.
     case "${target}" in
       i*86-*-netbsdelf*) ;;
-      arm*-*-netbsdelf*) ;;
       *)
 	noconfigdirs="$noconfigdirs ${libgcj}"
 	;;
@@ -1267,6 +1266,11 @@ case "${target}" in
   powerpc-*-eabi)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
+  powerpc64*-*-linux*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    # not yet ported.
+    noconfigdirs="$noconfigdirs target-libffi"
+    ;;
   rs6000-*-lynxos*)
     noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
     ;;
diff --git a/configure.in b/configure.in
index f695982d7..45239e2fa 100644
--- a/configure.in
+++ b/configure.in
@@ -349,7 +349,6 @@ case "${target}" in
     # Skip some stuff that's unsupported on some NetBSD configurations.
     case "${target}" in
       i*86-*-netbsdelf*) ;;
-      arm*-*-netbsdelf*) ;;
       *)
 	noconfigdirs="$noconfigdirs ${libgcj}"
 	;;
@@ -607,6 +606,11 @@ case "${target}" in
   powerpc-*-eabi)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
+  powerpc64*-*-linux*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    # not yet ported.
+    noconfigdirs="$noconfigdirs target-libffi"
+    ;;
   rs6000-*-lynxos*)
     noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
     ;;