- updated "outdated" gcc32-ada-link and gcc32-tls patches

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

diff --git a/gcc32-ada-link.patch b/gcc32-ada-link.patch
index fdab7f1f9749168a66be54eaed9dce7246a474d3..75efa47e88f2df7b6660addfd3ab09df10a18f2e 100644 (file)
--- a/gcc32-ada-link.patch
+++ b/gcc32-ada-link.patch
@@ -98,7 +98,7 @@ diff -Nur gcc-3.2.2/gcc/ada/Makefile.in gcc-3.2.2-20030218/gcc/ada/Makefile.in
  ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),)
    ifeq ($(strip $(filter-out mips sgi irix6%,$(targ))),)
      LIBGNAT_TARGET_PAIRS = \
-@@ -2179,9 +2242,12 @@
+@@ -2179,6 +2242,9 @@
  
  gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
  #     ../xgcc -B../ -dD -E ../tconfig.h $(INCLUDES) > rts/tconfig.h
@@ -107,11 +107,7 @@ diff -Nur gcc-3.2.2/gcc/ada/Makefile.in gcc-3.2.2-20030218/gcc/ada/Makefile.in
 +      $(MV) *.o save/
        $(MAKE) -C rts CC="../../xgcc -B../../" \
                INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
--                CFLAGS="$(GNATLIBCFLAGS) $(LIBGCC2_CFLAGS) -DIN_RTS" \
-+                CFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -DIN_RTS" \
-               ADA_CFLAGS="$(GNATLIBCFLAGS)" \
-               srcdir=$(fsrcdir) \
-               -f ../Makefile $(LIBGNAT_OBJS)
+                 CFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -DIN_RTS" \
 @@ -2192,6 +2258,8 @@
                srcdir=$(fsrcdir) \
                -f ../Makefile \
@@ -121,21 +117,9 @@ diff -Nur gcc-3.2.2/gcc/ada/Makefile.in gcc-3.2.2-20030218/gcc/ada/Makefile.in
        $(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
        $(AR) $(AR_FLAGS) rts/libgnat$(arext) \
           $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
-@@ -2279,16 +2347,16 @@
- gnatlib-shared-default:
-       $(MAKE) $(FLAGS_TO_PASS) \
-              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
--           GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(LIBGCC2_CFLAGS)" \
-+           GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
-            THREAD_KIND="$(THREAD_KIND)" \
-              gnatlib
-       $(RM) rts/libgnat$(soext) rts/libgnarl$(soext)
--      cd rts; ../../xgcc -B../../ -shared $(LIBGCC2_CFLAGS) \
-+      cd rts; ../../xgcc -B../../ -shared -shared-libgcc $(TARGET_LIBGCC2_CFLAGS) \
-               -o libgnat-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnat-$(LIBRARY_VERSION)$(soext) \
+@@ -2288,7 +2358,7 @@
                $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) $(MISCLIB) -lm
--      cd rts; ../../xgcc -B../../ -shared $(LIBGCC2_CFLAGS) \
-+      cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
+       cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \
                -o libgnarl-$(LIBRARY_VERSION)$(soext) $(SO_OPTS)libgnarl-$(LIBRARY_VERSION)$(soext) \
 -              $(GNATRTL_TASKING_OBJS) $(THREADSLIB)
 +              $(GNATRTL_TASKING_OBJS) $(THREADSLIB) ./libgnat-$(LIBRARY_VERSION)$(soext)