--- a/gcc/doc/cpp.texi 2004-09-17 10:22:36.000000000 +0200
+++ b/gcc/doc/cpp.texi 2004-09-26 10:58:58.166721432 +0200
-@@ -52,9 +52,9 @@
+@@ -50,9 +50,9 @@
@set cppmanual
@ifinfo
-@dircategory Software development
+@dircategory Programming Languages:
@direntry
--* Cpp: (cpp). The GNU C preprocessor.
+-* Cpp: (cpp). The GNU C preprocessor.
+* Cpp: (cpp). The GNU C preprocessor
@end direntry
@end ifinfo
@macro syntax{element}
--- a/gcc/ada/gnat_ugn.texi 2005-12-06 23:45:52.983574000 +0100
+++ b/gcc/ada/gnat_ugn.texi 2005-12-11 02:35:45.580878360 +0100
-@@ -99,9 +99,9 @@
- @end ifset
+@@ -109,9 +109,9 @@
+ @end macro
@settitle @value{EDITION} User's Guide @value{PLATFORM}
-@dircategory GNU Ada tools
+@dircategory Programming Languages:
@direntry
--* @value{EDITION} User's Guide (@value{FILE}) @value{PLATFORM}
+-* @value{EDITION} User's Guide: (gnat_ugn). @value{PLATFORM}
+* GNAT User's Guide (gnat_ugn_unw). GNAT User's Guide
@end direntry
the GNU Fortran compiler, (@command{gfortran}).
--- a/gcc/java/gcj.texi 2006-07-02 15:30:47.000000000 +0200
+++ b/gcc/java/gcj.texi 2006-07-02 21:15:25.663463500 +0200
-@@ -54,24 +54,19 @@
+@@ -53,29 +53,22 @@
@ifinfo
@format
+* Gcj: (gcj). Ahead-of-time compiler for the Java language
@end direntry
--@dircategory Individual utilities
+ @dircategory Individual utilities
+@dircategory Programming tools:
@direntry
-* jcf-dump: (gcj)Invoking jcf-dump.
- Generate stubs for Remote Method Invocation.
-* gc-analyze: (gcj)Invoking gc-analyze.
- Analyze Garbage Collector (GC) memory dumps.
+-* aot-compile: (gcj)Invoking aot-compile.
+- Compile bytecode to native and generate databases.
+-* rebuild-gcj-db: (gcj)Invoking rebuild-gcj-db.
+- Merge the per-solib databases made by aot-compile
+- into one system-wide database.
+* jcf-dump: (gcj)jcf-dump. Print information about Java class files
+* gij: (gcj)gij. GNU interpreter for Java bytecode
+* jv-convert: (gcj)jv-convert. Convert file from one encoding to another
+* gcj-dbtool: (gcj)gcj-dbtool. Db tool.
+* grmic: (gcj)grmic. Generate stubs for Remote Method Invocation.
+* gc-analyze: (gcj)gc-analyze. Analyze Garbage Collector (GC) memory dumps.
++* aot-compile: Compile bytecode to native and generate databases.
++* rebuild-gcj-db: Merge the per-solib databases made by aot-compile into one system-wide database.
@end direntry
@end format
-@@ -104,17 +99,17 @@
+@@ -108,33 +101,31 @@
@file{.class} files.
@menu
--* Copying:: The GNU General Public License
+-* Copying:: The GNU General Public License
+* Copying:: The GNU General Public License
* GNU Free Documentation License::
- How you can share and copy this manual
--* Invoking gcj:: Compiler options supported by @command{gcj}
-+* gcj:: Compiler options supported by @command{gcj}
- * Compatibility:: Compatibility between gcj and other tools for Java
+- How you can share and copy this manual
+-* Invoking gcj:: Compiler options supported by @command{gcj}
+-* Compatibility:: Compatibility between gcj and other tools for Java
-* Invoking jcf-dump:: Print information about class files
--* Invoking gij:: Interpreting Java bytecodes
+-* Invoking gij:: Interpreting Java bytecodes
-* Invoking gcj-dbtool:: Tool for manipulating class file databases.
-* Invoking jv-convert:: Converting from one encoding to another
-* Invoking grmic:: Generate stubs for Remote Method Invocation.
-* Invoking gc-analyze:: Analyze Garbage Collector (GC) memory dumps.
+-* Invoking aot-compile:: Compile bytecode to native and generate databases.
+-* Invoking rebuild-gcj-db:: Merge the per-solib databases made by aot-compile
+- into one system-wide database.
+-* About CNI:: Description of the Compiled Native Interface
+-* System properties:: Modifying runtime behavior of the libgcj library
+-* Resources:: Where to look for more information
+-* Index:: Index.
++ How you can share and copy this manual
++* gcj:: Compiler options supported by @command{gcj}
++* Compatibility:: Compatibility between gcj and other tools for Java
+* jcf-dump:: Print information about class files
+* gij:: Interpreting Java bytecodes
++* gcj-dbtool:: Tool for manipulating class file databases.
+* jv-convert:: Converting from one encoding to another
-+* gcj-dbtool:: Db tool.
+* grmic:: Generate stubs for Remote Method Invocation.
+* gc-analyze:: Analyze Garbage Collector (GC) memory dumps.
- * About CNI:: Description of the Compiled Native Interface
- * System properties:: Modifying runtime behavior of the libgcj library
- * Resources:: Where to look for more information
-@@ -127,7 +122,7 @@
++* aot-compile:: Compile bytecode to native and generate databases.
++* rebuild-gcj-db:: Merge the per-solib databases made by aot-compile into one system-wide database.
++* About CNI:: Description of the Compiled Native Interface
++* System properties:: Modifying runtime behavior of the libgcj library
++* Resources:: Where to look for more information
++* Index:: Index.
+ @end menu
+
+-
+ @include gpl_v3.texi
+
@include fdl.texi
@chapter Invoking gcj
@c man title gcj Ahead-of-time compiler for the Java language
-@@ -670,8 +665,8 @@
+@@ -678,8 +669,8 @@
@code{-findirect-dispatch} then add them to the system-wide
classmap.db file using @code{gcj-dbtool}, they will be automatically
loaded by the @code{libgcj} system classloader. This is the new,
@item
The old classname-to-library lookup mechanism is still supported
-@@ -718,7 +713,7 @@
+@@ -726,7 +717,7 @@
@end itemize
@chapter Invoking jcf-dump
@c man title jcf-dump print information about Java class files
-@@ -778,7 +773,7 @@
+@@ -786,7 +777,7 @@
@c man end
@chapter Invoking gij
@c man title gij GNU interpreter for Java bytecode
-@@ -907,7 +902,7 @@
+@@ -915,7 +906,7 @@
@c man end
@chapter Invoking gcj-dbtool.
@c man title gcj-dbtool Manipulate class file mapping databases for libgcj
-@@ -998,7 +993,7 @@
+@@ -1006,7 +997,7 @@
@c man end
@chapter Invoking jv-convert
@c man title jv-convert Convert file from one encoding to another
-@@ -1057,7 +1052,7 @@
+@@ -1065,7 +1056,7 @@
@c man end
@chapter Invoking grmic
@c man title grmic Generate stubs for Remote Method Invocation
-@@ -1136,7 +1131,7 @@
+@@ -1144,7 +1135,7 @@
@c man end
@chapter Invoking gc-analyze
@c man title gc-analyze Analyze Garbage Collector (GC) memory dumps
+@@ -1227,7 +1218,7 @@
+
+ @c man end
+
+-@node Invoking aot-compile
++@node aot-compile
+ @chapter Invoking aot-compile
+
+ @c man title aot-compile Compile bytecode to native and generate databases
+@@ -1285,7 +1276,7 @@
+
+ @c man end
+
+-@node Invoking rebuild-gcj-db
++@node rebuild-gcj-db
+ @chapter Invoking rebuild-gcj-db
+
+ @c man title rebuild-gcj-db Merge the per-solib databases made by aot-compile into one system-wide database.
--- a/gcc/ada/gnat_rm.texi 2005-11-30 12:12:06.000000000 +0100
+++ b/gcc/ada/gnat_rm.texi 2005-12-11 02:36:14.863426736 +0100
@@ -26,9 +26,9 @@
LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) \
$(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) \
-DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
---- a/gcc/ada/Makefile.in 2004-09-13 12:18:40.000000000 +0200
-+++ b/gcc/ada/Makefile.in 2004-09-26 11:40:30.070894416 +0200
-@@ -73,7 +73,7 @@
+--- a/gcc/ada/gcc-interface/Makefile.in 2004-09-13 12:18:40.000000000 +0200
++++ b/gcc/ada/gcc-interface/Makefile.in 2004-09-26 11:40:30.070894416 +0200
+@@ -66,7 +66,7 @@
+ # CFLAGS is for the user to override to, e.g., do a bootstrap with -O2.
+ # BOOT_CFLAGS is the value of CFLAGS to pass
# to the stage2 and stage3 compilations
- # XCFLAGS is used for most compilations but not when using the GCC just built.
- XCFLAGS =
-CFLAGS = -g
+CFLAGS =
BOOT_CFLAGS = -O $(CFLAGS)
- # These exists to be overridden by the x-* and t-* files, respectively.
- X_CFLAGS =
-@@ -118,9 +118,9 @@
+ # These exists to be overridden by the t-* files, respectively.
+ T_CFLAGS =
+@@ -102,9 +102,9 @@
ADA_CFLAGS =
ADAFLAGS = -W -Wall -gnatpg -gnata
SOME_ADAFLAGS =-gnata
+GNATLIBCFLAGS = -O2
GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
-DIN_RTS
- ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS)
+ ALL_ADAFLAGS = $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS)
--- a/libada/Makefile.in 2005-11-04 13:49:08.000000000 +0000
+++ b/libada/Makefile.in 2005-11-24 23:52:14.739531296 +0000
-@@ -54,7 +54,6 @@
- include $(GCC_DIR)/libada-mk
+@@ -49,13 +49,13 @@
+ LDFLAGS=
+
+ # The tedious process of getting CFLAGS right.
+-CFLAGS=-g
++CFLAGS=
+ LOOSE_WARN = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
+ GCC_WARN_CFLAGS = $(LOOSE_WARN)
+ WARN_CFLAGS = @warn_cflags@
TARGET_LIBGCC2_CFLAGS=
-GNATLIBCFLAGS= -g -O2
- # Get target-specific overrides for TARGET_LIBGCC2_CFLAGS
- # and possibly GNATLIBCFLAGS. Currently this uses files
- # in gcc/config. The 'subst' call is used to rerelativize them
---- a/libffi/Makefile.am 2004-08-30 17:42:59.000000000 +0200
-+++ b/libffi/Makefile.am 2004-09-26 11:44:10.789340112 +0200
-@@ -138,7 +138,7 @@
++GNATLIBCFLAGS= -O2
+
+ # Get target-specific overrides for TARGET_LIBGCC2_CFLAGS.
+ host_subdir = @host_subdir@
+--- a/libffi/Makefile.in 2004-08-30 17:42:59.000000000 +0200
++++ b/libffi/Makefile.in 2004-09-26 11:44:10.789340112 +0200
+@@ -453,7 +453,7 @@
+ $(am__append_21) $(am__append_22)
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
-
-AM_CFLAGS = -Wall -g -fexceptions
+AM_CFLAGS = -Wall -fexceptions
-
- libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
-
---- a/libffi/Makefile.in 2004-09-19 19:47:04.000000000 +0200
-+++ b/libffi/Makefile.in 2004-09-26 11:44:17.253357432 +0200
-@@ -385,7 +385,7 @@
- nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) $(am__append_3) $(am__append_4) $(am__append_5) $(am__append_6) $(am__append_7) $(am__append_8) $(am__append_9) $(am__append_10) $(am__append_11) $(am__append_12) $(am__append_13) $(am__append_14) $(am__append_15) $(am__append_16) $(am__append_17) $(am__append_18)
+ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
+ libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS)
+ AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+--- a/libffi/Makefile.am 2008-05-09 12:10:53.000000000 +0200
++++ b/libffi/Makefile.am 2008-11-28 02:02:01.690063811 +0100
+@@ -154,7 +154,7 @@
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
+
-AM_CFLAGS = -Wall -g -fexceptions
+AM_CFLAGS = -Wall -fexceptions
- libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
- AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
- AM_CCASFLAGS = $(AM_CPPFLAGS)
+
+ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
+
--- a/libjava/Makefile.am 2004-09-10 10:22:58.000000000 +0200
+++ b/libjava/Makefile.am 2004-09-26 11:46:24.041082768 +0200
@@ -179,7 +179,7 @@