- removed obsolete PR10849 patch (properly fixed now)

- unwind patch is obsolete or needs to be rewritten

Changed files:
    gcc-PR10849.patch -> 1.2
    gcc.spec -> 1.190

diff --git a/gcc-PR10849.patch b/gcc-PR10849.patch
deleted file mode 100644 (file)
index 666049f..0000000
--- a/gcc-PR10849.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -cprN gcc-33-save/gcc/cp/search.c gcc-33-new/gcc/cp/search.c
-*** gcc-33-save/gcc/cp/search.c        Thu May 22 19:19:30 2003
---- gcc-33-new/gcc/cp/search.c Sat May 24 19:03:32 2003
-*************** type_access_control (type, val)
-*** 1020,1026 ****
-  {
-    if (val == NULL_TREE
-        || (TREE_CODE (val) != TEMPLATE_DECL && TREE_CODE (val) != TYPE_DECL)
-!       || ! DECL_CLASS_SCOPE_P (val))
-      return;
-  
-    if (type_lookups == error_mark_node)
---- 1020,1027 ----
-  {
-    if (val == NULL_TREE
-        || (TREE_CODE (val) != TEMPLATE_DECL && TREE_CODE (val) != TYPE_DECL)
-!       || ! DECL_CLASS_SCOPE_P (val)
-!       || processing_specialization)
-      return;
-  
-    if (type_lookups == error_mark_node)
-diff -cprN gcc-33-save/gcc/testsuite/g++.dg/template/access10.C gcc-33-new/gcc/testsuite/g++.dg/template/access10.C
-*** gcc-33-save/gcc/testsuite/g++.dg/template/access10.C       Thu Jan  1 07:00:00 1970
---- gcc-33-new/gcc/testsuite/g++.dg/template/access10.C        Sat May 24 23:26:59 2003
-***************
-*** 0 ****
---- 1,16 ----
-+ // { dg-do compile }
-+ 
-+ // Origin: Giovanni Bajo <giovannibajo@libero.it>
-+ 
-+ // PR c++/10849: Incorrect access checking on template specialization.
-+ 
-+ class X {
-+   private:
-+     template <typename T> struct Y;
-+ };
-+ 
-+ template <> struct X::Y<int> {};
-+ 
-+ template <typename T> struct X::Y {};
-+ 
-+ template struct X::Y<int>;

diff --git a/gcc.spec b/gcc.spec
index 171ac17c10c51b92aba7a5841ebcd5bb76e5f2ab..dbaf4ef870d720aae82c33742232f89d5e75d01c 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -28,7 +28,6 @@ Patch0:               %{name}-info.patch
 Patch1:                %{name}-paths.patch
 Patch2:                %{name}-nolocalefiles.patch
 Patch3:                %{name}-ada-link-new-libgnat.patch
-Patch4:                %{name}-PR10849.patch
 # -- stolen patches from RH --
 Patch10:       gcc32-ada-link.patch
 Patch11:       gcc32-boehm-gc-libs.patch
@@ -45,7 +44,7 @@ Patch21:      gcc32-inline-label.patch
 Patch22:       gcc32-java-no-rpath.patch
 Patch23:       gcc32-test-rh65771.patch
 Patch24:       gcc32-test-rotate.patch
-Patch25:       %{name}-unwind.patch
+#Patch25:      %{name}-unwind.patch    -- obsolete?
 BuildRequires: autoconf
 BuildRequires: binutils >= 2.14
 BuildRequires: bison
@@ -620,9 +619,6 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch22
 %patch23
 %patch24
-%ifarch alpha
-%patch25
-%endif
 
 # because we distribute modified version of gcc...
 perl -pi -e 's/(version.*)";/$1 (PLD Linux)";/' gcc/version.c