From b32bfc8633b8599e39ef5be2a5e2b107fdcffab0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Sikora?= Date: Thu, 28 Apr 2005 22:45:35 +0000 Subject: [PATCH] - moved from GCC_4. Changed files: gcc-info.patch -> 1.9 gcc-nodebug.patch -> 1.2 --- gcc-info.patch | 148 ++++++++++++++++++++++++++-------------------- gcc-nodebug.patch | 72 +++++++++++++++------- 2 files changed, 132 insertions(+), 88 deletions(-) diff --git a/gcc-info.patch b/gcc-info.patch index 54f3a9b..fd3fb09 100644 --- a/gcc-info.patch +++ b/gcc-info.patch @@ -1,5 +1,5 @@ ---- gcc-3.4-20040611/gcc/doc/cpp.texi.orig 2004-01-18 12:59:03.000000000 +0100 -+++ gcc-3.4-20040611/gcc/doc/cpp.texi 2004-06-12 03:49:21.959450032 +0200 +--- gcc-4.0-20040919.orig/gcc/doc/cpp.texi 2004-09-17 10:22:36.000000000 +0200 ++++ gcc-4.0-20040919/gcc/doc/cpp.texi 2004-09-26 10:58:58.166721432 +0200 @@ -52,9 +52,9 @@ @set cppmanual @@ -12,8 +12,8 @@ @end direntry @end ifinfo ---- gcc-3.4-20040611/gcc/doc/cppinternals.texi.orig 2002-01-07 20:03:36.000000000 +0100 -+++ gcc-3.4-20040611/gcc/doc/cppinternals.texi 2004-06-12 03:50:08.394390848 +0200 +--- gcc-4.0-20040919.orig/gcc/doc/cppinternals.texi 2004-07-03 01:57:11.000000000 +0200 ++++ gcc-4.0-20040919/gcc/doc/cppinternals.texi 2004-09-26 10:58:58.208715048 +0200 @@ -3,9 +3,9 @@ @settitle The GNU C Preprocessor Internals @@ -26,11 +26,11 @@ @end direntry @end ifinfo ---- gcc-3.2/gcc/doc/gcc.texi.orig Fri Nov 1 22:58:48 2002 -+++ gcc-3.2/gcc/doc/gcc.texi Fri Nov 1 23:06:12 2002 -@@ -65,9 +65,9 @@ - 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - @end macro +--- gcc-4.0-20040919.orig/gcc/doc/gcc.texi 2004-07-22 22:12:20.000000000 +0200 ++++ gcc-4.0-20040919/gcc/doc/gcc.texi 2004-09-26 10:58:58.218713528 +0200 +@@ -62,9 +62,9 @@ + funds for GNU development. + @end copying @ifnottex -@dircategory Programming +@dircategory Programming Languages: @@ -40,11 +40,11 @@ @end direntry This file documents the use of the GNU compilers. @sp 1 ---- gcc-3.2/gcc/doc/gccint.texi.orig Wed Jan 23 18:30:28 2002 -+++ gcc-3.2/gcc/doc/gccint.texi Fri Nov 1 23:06:57 2002 -@@ -51,9 +51,9 @@ - 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - @end macro +--- gcc-4.0-20040919.orig/gcc/doc/gccint.texi 2004-05-24 00:54:29.000000000 +0200 ++++ gcc-4.0-20040919/gcc/doc/gccint.texi 2004-09-26 10:58:58.222712920 +0200 +@@ -46,9 +46,9 @@ + funds for GNU development. + @end copying @ifnottex -@dircategory Programming +@dircategory Programming Languages: @@ -54,8 +54,8 @@ @end direntry This file documents the internals of the GNU compilers. @sp 1 ---- gcc-3.4-20040611/gcc/ada/gnat-style.texi.orig 2004-06-09 11:20:43.000000000 +0200 -+++ gcc-3.4-20040611/gcc/ada/gnat-style.texi 2004-06-12 03:22:07.287957872 +0200 +--- gcc-4.0-20040919.orig/gcc/ada/gnat-style.texi 2004-09-01 13:51:52.000000000 +0200 ++++ gcc-4.0-20040919/gcc/ada/gnat-style.texi 2004-09-26 10:58:58.342694680 +0200 @@ -28,9 +28,9 @@ @setchapternewpage odd @@ -68,11 +68,11 @@ @end direntry @macro syntax{element} ---- gcc-3.4-20040611/gcc/ada/gnat_ugn.texi.orig Fri Nov 1 22:58:52 2002 -+++ gcc-3.4-20040611/gcc/ada/gnat_ugn.texi Fri Nov 1 23:10:20 2002 -@@ -75,6 +75,11 @@ - @syncodeindex fn cp - @c %**end of header +--- gcc-4.0-20040919.orig/gcc/ada/gnat_ugn.texi 2004-09-13 12:18:41.000000000 +0200 ++++ gcc-4.0-20040919/gcc/ada/gnat_ugn.texi 2004-09-26 10:58:58.509669296 +0200 +@@ -124,6 +124,11 @@ + ``GNU Free Documentation License''. + @end copying +@dircategory Programming Languages: +@direntry @@ -81,24 +81,24 @@ + @titlepage - @ifset vms ---- gcc-3.2/gcc/f/g77.texi.orig Mon Apr 29 09:58:32 2002 -+++ gcc-3.2/gcc/f/g77.texi Fri Nov 1 23:11:56 2002 -@@ -90,9 +90,9 @@ - @c @end tex + @title @value{EDITION} User's Guide +--- gcc-4.0-20040919.orig/gcc/fortran/gfortran.texi 2004-09-16 15:13:39.000000000 +0200 ++++ gcc-4.0-20040919/gcc/fortran/gfortran.texi 2004-09-26 11:05:50.258074024 +0200 +@@ -62,9 +62,9 @@ + @end copying @ifinfo -@dircategory Programming +@dircategory Programming Languages: @direntry --* g77: (g77). The GNU Fortran compiler. -+* g77: (g77). The GNU Fortran compiler +-* gfortran: (gfortran). The GNU Fortran 95 Compiler. ++* gfortran: (gfortran). The GNU Fortran 95 Compiler. @end direntry - @ifset INTERNALS - @ifset USING ---- gcc-3.2/gcc/java/gcj.texi.orig Sun Aug 4 18:55:55 2002 -+++ gcc-3.2/gcc/java/gcj.texi Fri Nov 1 23:16:39 2002 -@@ -20,26 +20,20 @@ + This file documents the use and the internals of + the GNU Fortran 95 compiler, (@command{gfortran}). +--- gcc-4.0-20050102/gcc/java/gcj.texi.orig 2004-12-06 18:59:57.000000000 +0100 ++++ gcc-4.0-20050102/gcc/java/gcj.texi 2005-01-09 22:17:46.968983608 +0100 +@@ -50,28 +50,21 @@ @ifinfo @format @@ -119,47 +119,56 @@ -* jcf-dump: (gcj)Invoking jcf-dump. - Print information about Java class files -* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode +-* gcj-dbtool: (gcj)Invoking gcj-dbtool. +- Tool for manipulating class file databases. -* jv-convert: (gcj)Invoking jv-convert. - Convert file from one encoding to another --* rmic: (gcj)Invoking rmic. +-* grmic: (gcj)Invoking grmic. - Generate stubs for Remote Method Invocation. --* rmiregistry: (gcj)Invoking rmiregistry. +-* grmiregistry: (gcj)Invoking grmiregistry. - The remote object registry. +* gcjh: (gcj)gcjh. Generate header files from Java class files +* jv-scan: (gcj)jv-scan. Print information about Java source files +* 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 -+* rmic: (gcj)rmic. Generate stubs for Remote Method Invocation. -+* rmiregistry: (gcj)rmiregistry. The remote object registry ++* gcj-dbtool: (gcj)gcj-dbtool. Db tool. ++* grmic: (gcj)grmic. Generate stubs for Remote Method Invocation. ++* grmiregistry: (gcj)grmiregistry. The remote object registry. @end direntry @end format -@@ -120,15 +114,15 @@ - * Copying:: The GNU General Public License +@@ -105,19 +98,19 @@ + @file{.class} files. + + @menu +-* 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} ++* gcj:: Compiler options supported by @command{gcj} * Compatibility:: Compatibility between gcj and other tools for Java -* Invoking gcjh:: Generate header files from class files -* Invoking jv-scan:: Print information about source files -* Invoking jcf-dump:: Print information about class files -* Invoking gij:: Interpreting Java bytecodes +-* Invoking gcj-dbtool:: Tool for manipulating class file databases. -* Invoking jv-convert:: Converting from one encoding to another --* Invoking rmic:: Generate stubs for Remote Method Invocation. --* Invoking rmiregistry:: The remote object registry. -+* gcjh:: Generate header files from class files -+* jv-scan:: Print information about source files -+* jcf-dump:: Print information about class files -+* gij:: Interpreting Java bytecodes -+* jv-convert:: Converting from one encoding to another -+* rmic:: Generate stubs for Remote Method Invocation. -+* rmiregistry:: The remote object registry. +-* Invoking grmic:: Generate stubs for Remote Method Invocation. +-* Invoking grmiregistry:: The remote object registry. ++* gcjh:: Generate header files from class files ++* jv-scan:: Print information about source files ++* jcf-dump:: Print information about class files ++* gij:: Interpreting Java bytecodes ++* jv-convert:: Converting from one encoding to another ++* gcj-dbtool:: Db tool. ++* grmic:: Generate stubs for Remote Method Invocation. ++* grmiregistry:: The remote object registry. * About CNI:: Description of the Compiled Native Interface * System properties:: Modifying runtime behavior of the libgcj library * Resources:: Where to look for more information -@@ -139,7 +133,7 @@ +@@ -129,7 +122,7 @@ @include fdl.texi @@ -168,7 +177,7 @@ @chapter Invoking gcj @c man title gcj Ahead-of-time compiler for the Java language -@@ -506,7 +500,7 @@ +@@ -656,7 +649,7 @@ @end itemize @@ -177,7 +186,7 @@ @chapter Invoking gcjh @c man title gcjh generate header files from Java class files -@@ -607,7 +601,7 @@ +@@ -757,7 +750,7 @@ @c man end @@ -186,7 +195,7 @@ @chapter Invoking jv-scan @c man title jv-scan print information about Java source file -@@ -665,7 +659,7 @@ +@@ -820,7 +813,7 @@ @c man end @@ -195,7 +204,7 @@ @chapter Invoking jcf-dump @c man title jcf-dump print information about Java class files -@@ -720,7 +714,7 @@ +@@ -880,7 +873,7 @@ @c man end @@ -204,7 +213,16 @@ @chapter Invoking gij @c man title gij GNU interpreter for Java bytecode -@@ -798,7 +792,7 @@ +@@ -981,7 +974,7 @@ + + @c man end + +-@node Invoking gcj-dbtool ++@node gcj-dbtool + @chapter Invoking gcj-dbtool. + + @c man title gcj-dbtool Manipulate class file mapping databases for libgcj +@@ -1050,7 +1043,7 @@ @c man end @@ -213,21 +231,21 @@ @chapter Invoking jv-convert @c man title jv-convert Convert file from one encoding to another -@@ -857,7 +851,7 @@ +@@ -1109,7 +1102,7 @@ @c man end --@node Invoking rmic -+@node rmic - @chapter Invoking rmic +-@node Invoking grmic ++@node grmic + @chapter Invoking grmic - @c man title rmic Generate stubs for Remote Method Invocation -@@ -936,7 +930,7 @@ + @c man title grmic Generate stubs for Remote Method Invocation +@@ -1188,7 +1181,7 @@ @c man end --@node Invoking rmiregistry -+@node rmiregistry - @chapter Invoking rmiregistry +-@node Invoking grmiregistry ++@node grmiregistry + @chapter Invoking grmiregistry - @c man title rmiregistry Remote object registry + @c man title grmiregistry Remote object registry diff --git a/gcc-nodebug.patch b/gcc-nodebug.patch index b4e5be5..759e911 100644 --- a/gcc-nodebug.patch +++ b/gcc-nodebug.patch @@ -1,19 +1,20 @@ ---- gcc-3.3.3/gcc/Makefile.in.orig 2004-02-16 18:57:42.824016056 +0100 -+++ gcc-3.3.3/gcc/Makefile.in 2004-02-16 18:59:52.167352880 +0100 -@@ -65,9 +65,9 @@ +--- gcc-4.0-20040919/gcc/Makefile.in.orig 2004-09-18 03:07:21.000000000 +0200 ++++ gcc-4.0-20040919/gcc/Makefile.in 2004-09-26 11:38:24.071049304 +0200 +@@ -141,10 +141,10 @@ # TCFLAGS is used for compilations with the GCC just built. XCFLAGS = TCFLAGS = -CFLAGS = -g -STAGE1_CFLAGS = -g @stage1_cflags@ --BOOT_CFLAGS = -g -O2 +CFLAGS = +STAGE1_CFLAGS = @stage1_cflags@ + STAGE1_CHECKING = -DENABLE_CHECKING -DENABLE_ASSERT_CHECKING +-BOOT_CFLAGS = -g -O2 +BOOT_CFLAGS = -O2 # Flags to determine code coverage. When coverage is disabled, this will # contain the optimization flags, as you normally want code coverage -@@ -390,7 +390,7 @@ +@@ -511,7 +511,7 @@ # Options to use when compiling libgcc2.a. # @@ -22,8 +23,8 @@ LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED @inhibit_libc@ # Additional options to use when compiling libgcc2.a. ---- gcc-3.3.3/gcc/ada/Makefile.in.orig 2004-02-16 08:29:33.000000000 +0100 -+++ gcc-3.3.3/gcc/ada/Makefile.in 2004-02-16 19:04:55.708207656 +0100 +--- gcc-4.0-20040919/gcc/ada/Makefile.in.orig 2004-09-13 12:18:40.000000000 +0200 ++++ gcc-4.0-20040919/gcc/ada/Makefile.in 2004-09-26 11:40:30.070894416 +0200 @@ -73,7 +73,7 @@ # to the stage2 and stage3 compilations # XCFLAGS is used for most compilations but not when using the GCC just built. @@ -33,34 +34,59 @@ BOOT_CFLAGS = -O $(CFLAGS) # These exists to be overridden by the x-* and t-* files, respectively. X_CFLAGS = -@@ -127,7 +127,7 @@ +@@ -118,9 +118,9 @@ + ADA_CFLAGS = + ADAFLAGS = -W -Wall -gnatpg -gnata SOME_ADAFLAGS =-gnata - FORCE_DEBUG_ADAFLAGS = -g - GNATLIBFLAGS = -gnatpg +-FORCE_DEBUG_ADAFLAGS = -g ++FORCE_DEBUG_ADAFLAGS = + GNATLIBFLAGS = -gnatpg -nostdinc -GNATLIBCFLAGS = -g -O2 +GNATLIBCFLAGS = -O2 GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ -DIN_RTS ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS) ---- gcc-3.3.3/libjava/Makefile.am.orig 2004-02-16 08:29:34.000000000 +0100 -+++ gcc-3.3.3/libjava/Makefile.am 2004-02-16 19:02:25.582030304 +0100 -@@ -95,7 +95,7 @@ - AM_CFLAGS = @LIBGCJ_CFLAGS@ - endif +--- gcc-4.0-20040919/libffi/Makefile.am.orig 2004-08-30 17:42:59.000000000 +0200 ++++ gcc-4.0-20040919/libffi/Makefile.am 2004-09-26 11:44:10.789340112 +0200 +@@ -138,7 +138,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` + +--- gcc-4.0-20040919/libffi/Makefile.in.orig 2004-09-19 19:47:04.000000000 +0200 ++++ gcc-4.0-20040919/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) + 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) +--- gcc-4.0-20040919/libjava/Makefile.am.orig 2004-09-10 10:22:58.000000000 +0200 ++++ gcc-4.0-20040919/libjava/Makefile.am 2004-09-26 11:46:24.041082768 +0200 +@@ -179,7 +179,7 @@ + ## Extra CFLAGS used for JNI C sources shared with GNU Classpath. + PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long -JCFLAGS = -g +JCFLAGS = JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) LIBFFIINCS = @LIBFFIINCS@ ---- gcc-3.3.3/libjava/Makefile.in.orig 2004-02-16 08:29:34.000000000 +0100 -+++ gcc-3.3.3/libjava/Makefile.in 2004-02-16 19:02:31.196176824 +0100 -@@ -180,7 +180,7 @@ - @USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS) - @USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@ - +--- gcc-4.0-20040919/libjava/Makefile.in.orig 2004-09-19 19:47:04.000000000 +0200 ++++ gcc-4.0-20040919/libjava/Makefile.in 2004-09-26 11:47:02.431246576 +0200 +@@ -4167,7 +4167,7 @@ + @USING_GCC_FALSE@AM_CFLAGS = @LIBGCJ_CFLAGS@ + @USING_GCC_TRUE@AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS) + PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long -JCFLAGS = -g +JCFLAGS = JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) - - LIBFFIINCS = @LIBFFIINCS@ + AM_CPPFLAGS = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ + $(GCINCS) $(THREADINCS) $(INCLTDL) \ -- 2.44.0