- updated for current snap.

Changed files:
    gcc-ada-link.patch -> 1.7.2.2
    gcc-alpha-ada_fix.patch -> 1.6.2.1

diff --git a/gcc-ada-link.patch b/gcc-ada-link.patch
index e6df6eb96621316b18ba4cad2d3d07c1d86785b9..dd26b510b585ff8c96e91cfdab95a5f24dd2a0b6 100644 (file)
--- a/gcc-ada-link.patch
+++ b/gcc-ada-link.patch
@@ -39,8 +39,8 @@
   s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads  
  
  LIBGNAT=../rts/libgnat.a 
--GCC_LINK="$(CC) -static-libgcc $(ADA_INCLUDES)"
-+GCC_LINK="$(CC) $(ADA_INCLUDES)"
+-GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES)
++GCC_LINK=$(CC) $(ADA_INCLUDES)
  
  # when compiling the tools, the runtime has to be first on the path so that
  # it hides the runtime files lying with the rest of the sources

diff --git a/gcc-alpha-ada_fix.patch b/gcc-alpha-ada_fix.patch
index e8f10bb09c1d9175a06e3e99ce5d1c1e7ce380a3..e9cf23c2071f6ede9fd9cec0d56e55d748b81a74 100644 (file)
--- a/gcc-alpha-ada_fix.patch
+++ b/gcc-alpha-ada_fix.patch
@@ -7,79 +7,79 @@
 -      $(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)
+       $(GNATLINK) -v gnatchop -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatcmd -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatkr -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatls -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatname -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gprmake -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatprep -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatxref -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatfind -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatclean -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatsym -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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)
+       $(GNATLINK) -v gnatdll -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  
  ../../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 
-       $(GNATLINK) -v vxaddr2line -o $@ --GCC=$(GCC_LINK) $(CLIB)
+       $(GNATLINK) -v vxaddr2line -o $@ --GCC="$(GCC_LINK)" $(CLIB)
  
 --- gcc/gcc/ada/Make-lang.in~  2005-03-02 18:52:34.000000000 +0000
 +++ gcc/gcc/ada/Make-lang.in   2005-03-02 19:07:26.000000000 +0000