- tagged as GCC_4_0 and updated for 4.1.x.

Changed files:
    gcc-ada-link.patch -> 1.6
    gcc-alpha-ada_fix.patch -> 1.6
    gcc-nodebug.patch -> 1.3

diff --git a/gcc-ada-link.patch b/gcc-ada-link.patch
index e62c8dfceae6dd87e6671f42d5b57bc9dda9ca09..63d4aa5bc1aba241eab3dc7a7e46769a10217f45 100644 (file)
--- a/gcc-ada-link.patch
+++ b/gcc-ada-link.patch
@@ -13,8 +13,8 @@
  unsigned char __gnat_objlist_file_supported = 1;
  unsigned char __gnat_using_gnu_linker = 1;
  const char *__gnat_object_library_extension = ".a";
---- gcc-4.0-20040919/gcc/ada/Makefile.in.orig  2004-09-26 11:40:30.000000000 +0200
-+++ gcc-4.0-20040919/gcc/ada/Makefile.in       2004-09-26 12:29:16.913946640 +0200
+--- gcc-4.1-20050522/gcc/ada/Makefile.in.orig  2005-05-26 10:48:40.000000000 +0000
++++ gcc-4.1-20050522/gcc/ada/Makefile.in       2005-05-26 10:59:25.000000000 +0000
 @@ -139,7 +139,7 @@
  objext = .o
  exeext =
@@ -24,7 +24,7 @@
  shext  =
  hyphen = -
  
-@@ -1366,6 +1366,31 @@
+@@ -1367,6 +1367,31 @@
    LIBRARY_VERSION := $(LIB_VERSION)
  endif
  
@@ -56,7 +56,7 @@
  ifeq ($(strip $(filter-out hppa% linux%,$(arch) $(osys))),)
    LIBGNAT_TARGET_PAIRS = \
    a-intnam.ads<a-intnam-linux.ads \
-@@ -1463,6 +1488,31 @@
+@@ -1468,6 +1493,31 @@
    LIBRARY_VERSION := $(LIB_VERSION)
  endif
  
@@ -88,17 +88,17 @@
  ifeq ($(strip $(filter-out powerpc darwin%,$(arch) $(osys))),)
    LIBGNAT_TARGET_PAIRS = \
    a-intnam.ads<a-intnam-darwin.ads \
-@@ -1825,6 +1875,9 @@
- # is guaranteed to overflow the buffer.
+@@ -1763,6 +1813,9 @@
+ GCC_FOR_TARGET=./xgcc -B./ $(FLAGS_FOR_TARGET)
  
  gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
 +      $(RMDIR) save
 +      $(MKDIR) save
 +      $(MV) *.o save/
-       $(MAKE) -C rts CC="../../xgcc -B../../" \
-               INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
-                 CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \
-@@ -1837,6 +1890,8 @@
+       $(MAKE) -C rts \
+               CC="`echo \"$(GCC_FOR_TARGET)\" \
+               | sed -e 's^./xgcc^../../xgcc^' -e 's^-B./^-B../../^'`" \
+@@ -1779,6 +1832,8 @@
                srcdir=$(fsrcdir) \
                -f ../Makefile \
                $(GNATRTL_OBJS)
@@ -107,16 +107,7 @@
        $(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
        $(AR) $(AR_FLAGS) rts/libgnat$(arext) \
           $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
-@@ -1862,7 +1917,7 @@
-            THREAD_KIND="$(THREAD_KIND)" \
-              gnatlib
-       $(RM) rts/libgna*$(soext)
--      cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
-+      cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
-               -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-               $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-               $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-@@ -1871,7 +1926,8 @@
+@@ -1816,7 +1871,8 @@
                -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
                $(GNATRTL_TASKING_OBJS) \
                $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
@@ -126,6 +117,15 @@
        cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
                libgnat$(soext)
        cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+@@ -1863,7 +1919,7 @@
+            THREAD_KIND="$(THREAD_KIND)" \
+              gnatlib
+       $(RM) rts/libgna*$(soext)
+-      cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
++      cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
+               -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+               $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+               $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
 --- gcc-4.0-20050514/gcc/ada.orig/system-linux-sparc64.ads     1970-01-01 00:00:00.000000000 +0000
 +++ gcc-4.0-20050514/gcc/ada/system-linux-sparc64.ads  2005-05-21 18:34:52.000000000 +0000
 @@ -0,0 +1,151 @@

diff --git a/gcc-alpha-ada_fix.patch b/gcc-alpha-ada_fix.patch
index 976a2cd180738d8b077f3a13c5b65efeb6c1147b..e8f10bb09c1d9175a06e3e99ce5d1c1e7ce380a3 100644 (file)
--- a/gcc-alpha-ada_fix.patch
+++ b/gcc-alpha-ada_fix.patch
@@ -1,81 +1,81 @@
---- gcc/gcc/ada/Makefile.in~   2005-02-21 18:18:29.000000000 +0000
-+++ gcc/gcc/ada/Makefile.in    2005-02-25 00:21:36.000000000 +0000
-@@ -1602,67 +1602,67 @@
-            ../../vxaddr2line$(exeext)
+--- gcc/gcc/ada/Makefile.in.orig       2005-05-26 10:59:25.000000000 +0000
++++ gcc/gcc/ada/Makefile.in    2005-05-26 11:06:11.000000000 +0000
+@@ -1610,67 +1610,67 @@
  
- ../../gnatchop$(exeext): ../stamp-tools
+ 
+ ../../gnatchop$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatchop --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatchop.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatchop 
        $(GNATLINK) -v gnatchop -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnat$(exeext): ../stamp-tools
+ ../../gnat$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatcmd --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatcmd.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatcmd 
        $(GNATLINK) -v gnatcmd -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnatkr$(exeext): ../stamp-tools
+ ../../gnatkr$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatkr --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatkr.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatkr 
        $(GNATLINK) -v gnatkr -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnatls$(exeext): ../stamp-tools
+ ../../gnatls$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatls --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatls.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatls 
        $(GNATLINK) -v gnatls -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnatname$(exeext): ../stamp-tools
+ ../../gnatname$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatname --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatname.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatname 
        $(GNATLINK) -v gnatname -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gprmake$(exeext): ../stamp-tools
+ ../../gprmake$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gprmake --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gprmake.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gprmake
        $(GNATLINK) -v gprmake -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnatprep$(exeext): ../stamp-tools
+ ../../gnatprep$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatprep --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatprep.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatprep 
        $(GNATLINK) -v gnatprep -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnatxref$(exeext): ../stamp-tools
+ ../../gnatxref$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatxref --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatxref.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatxref 
        $(GNATLINK) -v gnatxref -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnatfind$(exeext): ../stamp-tools
+ ../../gnatfind$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatfind --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatfind.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatfind 
        $(GNATLINK) -v gnatfind -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnatclean$(exeext): ../stamp-tools
+ ../../gnatclean$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatclean --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatclean.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatclean
        $(GNATLINK) -v gnatclean -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnatsym$(exeext): ../stamp-tools
+ ../../gnatsym$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatsym --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatsym.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatsym
        $(GNATLINK) -v gnatsym -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../gnatdll$(exeext): ../stamp-tools
+ ../../gnatdll$(exeext): 
 -      $(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c $(ADA_INCLUDES) gnatdll.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) $(GNATBIND_FLAGS) gnatdll
        $(GNATLINK) -v gnatdll -o $@ --GCC=$(GCC_LINK) $(TOOLS_LIBS)
  
- ../../vxaddr2line$(exeext): ../stamp-tools
+ ../../vxaddr2line$(exeext): 
 -      $(GNATMAKE) -c  $(ADA_INCLUDES) vxaddr2line --GCC="$(CC) $(ALL_ADAFLAGS)"
 +      $(GNATMAKE) -c  $(ADA_INCLUDES) vxaddr2line.adb --GCC="$(CC) $(ALL_ADAFLAGS)"
        $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line 

diff --git a/gcc-nodebug.patch b/gcc-nodebug.patch
index 759e911e96a2645304f4e3b6708f0517e21e9de5..333ee7a6b9c4f3d744a9dae8fcbcc9a8af88b3d3 100644 (file)
--- a/gcc-nodebug.patch
+++ b/gcc-nodebug.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- gcc-4.1-20050522/gcc/Makefile.in.orig      2005-05-20 21:17:40.000000000 +0000
++++ gcc-4.1-20050522/gcc/Makefile.in   2005-05-26 10:49:01.000000000 +0000
+@@ -148,10 +148,10 @@
  # TCFLAGS is used for compilations with the GCC just built.
  XCFLAGS =
  TCFLAGS =
@@ -14,15 +14,15 @@
  
  # Flags to determine code coverage. When coverage is disabled, this will
  # contain the optimization flags, as you normally want code coverage
-@@ -511,7 +511,7 @@
+@@ -520,7 +520,7 @@
  
  # Options to use when compiling libgcc2.a.
  #
 -LIBGCC2_DEBUG_CFLAGS = -g
 +LIBGCC2_DEBUG_CFLAGS =
- 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.
+ LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) \
+                $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) \
+                -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED @inhibit_libc@
 --- 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 @@