- err... commit modifed files as well

[packages/gcc.git] / gcc-ada-link.patch

diff --git a/gcc-ada-link.patch b/gcc-ada-link.patch
index b664972b8411996002334d7a1ad97f069c97ab34..e3df27e6eba9f29b872422406e2f77740bd0d4b9 100644 (file)
--- a/gcc-ada-link.patch
+++ b/gcc-ada-link.patch
@@ -21,7 +21,7 @@
        -$(MKDIR) ada/doctools
        $(CP) $^ ada/doctools
 -      cd ada/doctools && $(GNATMAKE) -q xgnatugn
-+      cd ada/doctools && $(GNATMAKE) -q xgnatugn -a0../rts
++      cd ada/doctools && $(GNATMAKE) -q xgnatugn -aO../rts
  
  # Note that gnat_ugn_unw.texi does not depend on xgnatugn 
  # being built so we can distribute a pregenerated gnat_ugn_unw.info
@@ -55,12 +55,15 @@
        cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
                libgnat$(soext)
        cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-@@ -2546,7 +2547,7 @@
+--- a/gcc/ada/gcc-interface/Makefile.in~       2011-03-27 13:01:06.697666231 +0200
++++ b/gcc/ada/gcc-interface/Makefile.in        2011-03-27 13:08:55.725801177 +0200
+@@ -2500,7 +2500,7 @@
             THREAD_KIND="$(THREAD_KIND)" \
               gnatlib
        $(RM) $(RTSDIR)/libgna*$(soext)
--      cd $(RTSDIR); ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
-+      cd $(RTSDIR); ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
+-      cd $(RTSDIR); ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \
++      cd $(RTSDIR); ../../xgcc -B../../ -shared -shared-libgcc $(GNATLIBCFLAGS) \
+               $(TARGET_LIBGCC2_CFLAGS) \
                -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
                $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-               $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB)
+