- updated moresparcs patch

- fixed -p level for plugin-decl-hook patch

Changed files:
    gcc-moresparcs.patch -> 1.6
    gcc.spec -> 1.653

diff --git a/gcc-moresparcs.patch b/gcc-moresparcs.patch
index df1ca70781997ee81ea994ec3ee17458eb756e80..38a68ffcfdf701baab0e49439622c325916f49d9 100644 (file)
--- a/gcc-moresparcs.patch
+++ b/gcc-moresparcs.patch
@@ -1,26 +1,26 @@
---- gcc/config.gcc.jj  2008-04-24 15:42:46.000000000 -0500
-+++ gcc/config.gcc     2008-04-24 15:44:51.000000000 -0500
-@@ -2370,7 +2370,7 @@
-       tmake_file="sparc/t-elf sparc/t-crtfm"
-       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-       ;;
--sparc-*-linux*)               # SPARC's running GNU/Linux, libc6
-+sparc-*-linux* | sparcv[789]*-*-linux*)               # SPARC's running GNU/Linux, libc6
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h"
+--- gcc-4.6.0/gcc/config.gcc.orig      2011-03-14 07:05:29.000000000 +0100
++++ gcc-4.6.0/gcc/config.gcc   2011-04-30 16:17:12.535045280 +0200
+@@ -2529,7 +2529,7 @@
+       tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
+       extra_parts="crtbegin.o crtend.o"
+       ;;
+-sparc-*-linux*)
++sparc-*-linux* | sparcv[789]*-*-linux*)
+       tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
-       tmake_file="${tmake_file} sparc/t-linux"
-@@ -2458,7 +2458,7 @@
-               *) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
-       esac
-       ;;
--sparc64-*-linux*)             # 64-bit SPARC's running GNU/Linux
-+sparc64*-*-linux*)            # 64-bit SPARC's running GNU/Linux
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h sparc/linux64.h"
+       case ${target} in
+@@ -2623,7 +2623,7 @@
+       tmake_file="${tmake_file} sparc/t-crtfm t-rtems"
+       extra_parts="crtbegin.o crtend.o"
+       ;;
+-sparc64-*-linux*)
++sparc64*-*-linux*)
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/linux64.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
---- libgcc/config.host.jj      2008-04-24 15:46:19.000000000 -0500
-+++ libgcc/config.host 2008-04-24 15:46:49.000000000 -0500
-@@ -572,7 +572,7 @@ sparc64-*-openbsd*)
+--- gcc-4.6.0/libgcc/config.host.orig  2011-03-14 07:06:23.000000000 +0100
++++ gcc-4.6.0/libgcc/config.host       2011-04-30 16:18:16.995047438 +0200
+@@ -548,7 +548,7 @@
        ;;
  sparc-*-elf*)
        ;;
@@ -29,7 +29,7 @@
        extra_parts="$extra_parts crtfastmath.o"
        tmake_file="${tmake_file} sparc/t-crtfm"
        ;;
-@@ -590,7 +590,7 @@ sparc-wrs-vxworks)
+@@ -564,7 +564,7 @@
        ;;
  sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        ;;

diff --git a/gcc.spec b/gcc.spec
index 2f0026266d6693d162aa3c8614a27446181e0fe1..66b15fd3a061f238fa413c612c49b80812202a35 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -1286,9 +1286,8 @@ Static GCC __float128 library - 32-bit version.
 %if %{with qt}
 %patch8 -p1
 %endif
-# FIXME for sparc
-#%patch10 -p0
-%patch12 -p0
+%patch10 -p1
+%patch12 -p1
 
 mv ChangeLog ChangeLog.general