- up to 4.7.3

diff --git a/gcc-ppc64-m32-m64-multilib-only.patch b/gcc-ppc64-m32-m64-multilib-only.patch
index 6665f975fe3c16d237a542e0c1b309e1ba02e87f..091019e9439e9d4b246d08d9a6e6ebf4c1d36701 100644 (file)
--- a/gcc-ppc64-m32-m64-multilib-only.patch
+++ b/gcc-ppc64-m32-m64-multilib-only.patch
@@ -1,6 +1,6 @@
 --- gcc-4.7.1/gcc/config/rs6000/t-linux64.orig 2011-11-02 16:23:48.000000000 +0100
 +++ gcc-4.7.1/gcc/config/rs6000/t-linux64      2012-07-12 18:36:30.279053123 +0200
-@@ -26,10 +26,10 @@
+@@ -26,12 +26,10 @@
  # it doesn't tell anything about the 32bit libraries on those systems.  Set
  # MULTILIB_OSDIRNAMES according to what is found on the target.
  
@@ -11,9 +11,11 @@
  MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
 -MULTILIB_EXCEPTIONS     = m64/msoft-float
 -MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES   = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
--MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
+-MULTILIB_OSDIRNAMES   = ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
 +MULTILIB_EXCEPTIONS     =
 +MULTILIB_EXCLUSIONS     =
-+MULTILIB_OSDIRNAMES   = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+ MULTILIB_OSDIRNAMES    += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
+-MULTILIB_OSDIRNAMES    += nof
+-MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
 +MULTILIB_MATCHES        =
+

diff --git a/gcc.spec b/gcc.spec
index 5f5d4c8006dc10108a12f1f14042ab05814796c1..74ced4b974526c475d1d28ff5d1f311384caf424 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -81,7 +81,7 @@
 %endif
 
 %define                major_ver       4.7
-%define                minor_ver       2
+%define                minor_ver       3
 %define                major_ecj_ver   4.5
 # class data version seen with file(1) that this jvm is able to load
 %define                _classdataversion 50.0
@@ -93,20 +93,20 @@ Summary(pl.UTF-8):  Kolekcja kompilatorów GNU: kompilator C i pliki współdziel
 Summary(pt_BR.UTF-8):  Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:          gcc
 Version:       %{major_ver}.%{minor_ver}
-Release:       11
+Release:       1
 Epoch:         6
 License:       GPL v3+
 Group:         Development/Languages
 Source0:       ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: cc308a0891e778cfda7a151ab8a6e762
+# Source0-md5: 86f428a30379bdee0224e353ee2f999e
 Source1:       %{name}-optimize-la.pl
 Source2:       ftp://sourceware.org/pub/java/ecj-%{major_ecj_ver}.jar
 # Source2-md5: d7cd6a27c8801e66cbaa964a039ecfdb
 # check libffi version with libffi/configure.ac
 Source3:       libffi.pc.in
-# svn diff -x --ignore-eol-style --force svn://gcc.gnu.org/svn/gcc/tags/gcc_4_7_2_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch > gcc-branch.diff
+# svn diff -x --ignore-eol-style --force svn://gcc.gnu.org/svn/gcc/tags/gcc_4_7_3_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch > gcc-branch.diff
 Patch100:      %{name}-branch.diff
-# Patch100-md5:        34d2f91a58f942cf98a15e73614625c9
+# Patch100-md5:        ed71b602ecff35de8f4678e27dd9c2ef
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-cloog.patch
 Patch2:                %{name}-nodebug.patch
@@ -116,7 +116,6 @@ Patch6:             %{name}-ppc64-m32-m64-multilib-only.patch
 Patch7:                %{name}-libjava-multilib.patch
 Patch8:                %{name}-enable-java-awt-qt.patch
 Patch10:       %{name}-moresparcs.patch
-Patch11:       libgo-werror.patch
 Patch13:       issue4664051.patch
 URL:           http://gcc.gnu.org/
 BuildRequires: autoconf >= 2.64
@@ -1508,7 +1507,6 @@ Statyczna biblioteka języka Go - wersja 32-bitowa.
 %patch8 -p1
 %endif
 %patch10 -p1
-%patch11 -p1
 
 %patch13 -p0
 

diff --git a/libgo-werror.patch b/libgo-werror.patch
deleted file mode 100644 (file)
index 880be95..0000000
--- a/libgo-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gcc-4.7.1/libgo/runtime/print.c
-+++ gcc-4.7.1/libgo/runtime/print.c
-@@ -17,7 +17,8 @@
-       G* g = runtime_g();
- 
-       if(g == nil || g->writebuf == nil) {
--              runtime_write(2, v, n);
-+              ssize_t bytesWritten = runtime_write(2, v, n);
-+              (void)bytesWritten;
-               return;
-       }
-