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

Changed files:
    gcc.spec -> 1.148
    gcc32-ada-link.patch -> 1.3
    gcc32-tls.patch -> 1.3

diff --git a/gcc.spec b/gcc.spec
index ecf97ecde376ca20fcf894e845972d47b58a1228..fa51b711de419b0010e3c05a78e6542395ad690f 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -30,6 +30,7 @@ Patch5:               %{name}-gcc-page.c.patch
 Patch6:                %{name}-info.patch
 Patch7:                %{name}-ada-link-new-libgnat.patch
 # -- stolen patches from RH --
+Patch10:       gcc32-ada-link.patch
 Patch11:       gcc32-attr-visibility.patch
 Patch12:       gcc32-attr-visibility2.patch
 Patch13:       gcc32-attr-visibility3.patch
@@ -60,6 +61,12 @@ Patch38:     gcc32-pr6842.patch
 Patch39:       gcc32-sparc-sll1.patch
 Patch40:       gcc32-test-rh65771.patch
 Patch41:       gcc32-test-rotate.patch
+Patch42:       gcc32-tls-dwarf2.patch
+Patch43:       gcc32-tls.patch
+Patch44:       gcc32-tls2.patch
+Patch45:       gcc32-tls3.patch
+Patch46:       gcc32-tls4.patch
+Patch47:       gcc32-tls5.patch
 BuildRequires: autoconf
 BuildRequires: bison
 BuildRequires: fileutils >= 4.0.41
@@ -577,6 +584,7 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch5 -p1
 %patch7 -p1
 
+%patch10 -p1
 %patch11
 %patch12
 %patch13
@@ -606,6 +614,12 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch39
 %patch40
 %patch41
+%patch42
+%patch43
+%patch44
+%patch45
+%patch46
+%patch47
 
 %patch6 -p1
 

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)

diff --git a/gcc32-tls.patch b/gcc32-tls.patch
index d8ec11164f5e0ed30c10ff52764769bb3d372072..f37fd5fe009fa4e4be411aa6ad137584b1c4673b 100644 (file)
--- a/gcc32-tls.patch
+++ b/gcc32-tls.patch
@@ -3293,8 +3293,8 @@
   * files which are fixed to work correctly with ANSI C and placed in a
   * directory that GNU C will search.
   *
-- * This file contains 142 fixup descriptions.
-+ * This file contains 143 fixup descriptions.
+- * This file contains 151 fixup descriptions.
++ * This file contains 152 fixup descriptions.
   *
   * See README for more information.
   *
@@ -3344,11 +3344,11 @@
   *
   *  List of all fixes
   */
--#define REGEX_COUNT          151
-+#define REGEX_COUNT          152
+-#define REGEX_COUNT          163
++#define REGEX_COUNT          164
  #define MACH_LIST_SIZE_LIMIT 279
--#define FIX_COUNT            142
-+#define FIX_COUNT            143
+-#define FIX_COUNT            151
++#define FIX_COUNT            152
  
  /*
   *  Enumerate the fixes