openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package gcc43 (Revision 0b324b181ae4278cb4a6ec3f17afd0eb)

Currently displaying revision 0b324b181ae4278cb4a6ec3f17afd0eb , Show latest

--- amd-cvect-2.diff.orig
+++ amd-cvect-2.diff
@@ -34,7 +34,7 @@
 Index: gcc/testsuite/gcc.dg/vect/vect-1.c
 ===================================================================
 *** gcc/testsuite/gcc.dg/vect/vect-1.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/vect-1.c	2008-08-12 23:29:12.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/vect-1.c	2009-08-04 14:30:36.000000000 +0200
 *************** foo (int n)
 *** 86,91 ****
     fbar (a);
@@ -53,7 +53,7 @@ Index: gcc/testsuite/gcc.dg/vect/vect-1.
 Index: gcc/testsuite/gcc.dg/vect/vect-107.c
 ===================================================================
 *** gcc/testsuite/gcc.dg/vect/vect-107.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/vect-107.c	2008-08-12 23:29:12.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/vect-107.c	2009-08-04 14:30:36.000000000 +0200
 *************** int main (void)
 *** 39,44 ****
     return main1 ();
@@ -71,15 +71,15 @@ Index: gcc/testsuite/gcc.dg/vect/vect-10
   /* { dg-final { cleanup-tree-dump "vect" } } */
 Index: gcc/testsuite/gcc.dg/vect/slp-11.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/vect/slp-11.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/slp-11.c	2008-08-12 23:29:12.000000000 +0200
+*** gcc/testsuite/gcc.dg/vect/slp-11.c.orig	2009-07-27 15:26:21.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/slp-11.c	2009-08-04 14:31:26.000000000 +0200
 *************** int main (void)
 *** 106,113 ****
     return 0;
   }
   
-! /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect"  { target { vect_strided &&  vect_int_mult } } } } */
-! /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect"  {target  { ! { vect_int_mult && vect_strided } } } } }  */
+! /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect"  { target { { vect_uintfloat_cvt && vect_strided } &&  vect_int_mult } } } } */
+! /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  { target { { { ! vect_uintfloat_cvt } && vect_strided } &&  vect_int_mult } } } } */
   /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0  "vect"  } } */
   /* { dg-final { cleanup-tree-dump "vect" } } */
     
@@ -87,15 +87,15 @@ Index: gcc/testsuite/gcc.dg/vect/slp-11.
     return 0;
   }
   
-! /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect"  { target { vect_strided_wide &&  vect_int_mult } } } } */
-! /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect"  {target  { ! { vect_int_mult && vect_strided_wide } } } } }  */
+! /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect"  { target { { vect_uintfloat_cvt && vect_strided_wide } &&  vect_int_mult } } } } */
+! /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  { target { { { ! vect_uintfloat_cvt } && vect_strided_wide } &&  vect_int_mult } } } } */
   /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0  "vect"  } } */
   /* { dg-final { cleanup-tree-dump "vect" } } */
     
 Index: gcc/testsuite/gcc.dg/vect/slp-19.c
 ===================================================================
 *** gcc/testsuite/gcc.dg/vect/slp-19.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/slp-19.c	2008-08-12 23:29:12.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/slp-19.c	2009-08-04 14:30:36.000000000 +0200
 *************** int main (void)
 *** 147,155 ****
     return 0;
@@ -120,7 +120,7 @@ Index: gcc/testsuite/gcc.dg/vect/slp-19.
 Index: gcc/testsuite/gcc.dg/vect/vect-98.c
 ===================================================================
 *** gcc/testsuite/gcc.dg/vect/vect-98.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/vect-98.c	2008-08-12 23:29:12.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/vect-98.c	2009-08-04 14:30:36.000000000 +0200
 *************** int main (void)
 *** 38,43 ****
   }
@@ -139,7 +139,7 @@ Index: gcc/testsuite/gcc.dg/vect/vect-98
 Index: gcc/testsuite/gcc.dg/vect/vect-strided-float.c
 ===================================================================
 *** gcc/testsuite/gcc.dg/vect/vect-strided-float.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/vect-strided-float.c	2008-08-12 23:29:12.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/vect-strided-float.c	2009-08-04 14:30:36.000000000 +0200
 *************** int main (void)
 *** 38,44 ****
   }
@@ -160,7 +160,7 @@ Index: gcc/testsuite/gcc.dg/vect/vect-st
 Index: gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c
 ===================================================================
 *** gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c.orig	2008-04-23 15:51:28.000000000 +0200
---- gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c	2008-08-12 23:29:12.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c	2009-08-04 14:30:36.000000000 +0200
 *************** float method2_int16 (struct mem *mem)
 *** 19,25 ****
     return avg;
@@ -181,7 +181,7 @@ Index: gcc/testsuite/gcc.dg/vect/fast-ma
 Index: gcc/testsuite/gcc.dg/vect/slp-12a.c
 ===================================================================
 *** gcc/testsuite/gcc.dg/vect/slp-12a.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/slp-12a.c	2008-08-12 23:29:12.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/slp-12a.c	2009-08-04 14:30:36.000000000 +0200
 *************** int main (void)
 *** 95,105 ****
     return 0;
@@ -209,8 +209,8 @@ Index: gcc/testsuite/gcc.dg/vect/slp-12a
     
 Index: gcc/testsuite/gcc.dg/vect/fast-math-vect-complex-3.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/vect/fast-math-vect-complex-3.c.orig	2008-08-12 23:29:03.000000000 +0200
---- gcc/testsuite/gcc.dg/vect/fast-math-vect-complex-3.c	2008-08-12 23:29:12.000000000 +0200
+*** gcc/testsuite/gcc.dg/vect/fast-math-vect-complex-3.c.orig	2009-08-04 14:30:19.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/fast-math-vect-complex-3.c	2009-08-04 14:30:36.000000000 +0200
 *************** main (void)
 *** 57,61 ****
     return 0;
@@ -227,7 +227,7 @@ Index: gcc/testsuite/gcc.dg/vect/fast-ma
 Index: gcc/testsuite/gcc.dg/vect/slp-23.c
 ===================================================================
 *** gcc/testsuite/gcc.dg/vect/slp-23.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/slp-23.c	2008-08-12 23:29:12.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/slp-23.c	2009-08-04 14:30:36.000000000 +0200
 *************** int main (void)
 *** 106,113 ****
     return 0;
@@ -250,7 +250,7 @@ Index: gcc/testsuite/gcc.dg/vect/slp-23.
 Index: gcc/testsuite/gcc.dg/vect/slp-5.c
 ===================================================================
 *** gcc/testsuite/gcc.dg/vect/slp-5.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/slp-5.c	2008-08-12 23:29:12.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/slp-5.c	2009-08-04 14:30:36.000000000 +0200
 *************** int main (void)
 *** 121,128 ****
     return 0;
@@ -272,8 +272,8 @@ Index: gcc/testsuite/gcc.dg/vect/slp-5.c
     
 Index: gcc/testsuite/gcc.dg/vect/slp-12b.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/vect/slp-12b.c.orig	2008-02-19 10:53:27.000000000 +0100
---- gcc/testsuite/gcc.dg/vect/slp-12b.c	2008-08-12 23:29:12.000000000 +0200
+*** gcc/testsuite/gcc.dg/vect/slp-12b.c.orig	2009-07-27 15:26:21.000000000 +0200
+--- gcc/testsuite/gcc.dg/vect/slp-12b.c	2009-08-04 14:30:36.000000000 +0200
 *************** int main (void)
 *** 43,51 ****
     return 0;
@@ -297,11 +297,11 @@ Index: gcc/testsuite/gcc.dg/vect/slp-12b
     
 Index: gcc/testsuite/lib/target-supports.exp
 ===================================================================
-*** gcc/testsuite/lib/target-supports.exp.orig	2008-07-25 17:52:11.000000000 +0200
---- gcc/testsuite/lib/target-supports.exp	2008-08-12 23:29:12.000000000 +0200
+*** gcc/testsuite/lib/target-supports.exp.orig	2009-07-27 15:26:22.000000000 +0200
+--- gcc/testsuite/lib/target-supports.exp	2009-08-04 14:30:36.000000000 +0200
 *************** proc check_effective_target_vect_extract
-*** 2000,2005 ****
---- 2000,2026 ----
+*** 2048,2053 ****
+--- 2048,2074 ----
       return $et_vect_extract_even_odd_saved
   }
   
@@ -330,8 +330,8 @@ Index: gcc/testsuite/lib/target-supports
   
   proc check_effective_target_vect_interleave { } {
 *************** proc check_effective_target_vect_strided
-*** 2038,2043 ****
---- 2059,2083 ----
+*** 2086,2091 ****
+--- 2107,2131 ----
       return $et_vect_strided_saved
   }
   
@@ -359,8 +359,8 @@ Index: gcc/testsuite/lib/target-supports
   proc check_effective_target_section_anchors { } {
 Index: gcc/config/i386/sse.md
 ===================================================================
-*** gcc/config/i386/sse.md.orig	2008-08-12 23:29:02.000000000 +0200
---- gcc/config/i386/sse.md	2008-08-12 23:30:22.000000000 +0200
+*** gcc/config/i386/sse.md.orig	2009-08-04 14:30:19.000000000 +0200
+--- gcc/config/i386/sse.md	2009-08-04 14:30:36.000000000 +0200
 ***************
 *** 36,41 ****
 --- 36,45 ----
@@ -432,7 +432,7 @@ Index: gcc/config/i386/sse.md
   		     (match_operand 4 "const_0_to_3_operand" "")
   		     (match_operand 5 "const_4_to_7_operand" "")
 ***************
-*** 3121,3138 ****
+*** 3123,3140 ****
     "TARGET_SSE2"
   {
     int mask = INTVAL (operands[3]);
@@ -451,7 +451,7 @@ Index: gcc/config/i386/sse.md
   	  (parallel [(match_operand 3 "const_0_to_1_operand" "")
   		     (match_operand 4 "const_2_to_3_operand" "")])))]
     "TARGET_SSE2"
---- 3129,3190 ----
+--- 3131,3192 ----
     "TARGET_SSE2"
   {
     int mask = INTVAL (operands[3]);
@@ -515,8 +515,8 @@ Index: gcc/config/i386/sse.md
   		     (match_operand 4 "const_2_to_3_operand" "")])))]
     "TARGET_SSE2"
 ***************
-*** 4895,4900 ****
---- 4947,4992 ----
+*** 4913,4918 ****
+--- 4965,5010 ----
     DONE;
   })
   
@@ -565,10 +565,10 @@ Index: gcc/config/i386/sse.md
   	(vec_concat:V16QI
 Index: gcc/config/i386/i386.c
 ===================================================================
-*** gcc/config/i386/i386.c.orig	2008-08-12 23:29:02.000000000 +0200
---- gcc/config/i386/i386.c	2008-08-12 23:29:13.000000000 +0200
+*** gcc/config/i386/i386.c.orig	2009-08-04 14:30:19.000000000 +0200
+--- gcc/config/i386/i386.c	2009-08-04 14:30:36.000000000 +0200
 *************** ix86_expand_vector_init_one_nonzero (boo
-*** 23397,23403 ****
+*** 23473,23479 ****
   	  else
   	    tmp = new_target;
   
@@ -576,7 +576,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (1),
   				       GEN_INT (one_var == 1 ? 0 : 1),
   				       GEN_INT (one_var == 2 ? 0+4 : 1+4),
---- 23397,23403 ----
+--- 23473,23479 ----
   	  else
   	    tmp = new_target;
   
@@ -585,7 +585,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (one_var == 1 ? 0 : 1),
   				       GEN_INT (one_var == 2 ? 0+4 : 1+4),
 *************** ix86_expand_vector_set (bool mmx_ok, rtx
-*** 23772,23778 ****
+*** 23848,23854 ****
   	  /* target = X A B B */
   	  ix86_expand_vector_set (false, target, val, 0);
   	  /* target = A X C D  */
@@ -593,7 +593,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (1), GEN_INT (0),
   				       GEN_INT (2+4), GEN_INT (3+4)));
   	  return;
---- 23772,23778 ----
+--- 23848,23854 ----
   	  /* target = X A B B */
   	  ix86_expand_vector_set (false, target, val, 0);
   	  /* target = A X C D  */
@@ -602,7 +602,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (2+4), GEN_INT (3+4)));
   	  return;
 *************** ix86_expand_vector_set (bool mmx_ok, rtx
-*** 23783,23789 ****
+*** 23859,23865 ****
   	  /* tmp = X B C D */
   	  ix86_expand_vector_set (false, tmp, val, 0);
   	  /* target = A B X D */
@@ -610,7 +610,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (0), GEN_INT (1),
   				       GEN_INT (0+4), GEN_INT (3+4)));
   	  return;
---- 23783,23789 ----
+--- 23859,23865 ----
   	  /* tmp = X B C D */
   	  ix86_expand_vector_set (false, tmp, val, 0);
   	  /* target = A B X D */
@@ -619,7 +619,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (0+4), GEN_INT (3+4)));
   	  return;
 *************** ix86_expand_vector_set (bool mmx_ok, rtx
-*** 23794,23800 ****
+*** 23870,23876 ****
   	  /* tmp = X B C D */
   	  ix86_expand_vector_set (false, tmp, val, 0);
   	  /* target = A B X D */
@@ -627,7 +627,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (0), GEN_INT (1),
   				       GEN_INT (2+4), GEN_INT (0+4)));
   	  return;
---- 23794,23800 ----
+--- 23870,23876 ----
   	  /* tmp = X B C D */
   	  ix86_expand_vector_set (false, tmp, val, 0);
   	  /* target = A B X D */
@@ -636,7 +636,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (2+4), GEN_INT (0+4)));
   	  return;
 *************** ix86_expand_vector_extract (bool mmx_ok,
-*** 23915,23921 ****
+*** 23991,23997 ****
   	case 1:
   	case 3:
   	  tmp = gen_reg_rtx (mode);
@@ -644,7 +644,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (elt), GEN_INT (elt),
   				       GEN_INT (elt+4), GEN_INT (elt+4)));
   	  break;
---- 23915,23921 ----
+--- 23991,23997 ----
   	case 1:
   	case 3:
   	  tmp = gen_reg_rtx (mode);
@@ -653,7 +653,7 @@ Index: gcc/config/i386/i386.c
   				       GEN_INT (elt+4), GEN_INT (elt+4)));
   	  break;
 *************** ix86_expand_reduc_v4sf (rtx (*fn) (rtx,
-*** 24032,24038 ****
+*** 24108,24114 ****
     emit_insn (gen_sse_movhlps (tmp1, in, in));
     emit_insn (fn (tmp2, tmp1, in));
   
@@ -661,7 +661,7 @@ Index: gcc/config/i386/i386.c
   			       GEN_INT (1), GEN_INT (1),
   			       GEN_INT (1+4), GEN_INT (1+4)));
     emit_insn (fn (dest, tmp2, tmp3));
---- 24032,24038 ----
+--- 24108,24114 ----
     emit_insn (gen_sse_movhlps (tmp1, in, in));
     emit_insn (fn (tmp2, tmp1, in));
   
--- gcc.spec.in.orig
+++ gcc.spec.in
@@ -128,7 +128,7 @@ BuildRequires: dejagnu expect
 %define biarch_targets x86_64 s390x powerpc64 powerpc
 
 URL:          http://gcc.gnu.org/
-Version: 4.3.3_20090714
+Version: 4.3.4_20090804
 Release:      1
 %define gcc_version %(echo %version | sed 's/_.*//')
 %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
@@ -1123,6 +1123,9 @@ export PATH=/opt/cross/bin:$PATH
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
 
+# -Wl,-as-needed breaks the libgcj setup
+export SUSE_ASNEEDED=0
+
 # configure tries to parse include/features.h to detect
 # if glibc supports SSP.  When cross compiling we would need
 # to install a cross glibc, which we don't, or make the whole
@@ -1488,7 +1491,6 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/includ
 rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/spe.h
 rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/bits
 rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys
-rm -f $RPM_BUILD_ROOT%{libsubdir}/include/cpuid.h
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f  $RPM_BUILD_ROOT%{_prefix}/bin/gccbug%{binsuffix}
 
@@ -1681,6 +1683,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %{libsubdir}/include/mmintrin.h
 %endif
 %ifarch %ix86 x86_64
+%{libsubdir}/include/cpuid.h
 %{libsubdir}/include/mm3dnow.h
 %{libsubdir}/include/mmintrin.h
 %{libsubdir}/include/mmintrin-common.h
--- gcc43.changes.orig
+++ gcc43.changes
@@ -1,4 +1,15 @@
 -------------------------------------------------------------------
+Tue Aug  4 14:14:33 CEST 2009 - rguenther@suse.de
+
+- Update to GCC 4.3.4 release. 
+- Disable -Wl,--as-needed.
+
+-------------------------------------------------------------------
+Mon Aug  3 11:31:45 CEST 2009 - rguenther@suse.de
+
+- Package cpuid.h.  [bnc#527433]
+
+-------------------------------------------------------------------
 Tue Jul 14 12:41:23 CEST 2009 - rguenther@suse.de
 
 - Update to gcc-4_3-branch head (r149624).
--- gcc43.spec.orig
+++ gcc43.spec
@@ -1,5 +1,4 @@
-#
-# spec file for package gcc43 (Version 4.3.3_20090714)
+# spec file for package gcc43 (Version 4.3.x)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,9 +17,12 @@
 # norootforbuild
 # icecream 0
 
+
+# Run the testsuite if there's a file named RUN_TESTS in the source
 %if 0%{!?run_tests:1}
 %define run_tests %(test -f %_sourcedir/RUN_TESTS && echo 1 || echo 0)
 %endif
+
 # Ada currently fails to build on a few platforms, enable it only
 # on those that work
 # Note that AdaCore only supports %ix86, x86_64 and ia64
@@ -30,6 +32,7 @@
 # alpha ppc64 s390x hppa
 %define build_ada 0
 %endif
+
 # We don't want to build java on arm
 %ifarch mips %arm
 %define build_java 0
@@ -38,39 +41,44 @@
 %define build_java 1
 %define build_libjava 0%{?building_libjava:1}
 %endif
+
 %define build_cp 1
 %define build_fortran 1
 %define build_objc 1
 %define build_objcp 0%{!?building_libjava:1}
 %define build_with_mudflap 0
+
 %if %{build_objcp}
 %define build_cp 1
 %define build_objc 1
 %endif
+
 %if %{build_libjava}
 %define build_cp 1
 %endif
 
-Name:           gcc43
-BuildRequires:  bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel
+
+Name:         gcc43
+BuildRequires: bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel
 %if %{build_ada}
 %if %{suse_version} > 1110
 %define hostsuffix -4.3
-BuildRequires:  gcc43-ada
+BuildRequires: gcc43-ada
 %else
 %define hostsuffix %{nil}
-BuildRequires:  gcc-ada
+BuildRequires: gcc-ada
 %endif
 %endif
 %if %{build_libjava}
-BuildRequires:  fastjar gtk2-devel libart_lgpl-devel unzip
+BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip
 %endif
 %ifarch ia64
-BuildRequires:  libunwind-devel
+BuildRequires: libunwind-devel
 %endif
 %if %{run_tests}
-BuildRequires:  dejagnu expect
+BuildRequires: dejagnu expect
 %endif
+
 # Define version number of libgcc_s
 %ifarch hppa
 %define libgcc_s 4
@@ -84,6 +92,7 @@ BuildRequires:  dejagnu expect
 %else
 %define build_nof 0
 %endif
+
 %define separate_bi32 0
 %define separate_bi64 0
 %ifarch ppc
@@ -94,6 +103,7 @@ BuildRequires:  dejagnu expect
 %ifarch x86_64 s390x ppc64
 %define separate_bi32 1
 %endif
+
 # Define two macros to trigger -32bit or -64bit package variants
 %define separate_biarch 0
 %if %{separate_bi32}
@@ -104,147 +114,154 @@ BuildRequires:  dejagnu expect
 %define separate_biarch 1
 %define separate_biarch_suffix -64bit
 %endif
+
 %ifarch x86_64 ia64 s390x alpha ppc64
 # 64-bit is primary build target
 %define build_primary_64bit 1
 %else
 %define build_primary_64bit 0
 %endif
+
 %define biarch_libjava 0
+
 # COMMON-BEGIN
 %define biarch_targets x86_64 s390x powerpc64 powerpc
-Url:            http://gcc.gnu.org/
-Version:        4.3.3_20090714
-Release:        1
+
+URL:          http://gcc.gnu.org/
+Version: 4.3.4_20090804
+Release:      1
 %define gcc_version %(echo %version | sed 's/_.*//')
 %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
 %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
 %define binsuffix -4.3
 # COMMON-END
+
 %if 0%{?!building_libjava:1}
-Requires:       binutils glibc-devel
-Requires:       cpp43 = %{version}-%{release}
-Requires:       libgcc%{libgcc_s} >= %{version}-%{release}
-Requires:       libgomp1 >= %{version}-%{release}
+Requires:     binutils glibc-devel
+Requires:     cpp43 = %{version}-%{release}
+Requires:     libgcc%{libgcc_s} >= %{version}-%{release}
+Requires:     libgomp1 >= %{version}-%{release}
 %if %{build_with_mudflap}
-Requires:       libmudflap0 >= %{version}-%{release}
-Requires:       libmudflapth0 >= %{version}-%{release}
+Requires:     libmudflap0 >= %{version}-%{release}
+Requires:     libmudflapth0 >= %{version}-%{release}
 %endif
 %if 0%{suse_version} > 1000
-Suggests:       gcc43-info gcc43-locale
+Suggests:     gcc43-info gcc43-locale
 %endif
 %endif
+
 # COMMON-BEGIN
-AutoReqProv:    on
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         gcc-%{gcc_version}%{snapshot_date}.tar.bz2
-Source1:        change_spec
-Source2:        libgcj43-rpmlintrc
-Source3:        gcc43-rpmlintrc
-Source4:        ecj.jar
-Source5:        README.First-for.SuSE.packagers
-Patch1:         gcc-dir-version.patch
-Patch2:         gcc-sles-version.patch
-Patch3:         gcc-noalias-warn.diff
-Patch4:         gcc-add-defaultsspec.diff
-Patch5:         boehm-gc-strict-aliasing.patch
-Patch6:         suse-record-gcc-opts.diff
-Patch7:         acats-timeout.patch
-Patch10:        program-transform-name.diff
-Patch11:        program-transform-name-tools.diff
-Patch12:        gcc4-ppc64-m32-m64-multilib-only.patch
-Patch22:        libjava-no-static.diff
-Patch23:        libjava-no-multilib.diff
-Patch24:        tls-no-direct.diff
-Patch25:        pr27880.diff
-Patch28:        pr33763.diff
-Patch29:        pr40141.diff
-Patch30:        Wunprototyped-calls.diff
-Patch31:        pr27799-1.diff
-Patch32:        pr27799-2.diff
-Patch33:        pr27799-3.diff
-Patch41:        fpreserve-function-arguments43.patch
-Patch42:        pr27975.diff
-Patch43:        build-id.diff
-Patch44:        nvl428413.patch
-Patch45:        nvl423594.patch
+Autoreqprov:  on
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Source:       gcc-%{gcc_version}%{snapshot_date}.tar.bz2
+Source1:      change_spec
+Source2:      libgcj43-rpmlintrc
+Source3:      gcc43-rpmlintrc
+Source4:      ecj.jar
+Source5:      README.First-for.SuSE.packagers
+Patch1:		gcc-dir-version.patch
+Patch2:		gcc-sles-version.patch
+Patch3:		gcc-noalias-warn.diff
+Patch4:		gcc-add-defaultsspec.diff
+Patch5:		boehm-gc-strict-aliasing.patch
+Patch6:		suse-record-gcc-opts.diff
+Patch7:		acats-timeout.patch
+Patch10:	program-transform-name.diff
+Patch11:	program-transform-name-tools.diff
+Patch12:	gcc4-ppc64-m32-m64-multilib-only.patch
+Patch22:	libjava-no-static.diff
+Patch23:	libjava-no-multilib.diff
+Patch24:	tls-no-direct.diff
+Patch25:	pr27880.diff
+Patch28:	pr33763.diff
+Patch29:	pr40141.diff
+Patch30:	Wunprototyped-calls.diff
+Patch31:	pr27799-1.diff
+Patch32:	pr27799-2.diff
+Patch33:	pr27799-3.diff
+Patch41:	fpreserve-function-arguments43.patch
+Patch42:	pr27975.diff
+Patch43:	build-id.diff
+Patch44:	nvl428413.patch
+Patch45:	nvl423594.patch
 Patch46:        pr32277.diff
-Patch47:        gcc43-as-g0
-Patch202:       nvl440482.patch
-Patch204:       pr39675.diff
+Patch47:	gcc43-as-g0
+Patch202:	nvl440482.patch
+Patch204:	pr39675.diff
 # A set of patches from the RH srpm
-Patch50:        gcc43-c++-builtin-redecl.patch
-Patch51:        gcc41-ia64-stack-protector.patch
-Patch52:        gcc43-java-debug-iface-type.patch
-Patch53:        gcc43-libgomp-omp_h-multilib.patch
-Patch54:        gcc43-pr34037.patch
-Patch55:        gcc41-java-slow_pthread_self.patch
-Patch56:        gcc43-pr36741-revert.patch
-Patch57:        gcc41-ppc32-retaddr.patch
-Patch58:        gcc43-pr37189.patch
-Patch59:        gcc43-x86_64-va_start.patch
+Patch50:	gcc43-c++-builtin-redecl.patch
+Patch51:	gcc41-ia64-stack-protector.patch
+Patch52:	gcc43-java-debug-iface-type.patch
+Patch53:	gcc43-libgomp-omp_h-multilib.patch
+Patch54:	gcc43-pr34037.patch
+Patch55:	gcc41-java-slow_pthread_self.patch
+Patch56:	gcc43-pr36741-revert.patch
+Patch57:	gcc41-ppc32-retaddr.patch
+Patch58:	gcc43-pr37189.patch
+Patch59:	gcc43-x86_64-va_start.patch
 # Some patches taken from Debian
-Patch60:        gcc43-textdomain.patch
-Patch61:        gcc43-rename-info-files.patch
+Patch60:	gcc43-textdomain.patch
+Patch61:	gcc43-rename-info-files.patch
 # Patches for AMD features
-Patch70:        pr34043-1.diff
-Patch71:        pr34043-2.diff
-Patch72:        pr34043-3.diff
-Patch73:        pr34043-4.diff
-Patch74:        pr34043-5.diff
-Patch75:        amd-SSE5-shift-ppc-1.diff
-Patch76:        amd-SSE5-shift-ppc-2.diff
-Patch77:        amd-SSE5-shift.diff
-Patch78:        amd-cunroll-1.diff
-Patch79:        amd-cunroll-2.diff
-Patch81:        amd-cvect-1.diff
-Patch82:        amd-cvect-2.diff
+Patch70:	pr34043-1.diff
+Patch71:	pr34043-2.diff
+Patch72:	pr34043-3.diff
+Patch73:	pr34043-4.diff
+Patch74:	pr34043-5.diff
+Patch75:	amd-SSE5-shift-ppc-1.diff
+Patch76:	amd-SSE5-shift-ppc-2.diff
+Patch77:	amd-SSE5-shift.diff
+Patch78:	amd-cunroll-1.diff
+Patch79:	amd-cunroll-2.diff
+Patch81:	amd-cvect-1.diff
+Patch82:	amd-cvect-2.diff
 # Patches for Intel features
-Patch80:        intel303993-aes.diff
+Patch80:	intel303993-aes.diff
 # Patches for IBM features
-Patch90:        ibm304071-z10-1
-Patch91:        ibm304071-z10-2
-Patch92:        ibm304071-z10-3
-Patch93:        ibm304071-z10-4
-Patch94:        ibm304071-z10-5
-Patch95:        ibm304071-z10-6
-Patch96:        pr36745.diff
-Patch97:        pr36822.diff
-Patch99:        ibm-vector-keyword-1
-Patch100:       ibm-vector-keyword-2
-Patch101:       ibm-vector-keyword-3
-Patch102:       ibm304071-z10-7
-Patch103:       ibm304134-power7-1
-Patch104:       ibm-cell-split
-Patch105:       ibm-cell-split-fixes
-Patch106:       nvl425806.patch
-Patch109:       nvl425783.patch
-Patch110:       nvl425784.patch
-Patch111:       nvl425788.patch
-Patch112:       nvl425789.patch
-Patch114:       nvl425791.patch
-Patch115:       nvl425794.patch
-Patch116:       nvl425798-1.patch
-Patch117:       nvl425798-2.patch
-Patch118:       nvl425799.patch
-Patch119:       nvl426087.patch
-Patch120:       ibm304071-z10-8
-Patch121:       nvl434500.patch
-Patch122:       nvl436041.patch
+Patch90:	ibm304071-z10-1
+Patch91:	ibm304071-z10-2
+Patch92:	ibm304071-z10-3
+Patch93:	ibm304071-z10-4
+Patch94:	ibm304071-z10-5
+Patch95:	ibm304071-z10-6
+Patch96:	pr36745.diff
+Patch97:	pr36822.diff
+Patch99:	ibm-vector-keyword-1
+Patch100:	ibm-vector-keyword-2
+Patch101:	ibm-vector-keyword-3
+Patch102:	ibm304071-z10-7
+Patch103:	ibm304134-power7-1
+Patch104:	ibm-cell-split
+Patch105:	ibm-cell-split-fixes
+Patch106:	nvl425806.patch
+Patch109:	nvl425783.patch
+Patch110:	nvl425784.patch
+Patch111:	nvl425788.patch
+Patch112:	nvl425789.patch
+Patch114:	nvl425791.patch
+Patch115:	nvl425794.patch
+Patch116:	nvl425798-1.patch
+Patch117:	nvl425798-2.patch
+Patch118:	nvl425799.patch
+Patch119:	nvl426087.patch
+Patch120:	ibm304071-z10-8
+Patch121:	nvl434500.patch
+Patch122:	nvl436041.patch
 Patch123:       gcc43-no-unwind-tables.diff
-Patch124:       nvl441016.patch
+Patch124:	nvl441016.patch
 Patch126:       nvl447669.diff
-Patch127:       nvl464739.patch
+Patch127:	nvl464739.patch
 # Patches for SAP features
-Patch130:       sap303956-utf16-1.diff
-Patch131:       sap303956-utf16-2.diff
-Patch132:       sap303956-utf16-3.diff
-Patch133:       sap303956-utf16-4.diff
-Patch134:       sap303956-utf16-mangling.diff
+Patch130:	sap303956-utf16-1.diff
+Patch131:	sap303956-utf16-2.diff
+Patch132:	sap303956-utf16-3.diff
+Patch133:	sap303956-utf16-4.diff
+Patch134:	sap303956-utf16-mangling.diff
+
 # LIBJAVA-DELETE-BEGIN
-Group:          Development/Languages/C and C++
-Summary:        The GNU C Compiler and Support Files
-License:        GPL v3 or later
+Group:        Development/Languages/C and C++
+Summary:      The GNU C Compiler and Support Files
+License:      GPL v3 or later
 
 %description
 Core package for the GNU Compiler Collection, including the C language
@@ -256,53 +273,48 @@ gcc-obj-c++.
 
 
 
+# COMMON-END
 %package -n gcc43-32bit
 License:        GPL v3 or later
-Summary:        The GNU C Compiler 32bit support
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgcc%{libgcc_s}-32bit >= %{version}-%{release}
-Requires:       libgomp1-32bit >= %{version}-%{release}
+Summary:      The GNU C Compiler 32bit support
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgcc%{libgcc_s}-32bit >= %{version}-%{release}
+Requires:     libgomp1-32bit >= %{version}-%{release}
 %if %{build_with_mudflap}
-Requires:       libmudflap0-32bit >= %{version}-%{release}
-Requires:       libmudflapth0-32bit >= %{version}-%{release}
+Requires:     libmudflap0-32bit >= %{version}-%{release}
+Requires:     libmudflapth0-32bit >= %{version}-%{release}
 %endif
-Requires:       glibc-devel-32bit
+Requires:     glibc-devel-32bit
 
 %description -n gcc43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This package contains 32bit support for the GNU Compiler Collection.
 
 %package -n gcc43-64bit
 License:        GPL v3 or later
-Summary:        The GNU C Compiler 64bit support
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgcc%{libgcc_s}-64bit >= %{version}-%{release}
-Requires:       libgomp1-64bit >= %{version}-%{release}
+Summary:      The GNU C Compiler 64bit support
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgcc%{libgcc_s}-64bit >= %{version}-%{release}
+Requires:     libgomp1-64bit >= %{version}-%{release}
 %if %{build_with_mudflap}
-Requires:       libmudflap0-64bit >= %{version}-%{release}
-Requires:       libmudflapth0-64bit >= %{version}-%{release}
+Requires:     libmudflap0-64bit >= %{version}-%{release}
+Requires:     libmudflapth0-64bit >= %{version}-%{release}
 %endif
-Requires:       glibc-devel-64bit
+Requires:     glibc-devel-64bit
 
 %description -n gcc43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This package contains 64bit support for the GNU Compiler Collection.
 
 
 %package locale
 License:        GPL v3 or later
-Summary:        Locale Data for the GNU Compiler Collection
-Group:          Development/Languages/C and C++
-Requires:       gcc43 = %{version}-%{release}
-AutoReqProv:    on
+Summary:      Locale Data for the GNU Compiler Collection
+Group:        Development/Languages/C and C++
+Requires:     gcc43 = %{version}-%{release}
+Autoreqprov:  on
 
 %description locale
 Locale data for the GNU Compiler Collection (GCC) to give error message
@@ -311,92 +323,97 @@ in the current locale.
 
 %package c++
 License:        GPL v3 or later
-Summary:        The GNU C++ Compiler
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libstdc++43-devel = %{version}-%{release}
+Summary:      The GNU C++ Compiler
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libstdc++43-devel = %{version}-%{release}
 
 %description c++
 This package contains the GNU compiler for C++.
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libstdc++43-devel
 License:        GPL v2 or later
-Summary:        Include Files and Libraries mandatory for Development
-Group:          System/Libraries
-AutoReqProv:    on
-Requires:       libstdc++6 >= %{version}-%{release}
-Requires:       glibc-devel
+Summary:      Include Files and Libraries mandatory for Development
+Group:        System/Libraries
+Autoreqprov:  on
+Requires:     libstdc++6 >= %{version}-%{release}
+Requires:     glibc-devel
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libstdc++43-devel
 This package contains all the headers and libraries of the standard C++
 library. It is needed for compiling C++ code.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libstdc++43-devel-32bit
 License:        GPL v2 or later
-Summary:        Include Files and Libraries mandatory for Development
-Group:          System/Libraries
-AutoReqProv:    on
-Requires:       libstdc++6-32bit >= %{version}-%{release}
-Requires:       glibc-devel-32bit
+Summary:      Include Files and Libraries mandatory for Development
+Group:        System/Libraries
+Autoreqprov:  on
+Requires:     libstdc++6-32bit >= %{version}-%{release}
+Requires:     glibc-devel-32bit
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libstdc++43-devel-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This package contains all the headers and libraries of the standard C++
 library. It is needed for compiling C++ code.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libstdc++43-devel-64bit
 License:        GPL v2 or later
-Summary:        Include Files and Libraries mandatory for Development
-Group:          System/Libraries
-AutoReqProv:    on
-Requires:       libstdc++6-64bit >= %{version}-%{release}
-Requires:       glibc-devel-64bit
+Summary:      Include Files and Libraries mandatory for Development
+Group:        System/Libraries
+Autoreqprov:  on
+Requires:     libstdc++6-64bit >= %{version}-%{release}
+Requires:     glibc-devel-64bit
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libstdc++43-devel-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This package contains all the headers and libraries of the standard C++
 library. It is needed for compiling C++ code.
+# PACKAGE-END
 
 %package -n libstdc++43-doc
 License:        GPL v2 or later
-Summary:        Documentation for the GNU C++ standard library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
+Summary:      Documentation for the GNU C++ standard library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
 
 %description -n libstdc++43-doc
 Documentation for the GNU C++ standard library
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libgcc43
 License:        GPL v2 or later
-Summary:        C compiler runtime library
-Group:          System/Base
-Provides:       libgcc = %{version}-%{release}
-Obsoletes:      libgcc < %{version}-%{release}
-Provides:       libgcc%{libgcc_s} = %{version}-%{release}
-Obsoletes:      libgcc%{libgcc_s} < %{version}-%{release}
+Summary:      C compiler runtime library
+Group:        System/Base
+Provides:     libgcc = %{version}-%{release}
+Obsoletes:    libgcc < %{version}-%{release}
+Provides:     libgcc%{libgcc_s} = %{version}-%{release}
+Obsoletes:    libgcc%{libgcc_s} < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgcc33 libgcc41 libgcc42
+Obsoletes:    libgcc33 libgcc41 libgcc42
 # make zypp happy
-Provides:       libgcc33 libgcc41 libgcc42
+Provides:     libgcc33 libgcc41 libgcc42
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "" == ""
 %ifarch ppc64
-Obsoletes:      libgcc-64bit
+Obsoletes:    libgcc-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libgcc43
 Libgcc is needed for dynamically linked C programs.
@@ -409,31 +426,27 @@ Libgcc is needed for dynamically linked 
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgcc43-32bit
 License:        GPL v2 or later
-Summary:        C compiler runtime library
-Group:          System/Base
-Provides:       libgcc-32bit = %{version}-%{release}
-Obsoletes:      libgcc-32bit < %{version}-%{release}
-Provides:       libgcc%{libgcc_s}-32bit = %{version}-%{release}
-Obsoletes:      libgcc%{libgcc_s}-32bit < %{version}-%{release}
+Summary:      C compiler runtime library
+Group:        System/Base
+Provides:     libgcc-32bit = %{version}-%{release}
+Obsoletes:    libgcc-32bit < %{version}-%{release}
+Provides:     libgcc%{libgcc_s}-32bit = %{version}-%{release}
+Obsoletes:    libgcc%{libgcc_s}-32bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgcc33-32bit libgcc41-32bit libgcc42-32bit
+Obsoletes:    libgcc33-32bit libgcc41-32bit libgcc42-32bit
 # make zypp happy
-Provides:       libgcc33-32bit libgcc41-32bit libgcc42-32bit
+Provides:     libgcc33-32bit libgcc41-32bit libgcc42-32bit
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "-32bit" == ""
 %ifarch ppc64
-Obsoletes:      libgcc-64bit
+Obsoletes:    libgcc-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libgcc43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 Libgcc is needed for dynamically linked C programs.
 
 %post -n libgcc43-32bit
@@ -444,31 +457,27 @@ Libgcc is needed for dynamically linked 
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgcc43-64bit
 License:        GPL v2 or later
-Summary:        C compiler runtime library
-Group:          System/Base
-Provides:       libgcc-64bit = %{version}-%{release}
-Obsoletes:      libgcc-64bit < %{version}-%{release}
-Provides:       libgcc%{libgcc_s}-64bit = %{version}-%{release}
-Obsoletes:      libgcc%{libgcc_s}-64bit < %{version}-%{release}
+Summary:      C compiler runtime library
+Group:        System/Base
+Provides:     libgcc-64bit = %{version}-%{release}
+Obsoletes:    libgcc-64bit < %{version}-%{release}
+Provides:     libgcc%{libgcc_s}-64bit = %{version}-%{release}
+Obsoletes:    libgcc%{libgcc_s}-64bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgcc33-64bit libgcc41-64bit libgcc42-64bit
+Obsoletes:    libgcc33-64bit libgcc41-64bit libgcc42-64bit
 # make zypp happy
-Provides:       libgcc33-64bit libgcc41-64bit libgcc42-64bit
+Provides:     libgcc33-64bit libgcc41-64bit libgcc42-64bit
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "-64bit" == ""
 %ifarch ppc64
-Obsoletes:      libgcc-64bit
+Obsoletes:    libgcc-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libgcc43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 Libgcc is needed for dynamically linked C programs.
 
 %post -n libgcc43-64bit
@@ -477,22 +486,22 @@ Libgcc is needed for dynamically linked 
 %postun -n libgcc43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgomp43
 License:        LGPL v2.1 or later
-Summary:        The GNU compiler collection OpenMP runtime library
-Group:          System/Base
-Provides:       libgomp = %{version}-%{release}
-Obsoletes:      libgomp < %{version}-%{release}
-Provides:       libgomp1 = %{version}-%{release}
-Obsoletes:      libgomp1 < %{version}-%{release}
+Summary:      The GNU compiler collection OpenMP runtime library
+Group:        System/Base
+Provides:     libgomp = %{version}-%{release}
+Obsoletes:    libgomp < %{version}-%{release}
+Provides:     libgomp1 = %{version}-%{release}
+Obsoletes:    libgomp1 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgomp42
+Obsoletes:    libgomp42
 # make zypp happy
-Provides:       libgomp42
-AutoReqProv:    on
+Provides:     libgomp42
+Autoreqprov:  on
 
 %description -n libgomp43
 This is the OpenMP runtime library needed by OpenMP enabled programs
@@ -509,25 +518,21 @@ option.
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgomp43-32bit
 License:        LGPL v2.1 or later
-Summary:        The GNU compiler collection OpenMP runtime library
-Group:          System/Base
-Provides:       libgomp-32bit = %{version}-%{release}
-Obsoletes:      libgomp-32bit < %{version}-%{release}
-Provides:       libgomp1-32bit = %{version}-%{release}
-Obsoletes:      libgomp1-32bit < %{version}-%{release}
+Summary:      The GNU compiler collection OpenMP runtime library
+Group:        System/Base
+Provides:     libgomp-32bit = %{version}-%{release}
+Obsoletes:    libgomp-32bit < %{version}-%{release}
+Provides:     libgomp1-32bit = %{version}-%{release}
+Obsoletes:    libgomp1-32bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgomp42-32bit
+Obsoletes:    libgomp42-32bit
 # make zypp happy
-Provides:       libgomp42-32bit
-AutoReqProv:    on
+Provides:     libgomp42-32bit
+Autoreqprov:  on
 
 %description -n libgomp43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This is the OpenMP runtime library needed by OpenMP enabled programs
 that were built with the -fopenmp compiler option and by programs that
 were auto-parallelized via the -ftree-parallelize-loops compiler
@@ -542,25 +547,21 @@ option.
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgomp43-64bit
 License:        LGPL v2.1 or later
-Summary:        The GNU compiler collection OpenMP runtime library
-Group:          System/Base
-Provides:       libgomp-64bit = %{version}-%{release}
-Obsoletes:      libgomp-64bit < %{version}-%{release}
-Provides:       libgomp1-64bit = %{version}-%{release}
-Obsoletes:      libgomp1-64bit < %{version}-%{release}
+Summary:      The GNU compiler collection OpenMP runtime library
+Group:        System/Base
+Provides:     libgomp-64bit = %{version}-%{release}
+Obsoletes:    libgomp-64bit < %{version}-%{release}
+Provides:     libgomp1-64bit = %{version}-%{release}
+Obsoletes:    libgomp1-64bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgomp42-64bit
+Obsoletes:    libgomp42-64bit
 # make zypp happy
-Provides:       libgomp42-64bit
-AutoReqProv:    on
+Provides:     libgomp42-64bit
+Autoreqprov:  on
 
 %description -n libgomp43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This is the OpenMP runtime library needed by OpenMP enabled programs
 that were built with the -fopenmp compiler option and by programs that
 were auto-parallelized via the -ftree-parallelize-loops compiler
@@ -573,28 +574,28 @@ option.
 %postun -n libgomp43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libstdc++43
 License:        GPL v2 or later
-Summary:        The standard C++ shared library
-Group:          System/Libraries
-Provides:       libstdc++ = %{version}-%{release}
-Obsoletes:      libstdc++ < %{version}-%{release}
-Provides:       libstdc++6 = %{version}-%{release}
-Obsoletes:      libstdc++6 < %{version}-%{release}
+Summary:      The standard C++ shared library
+Group:        System/Libraries
+Provides:     libstdc++ = %{version}-%{release}
+Obsoletes:    libstdc++ < %{version}-%{release}
+Provides:     libstdc++6 = %{version}-%{release}
+Obsoletes:    libstdc++6 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libstdc++41 libstdc++42
+Obsoletes:    libstdc++41 libstdc++42
 # make zypp happy
-Provides:       libstdc++41 libstdc++42
+Provides:     libstdc++41 libstdc++42
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "" == ""
 %ifarch ppc64
-Obsoletes:      libstdc++-64bit
+Obsoletes:    libstdc++-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libstdc++43
 The standard C++ library, needed for dynamically linked C++ programs.
@@ -608,31 +609,27 @@ The standard C++ library, needed for dyn
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libstdc++43-32bit
 License:        GPL v2 or later
-Summary:        The standard C++ shared library
-Group:          System/Libraries
-Provides:       libstdc++-32bit = %{version}-%{release}
-Obsoletes:      libstdc++-32bit < %{version}-%{release}
-Provides:       libstdc++6-32bit = %{version}-%{release}
-Obsoletes:      libstdc++6-32bit < %{version}-%{release}
+Summary:      The standard C++ shared library
+Group:        System/Libraries
+Provides:     libstdc++-32bit = %{version}-%{release}
+Obsoletes:    libstdc++-32bit < %{version}-%{release}
+Provides:     libstdc++6-32bit = %{version}-%{release}
+Obsoletes:    libstdc++6-32bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libstdc++41-32bit libstdc++42-32bit
+Obsoletes:    libstdc++41-32bit libstdc++42-32bit
 # make zypp happy
-Provides:       libstdc++41-32bit libstdc++42-32bit
+Provides:     libstdc++41-32bit libstdc++42-32bit
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "-32bit" == ""
 %ifarch ppc64
-Obsoletes:      libstdc++-64bit
+Obsoletes:    libstdc++-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libstdc++43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 The standard C++ library, needed for dynamically linked C++ programs.
 
 
@@ -644,31 +641,27 @@ The standard C++ library, needed for dyn
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libstdc++43-64bit
 License:        GPL v2 or later
-Summary:        The standard C++ shared library
-Group:          System/Libraries
-Provides:       libstdc++-64bit = %{version}-%{release}
-Obsoletes:      libstdc++-64bit < %{version}-%{release}
-Provides:       libstdc++6-64bit = %{version}-%{release}
-Obsoletes:      libstdc++6-64bit < %{version}-%{release}
+Summary:      The standard C++ shared library
+Group:        System/Libraries
+Provides:     libstdc++-64bit = %{version}-%{release}
+Obsoletes:    libstdc++-64bit < %{version}-%{release}
+Provides:     libstdc++6-64bit = %{version}-%{release}
+Obsoletes:    libstdc++6-64bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libstdc++41-64bit libstdc++42-64bit
+Obsoletes:    libstdc++41-64bit libstdc++42-64bit
 # make zypp happy
-Provides:       libstdc++41-64bit libstdc++42-64bit
+Provides:     libstdc++41-64bit libstdc++42-64bit
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "-64bit" == ""
 %ifarch ppc64
-Obsoletes:      libstdc++-64bit
+Obsoletes:    libstdc++-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libstdc++43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 The standard C++ library, needed for dynamically linked C++ programs.
 
 
@@ -679,72 +672,78 @@ The standard C++ library, needed for dyn
 /sbin/ldconfig
 # PACKAGE-END
 
+
 %package info
-License:        GFDL v1.1
-Summary:        Documentation for the GNU compiler collection
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-PreReq:         %{install_info_prereq}
+License:        GNU Free Documentation License, Version 1.1 (GFDL 1.1)
+Summary:      Documentation for the GNU compiler collection
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+PreReq:       %{install_info_prereq}
 
 %description info
 GNU info-pages for the GNU compiler collection covering both user-level
 and internals documentation.
 
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package objc
 License:        GPL v3 or later
-Summary:        GNU Objective C Compiler
-Group:          Development/Languages/Other
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libobjc2 >= %{version}-%{release}
+Summary:      GNU Objective C Compiler
+Group:        Development/Languages/Other
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libobjc2 >= %{version}-%{release}
 
 %description objc
 This package contains the GNU Objective C compiler. Objective C is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package objc-32bit
 License:        GPL v3 or later
-Summary:        GNU Objective C Compiler
-Group:          Development/Languages/Other
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libobjc2-32bit >= %{version}-%{release}
+Summary:      GNU Objective C Compiler
+Group:        Development/Languages/Other
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libobjc2-32bit >= %{version}-%{release}
 
 %description objc-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This package contains the GNU Objective C compiler. Objective C is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package objc-64bit
 License:        GPL v3 or later
-Summary:        GNU Objective C Compiler
-Group:          Development/Languages/Other
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libobjc2-64bit >= %{version}-%{release}
+Summary:      GNU Objective C Compiler
+Group:        Development/Languages/Other
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libobjc2-64bit >= %{version}-%{release}
 
 %description objc-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This package contains the GNU Objective C compiler. Objective C is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
+# PACKAGE-END
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libobjc43
 License:        GPL v2 or later
-Summary:        Library for the GNU Objective C Compiler
-Group:          Development/Libraries/Other
-Provides:       libobjc2 = %{version}-%{release}
-Obsoletes:      libobjc2 < %{version}-%{release}
+Summary:      Library for the GNU Objective C Compiler
+Group:        Development/Libraries/Other
+Provides:     libobjc2 = %{version}-%{release}
+Obsoletes:    libobjc2 < %{version}-%{release}
 # unless so version changes again for libobjc
 # make rpm happy
-Obsoletes:      libobjc42
+Obsoletes:    libobjc42
 # make zypp happy
-Provides:       libobjc42
+Provides:     libobjc42
 
 %description -n libobjc43
 The library for the GNU Objective C compiler.
@@ -757,23 +756,19 @@ The library for the GNU Objective C comp
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libobjc43-32bit
 License:        GPL v2 or later
-Summary:        Library for the GNU Objective C Compiler
-Group:          Development/Libraries/Other
-Provides:       libobjc2-32bit = %{version}-%{release}
-Obsoletes:      libobjc2-32bit < %{version}-%{release}
+Summary:      Library for the GNU Objective C Compiler
+Group:        Development/Libraries/Other
+Provides:     libobjc2-32bit = %{version}-%{release}
+Obsoletes:    libobjc2-32bit < %{version}-%{release}
 # unless so version changes again for libobjc
 # make rpm happy
-Obsoletes:      libobjc42-32bit
+Obsoletes:    libobjc42-32bit
 # make zypp happy
-Provides:       libobjc42-32bit
+Provides:     libobjc42-32bit
 
 %description -n libobjc43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 The library for the GNU Objective C compiler.
 
 %post -n libobjc43-32bit
@@ -784,23 +779,19 @@ The library for the GNU Objective C comp
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libobjc43-64bit
 License:        GPL v2 or later
-Summary:        Library for the GNU Objective C Compiler
-Group:          Development/Libraries/Other
-Provides:       libobjc2-64bit = %{version}-%{release}
-Obsoletes:      libobjc2-64bit < %{version}-%{release}
+Summary:      Library for the GNU Objective C Compiler
+Group:        Development/Libraries/Other
+Provides:     libobjc2-64bit = %{version}-%{release}
+Obsoletes:    libobjc2-64bit < %{version}-%{release}
 # unless so version changes again for libobjc
 # make rpm happy
-Obsoletes:      libobjc42-64bit
+Obsoletes:    libobjc42-64bit
 # make zypp happy
-Provides:       libobjc42-64bit
+Provides:     libobjc42-64bit
 
 %description -n libobjc43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 The library for the GNU Objective C compiler.
 
 %post -n libobjc43-64bit
@@ -812,11 +803,11 @@ The library for the GNU Objective C comp
 
 %package obj-c++
 License:        GPL v3 or later
-Summary:        GNU Objective C++ Compiler
-Group:          Development/Languages/Other
-AutoReqProv:    on
-Requires:       gcc43-objc = %{version}-%{release}
-Requires:       gcc43-c++ = %{version}-%{release}
+Summary:      GNU Objective C++ Compiler
+Group:        Development/Languages/Other
+Autoreqprov:  on
+Requires:     gcc43-objc = %{version}-%{release}
+Requires:     gcc43-c++ = %{version}-%{release}
 
 %description obj-c++
 This package contains the GNU Objective C++ compiler. Objective C++ is an
@@ -826,8 +817,8 @@ Nextstep OS. The source code is availabl
 
 %package -n cpp43
 License:        GPL v3 or later
-Summary:        The GCC Preprocessor
-Group:          Development/Languages/C and C++
+Summary:      The GCC Preprocessor
+Group:        Development/Languages/C and C++
 
 %description -n cpp43
 This Package contains just the preprocessor that is used by the X11
@@ -836,11 +827,11 @@ packages.
 
 %package ada
 License:        GPL v3 or later
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libada43 = %{version}-%{release}
-Summary:        GNU Ada95 Compiler Based on GCC (GNAT)
-Group:          Development/Languages/Other
-AutoReqProv:    on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libada43 = %{version}-%{release}
+Summary:      GNU Ada95 Compiler Based on GCC (GNAT)
+Group:        Development/Languages/Other
+Autoreqprov:  on
 
 %description ada
 This package contains an Ada95 compiler and associated development
@@ -851,13 +842,13 @@ must have installed a binary version to 
 
 %package -n libada43
 License:        GPL v2 or later
-Summary:        GNU Ada Runtime Libraries
-Group:          System/Libraries
-AutoReqProv:    on
-Provides:       libgnarl-4_3 = %{version}-%{release}
-Obsoletes:      libgnarl-4_3 < %{version}-%{release}
-Provides:       libgnat-4_3 = %{version}-%{release}
-Obsoletes:      libgnat-4_3 < %{version}-%{release}
+Summary:      GNU Ada Runtime Libraries
+Group:        System/Libraries
+Autoreqprov:  on
+Provides:     libgnarl-4_3 = %{version}-%{release}
+Obsoletes:    libgnarl-4_3 < %{version}-%{release}
+Provides:     libgnat-4_3 = %{version}-%{release}
+Obsoletes:    libgnat-4_3 < %{version}-%{release}
 
 %description -n libada43
 This package contains the shared libraries required to run programs
@@ -872,53 +863,56 @@ implementation of Distributed Systems Pr
 
 %postun -n libada43
 /sbin/ldconfig
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package fortran
 License:        GPL v3 or later
-Summary:        The GNU Fortran Compiler and Support Files
-Group:          Development/Languages/Fortran
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgfortran3 >= %{version}-%{release}
+Summary:      The GNU Fortran Compiler and Support Files
+Group:        Development/Languages/Fortran
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgfortran3 >= %{version}-%{release}
 
 %description fortran
 This is the Fortran compiler of the GNU Compiler Collection (GCC).
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package fortran-32bit
 License:        GPL v3 or later
-Summary:        The GNU Fortran Compiler and Support Files
-Group:          Development/Languages/Fortran
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgfortran3-32bit >= %{version}-%{release}
+Summary:      The GNU Fortran Compiler and Support Files
+Group:        Development/Languages/Fortran
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgfortran3-32bit >= %{version}-%{release}
 
 %description fortran-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This is the Fortran compiler of the GNU Compiler Collection (GCC).
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package fortran-64bit
 License:        GPL v3 or later
-Summary:        The GNU Fortran Compiler and Support Files
-Group:          Development/Languages/Fortran
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgfortran3-64bit >= %{version}-%{release}
+Summary:      The GNU Fortran Compiler and Support Files
+Group:        Development/Languages/Fortran
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgfortran3-64bit >= %{version}-%{release}
 
 %description fortran-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This is the Fortran compiler of the GNU Compiler Collection (GCC).
+# PACKAGE-END
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libgfortran43
 License:        GPL v2 or later
-Summary:        The GNU Fortran Compiler Runtime Library
-Group:          Development/Languages/Fortran
-Provides:       libgfortran3 = %{version}-%{release}
-Obsoletes:      libgfortran3 < %{version}-%{release}
-AutoReqProv:    on
+Summary:      The GNU Fortran Compiler Runtime Library
+Group:        Development/Languages/Fortran
+Provides:     libgfortran3 = %{version}-%{release}
+Obsoletes:    libgfortran3 < %{version}-%{release}
+Autoreqprov:  on
 
 %description -n libgfortran43
 The runtime library needed to run programs compiled with the Fortran compiler
@@ -932,19 +926,15 @@ of the GNU Compiler Collection (GCC).
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgfortran43-32bit
 License:        GPL v2 or later
-Summary:        The GNU Fortran Compiler Runtime Library
-Group:          Development/Languages/Fortran
-Provides:       libgfortran3-32bit = %{version}-%{release}
-Obsoletes:      libgfortran3-32bit < %{version}-%{release}
-AutoReqProv:    on
+Summary:      The GNU Fortran Compiler Runtime Library
+Group:        Development/Languages/Fortran
+Provides:     libgfortran3-32bit = %{version}-%{release}
+Obsoletes:    libgfortran3-32bit < %{version}-%{release}
+Autoreqprov:  on
 
 %description -n libgfortran43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 The runtime library needed to run programs compiled with the Fortran compiler
 of the GNU Compiler Collection (GCC).
 
@@ -956,19 +946,15 @@ of the GNU Compiler Collection (GCC).
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgfortran43-64bit
 License:        GPL v2 or later
-Summary:        The GNU Fortran Compiler Runtime Library
-Group:          Development/Languages/Fortran
-Provides:       libgfortran3-64bit = %{version}-%{release}
-Obsoletes:      libgfortran3-64bit < %{version}-%{release}
-AutoReqProv:    on
+Summary:      The GNU Fortran Compiler Runtime Library
+Group:        Development/Languages/Fortran
+Provides:     libgfortran3-64bit = %{version}-%{release}
+Obsoletes:    libgfortran3-64bit < %{version}-%{release}
+Autoreqprov:  on
 
 %description -n libgfortran43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 The runtime library needed to run programs compiled with the Fortran compiler
 of the GNU Compiler Collection (GCC).
 
@@ -978,25 +964,25 @@ of the GNU Compiler Collection (GCC).
 %postun -n libgfortran43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libmudflap43
 License:        GPL v2 or later
-Summary:        The Mudflap Extension Runtime Library
-Group:          Development/Languages/C and C++
-Provides:       libmudflap0 = %{version}-%{release}
-Obsoletes:      libmudflap0 < %{version}-%{release}
-Provides:       libmudflapth0 = %{version}-%{release}
-Obsoletes:      libmudflapth0 < %{version}-%{release}
+Summary:      The Mudflap Extension Runtime Library
+Group:        Development/Languages/C and C++
+Provides:     libmudflap0 = %{version}-%{release}
+Obsoletes:    libmudflap0 < %{version}-%{release}
+Provides:     libmudflapth0 = %{version}-%{release}
+Obsoletes:    libmudflapth0 < %{version}-%{release}
 # transitional
-Provides:       libmudflap = %{version}-%{release}
-Obsoletes:      libmudflap < %{version}-%{release}
+Provides:     libmudflap = %{version}-%{release}
+Obsoletes:    libmudflap < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libmudflap41 libmudflap42
+Obsoletes:    libmudflap41 libmudflap42
 # make zypp happy
-Provides:       libmudflap41 libmudflap42
-AutoReqProv:    on
+Provides:     libmudflap41 libmudflap42
+Autoreqprov:  on
 
 %description -n libmudflap43
 This is the Mudflap Extension Runtime Library.
@@ -1009,28 +995,24 @@ This is the Mudflap Extension Runtime Li
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libmudflap43-32bit
 License:        GPL v2 or later
-Summary:        The Mudflap Extension Runtime Library
-Group:          Development/Languages/C and C++
-Provides:       libmudflap0-32bit = %{version}-%{release}
-Obsoletes:      libmudflap0-32bit < %{version}-%{release}
-Provides:       libmudflapth0-32bit = %{version}-%{release}
-Obsoletes:      libmudflapth0-32bit < %{version}-%{release}
+Summary:      The Mudflap Extension Runtime Library
+Group:        Development/Languages/C and C++
+Provides:     libmudflap0-32bit = %{version}-%{release}
+Obsoletes:    libmudflap0-32bit < %{version}-%{release}
+Provides:     libmudflapth0-32bit = %{version}-%{release}
+Obsoletes:    libmudflapth0-32bit < %{version}-%{release}
 # transitional
-Provides:       libmudflap-32bit = %{version}-%{release}
-Obsoletes:      libmudflap-32bit < %{version}-%{release}
+Provides:     libmudflap-32bit = %{version}-%{release}
+Obsoletes:    libmudflap-32bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libmudflap41-32bit libmudflap42-32bit
+Obsoletes:    libmudflap41-32bit libmudflap42-32bit
 # make zypp happy
-Provides:       libmudflap41-32bit libmudflap42-32bit
-AutoReqProv:    on
+Provides:     libmudflap41-32bit libmudflap42-32bit
+Autoreqprov:  on
 
 %description -n libmudflap43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This is the Mudflap Extension Runtime Library.
 
 %post -n libmudflap43-32bit
@@ -1041,28 +1023,24 @@ This is the Mudflap Extension Runtime Li
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libmudflap43-64bit
 License:        GPL v2 or later
-Summary:        The Mudflap Extension Runtime Library
-Group:          Development/Languages/C and C++
-Provides:       libmudflap0-64bit = %{version}-%{release}
-Obsoletes:      libmudflap0-64bit < %{version}-%{release}
-Provides:       libmudflapth0-64bit = %{version}-%{release}
-Obsoletes:      libmudflapth0-64bit < %{version}-%{release}
+Summary:      The Mudflap Extension Runtime Library
+Group:        Development/Languages/C and C++
+Provides:     libmudflap0-64bit = %{version}-%{release}
+Obsoletes:    libmudflap0-64bit < %{version}-%{release}
+Provides:     libmudflapth0-64bit = %{version}-%{release}
+Obsoletes:    libmudflapth0-64bit < %{version}-%{release}
 # transitional
-Provides:       libmudflap-64bit = %{version}-%{release}
-Obsoletes:      libmudflap-64bit < %{version}-%{release}
+Provides:     libmudflap-64bit = %{version}-%{release}
+Obsoletes:    libmudflap-64bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libmudflap41-64bit libmudflap42-64bit
+Obsoletes:    libmudflap41-64bit libmudflap42-64bit
 # make zypp happy
-Provides:       libmudflap41-64bit libmudflap42-64bit
-AutoReqProv:    on
+Provides:     libmudflap41-64bit libmudflap42-64bit
+Autoreqprov:  on
 
 %description -n libmudflap43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This is the Mudflap Extension Runtime Library.
 
 %post -n libmudflap43-64bit
@@ -1072,22 +1050,23 @@ This is the Mudflap Extension Runtime Li
 /sbin/ldconfig
 # PACKAGE-END
 
+
 %package -n libgcj43
 # LIBJAVA-DELETE-END
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Java Runtime Library for gcc
-Group:          System/Libraries
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Java Runtime Library for gcc
+Group:        System/Libraries
 %define gcj_sover 9
 %if 0%{suse_version} > 1000
-Recommends:     libgcj43-jar = %{version}-%{release}
+Recommends:   libgcj43-jar = %{version}-%{release}
 %endif
-Provides:       libgcj%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgcj%{gcj_sover} < %{version}-%{release}
-Provides:       libgij%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgij%{gcj_sover} < %{version}-%{release}
-Provides:       libgcj-tools%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgcj-tools%{gcj_sover} < %{version}-%{release}
-AutoReqProv:    on
+Provides:     libgcj%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgcj%{gcj_sover} < %{version}-%{release}
+Provides:     libgij%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgij%{gcj_sover} < %{version}-%{release}
+Provides:     libgcj-tools%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgcj-tools%{gcj_sover} < %{version}-%{release}
+Autoreqprov:  on
 
 %description -n libgcj43
 This library is needed if you want to use the GNU Java compiler, gcj.
@@ -1099,38 +1078,40 @@ Source code for this package is in gcc.
 %postun -n libgcj43
 /sbin/ldconfig
 
+
 %package -n gcc43-java
 License:        GPL v3 or later
-Summary:        The GNU Java Compiler
-Group:          Development/Languages/Java
-AutoReqProv:    on
-Requires:       gcc43 = %{version}
-Requires:       libgcj43-devel = %{version}-%{release}
+Summary:      The GNU Java Compiler
+Group:        Development/Languages/Java
+Autoreqprov:  on
+Requires:     gcc43 = %{version}
+Requires:     libgcj43-devel = %{version}-%{release}
 
 %description -n gcc43-java
 The Java compiler from the GCC-tools-suite.
 
 
 %package -n libgcj_bc43
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Fake library for BC-ABI compatibility.
-Group:          Development/Libraries/Java
-AutoReqProv:    on
-Provides:       libgcj_bc1 = %{version}-%{release}
-Obsoletes:      libgcj_bc1 < %{version}-%{release}
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Fake library for BC-ABI compatibility.
+Group:        Development/Libraries/Java
+Autoreqprov:  on
+Provides:     libgcj_bc1 = %{version}-%{release}
+Obsoletes:    libgcj_bc1 < %{version}-%{release}
 # libgcj_bc is special in that it just contains a symlink to
 # a proper libgcj version.  So require that library and add
 # provides for the shlib version as created at link time
-Requires:       libgcj%{gcj_sover}
+Requires:     libgcj%{gcj_sover}
 %ifarch x86_64 ia64 ppc64 s390x
-Provides:       libgcj_bc.so.1()(64bit)
+Provides:     libgcj_bc.so.1()(64bit)
 %else
-Provides:       libgcj_bc.so.1
+Provides:     libgcj_bc.so.1
 %endif
 # make rpm happy
-Obsoletes:      libgcj_bc42
+Obsoletes:    libgcj_bc42
 # make zypp happy
-Provides:       libgcj_bc42
+Provides:     libgcj_bc42
+
 
 %description -n libgcj_bc43
 A fake library that is used at link time only. It ensures that
@@ -1140,29 +1121,29 @@ libgcj.so changes.
 
 
 %package -n libgcj43-jar
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Java runtime library (jar files).
-Group:          Development/Libraries/Java
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Java runtime library (jar files).
+Group:        Development/Libraries/Java
 
 %description -n libgcj43-jar
 These are the jar files that go along with the gcj front end to gcc.
 
 
 %package -n libgcj43-devel
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Include Files and Libraries mandatory for Development.
-Group:          Development/Libraries/Java
-AutoReqProv:    on
-Requires:       libstdc++43-devel = %{version}
-Requires:       libgcj%{gcj_sover} >= %{version}-%{release}
-Requires:       libgcj_bc1 >= %{version}-%{release}
-Requires:       libgcj43-jar = %{version}-%{release}
-Requires:       gtk2-devel
-Requires:       libart_lgpl-devel
-Requires:       glibc-devel
-Requires:       zlib-devel
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Include Files and Libraries mandatory for Development.
+Group:        Development/Libraries/Java
+Autoreqprov:  on
+Requires:     libstdc++43-devel = %{version}
+Requires:     libgcj%{gcj_sover} >= %{version}-%{release}
+Requires:     libgcj_bc1 >= %{version}-%{release}
+Requires:     libgcj43-jar = %{version}-%{release}
+Requires:     gtk2-devel
+Requires:     libart_lgpl-devel
+Requires:     glibc-devel
+Requires:     zlib-devel
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libgcj43-devel
@@ -1172,27 +1153,29 @@ to develop applications that require the
 
 %package -n gcc43-gij
 License:        GPL v3 or later
-Summary:        Java Bytecode Interpreter for gcc
-Group:          Development/Libraries/Java
-Requires:       libgcj%{gcj_sover} >= %{version}-%{release}
-AutoReqProv:    on
+Summary:      Java Bytecode Interpreter for gcc
+Group:        Development/Libraries/Java
+Requires:     libgcj%{gcj_sover} >= %{version}-%{release}
+Autoreqprov:  on
 
 %description -n gcc43-gij
 This package contains the java bytecode interpreter gij and related tools.
 
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41 libffi42
+Obsoletes:    libffi41 libffi42
 # make zypp happy
-Provides:       libffi41 libffi42
+Provides:     libffi41 libffi42
 
 %description -n libffi43
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
@@ -1205,24 +1188,20 @@ A foreign function interface is the popu
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-32bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41-32bit libffi42-32bit
+Obsoletes:    libffi41-32bit libffi42-32bit
 # make zypp happy
-Provides:       libffi41-32bit libffi42-32bit
+Provides:     libffi41-32bit libffi42-32bit
 
 %description -n libffi43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
 
 %post -n libffi43-32bit
@@ -1233,24 +1212,20 @@ A foreign function interface is the popu
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-64bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41-64bit libffi42-64bit
+Obsoletes:    libffi41-64bit libffi42-64bit
 # make zypp happy
-Provides:       libffi41-64bit libffi42-64bit
+Provides:     libffi41-64bit libffi42-64bit
 
 %description -n libffi43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
 
 %post -n libffi43-64bit
@@ -1259,53 +1234,56 @@ A foreign function interface is the popu
 %postun -n libffi43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-devel
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43 >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43 >= %{version}-%{release}
 
 %description -n libffi43-devel
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43-devel-32bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43-32bit >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43-32bit >= %{version}-%{release}
 
 %description -n libffi43-devel-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43-devel-64bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43-64bit >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43-64bit >= %{version}-%{release}
 
 %description -n libffi43-devel-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
 
 %package -n gcc43-testresults
-License:        Public Domain, Freeware
-Summary:        Testsuite results
-Group:          Development/Languages/C and C++
+License:	Public Domain, Freeware
+Summary:      Testsuite results
+Group:        Development/Languages/C and C++
 
 %description -n gcc43-testresults
 Results from running the gcc and target library testsuites.
 
 
+# COMMON-BEGIN
 
+# Define the canonical target and host architecture
+#   %gcc_target_arch  is supposed to be the full target triple
+#   %TARGET_ARCH      is the canonicalized CPU part
+#   %CONFIGURE_TARGET is the target triple used for --target=
 %if 0%{?gcc_target_arch:1}
 %define CONFIGURE_TARGET %{gcc_target_arch}
 %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/")
@@ -1322,15 +1300,20 @@ Results from running the gcc and target 
 %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/")
 %endif
 %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/")
+
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
+
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
 %define GCCDIST %{HOST_ARCH}-suse-linux
 %endif
+
 %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_dir_version}
 %define gxxinclude %{_prefix}/include/c++/%{gcc_dir_version}
+
 # COMMON-END
+
 # Versionspecific directories
 %define versmainlibdir %{libsubdir}
 %define versmainlibdirbi32 %{libsubdir}/32
@@ -1348,6 +1331,7 @@ Results from running the gcc and target 
 %else
 %define versmainlibdirbi %{versmainlibdirbi64}
 %endif
+
 %define mainlibdir %{_libdir}
 %define mainlibdirbi32 %{_prefix}/lib
 %define mainlibdirbi64 %{_prefix}/lib64
@@ -1357,6 +1341,8 @@ Results from running the gcc and target 
 %else
 %define mainlibdirbi %{mainlibdirbi64}
 %endif
+
+
 # Now define a few macros that make it easy to package libs and
 # related files just to the right package, without caring for the
 # exact path the files are in.
@@ -1397,6 +1383,7 @@ Results from running the gcc and target 
 %endif
 %endif
 %endif
+
 %if %{build_nof}
 %define versmainlib() %{versmainlibdir}/%1\
 %{versnoflibdir}/%1\
@@ -1431,6 +1418,8 @@ Results from running the gcc and target 
 %endif
 %endif
 %endif
+
+
 # COMMON-BEGIN
 
 %prep
@@ -1542,6 +1531,7 @@ Results from running the gcc and target 
 %build
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
+
 # Split version file into version used for directories (X.Y) and
 # version to report with --version (X.Y.Z).
 # See also gcc-dir-version.patch.
@@ -1552,6 +1542,7 @@ else
   mv gcc/BASE-VER gcc/FULL-VER
 fi
 cat gcc/FULL-VER | cut -d '.' -f 1-2 > gcc/BASE-VER
+
 rm -rf obj-%{GCCDIST}
 mkdir obj-%{GCCDIST}
 cd obj-%{GCCDIST}
@@ -1573,6 +1564,7 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -
 %endif
 # Replace 2 spaces by one finally
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/  / /g'`
+
 languages=c
 %if %{build_cp}
 languages=$languages,c++
@@ -1592,6 +1584,7 @@ languages=$languages,java
 %if %{build_ada}
 languages=$languages,ada
 %endif
+
 J=%{?jobs:%jobs}
 if test -z "$J"; then
   J=$(getconf _NPROCESSORS_CONF)
@@ -1607,26 +1600,35 @@ if test "$JL" == "0"; then
   JL=1
 fi
 PARALLEL="-j$J -l$JL"
+
 # we don't want some miscompiles in the testsuite, or some fault in
 # the compiler to kill the machine.  Hence we limit the amount of memory
 # by the physical RAM plus half of swap
 #MEM=$(free -m | awk '/^Mem:/ {print $2}')
 #SWAP=$(free -m | awk '/^Swap:/ {print $2}')
 #ulimit -v $(((MEM + SWAP/2)*1024))
+
 # In general we want to ship release checking enabled compilers
 # and run BETA with checking enabled.
 #ENABLE_CHECKING="--enable-checking=yes"
 ENABLE_CHECKING="--enable-checking=release"
+
 %if "%{name}" != "gcc43"
 export PATH=/opt/cross/bin:$PATH
 %endif
+
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
+
+# -Wl,-as-needed breaks the libgcj setup
+export SUSE_ASNEEDED=0
+
 # configure tries to parse include/features.h to detect
 # if glibc supports SSP.  When cross compiling we would need
 # to install a cross glibc, which we don't, or make the whole
 # thing point to the native glibc, which is in /, hence the
 # --with-sysroot=/
+
 %if %{build_ada}
 # Using the host gnatmake like
 #   CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}"
@@ -1732,7 +1734,9 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_
 	--with-long-double-128 \
 %endif
 	--build=%{GCCDIST}
+
 # COMMON-END
+
 # Only run profiled bootstrap on archs where it works
 #%ifarch %ix86 x86_64 ppc ppc64 ia64
 #%ifarch %ix86 x86_64 ia64 s390 s390x
@@ -1784,6 +1788,7 @@ rm $RPM_BUILD_ROOT%{libsubdir}/jc1
 rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain
 %endif
 %endif
+
 # Remove some useless .la files
 for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \
     libgomp libstdc++ libsupc++ libgcj-tools libgij; do
@@ -1792,6 +1797,7 @@ for lib in libobjc libgfortran libgfortr
   rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/$lib.la
 %endif
 done
+
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 %if %{biarch}
 %if %{build_primary_64bit}
@@ -1800,6 +1806,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
 %endif
 %endif
+
 # LIBJAVA-DELETE-BEGIN
 %if %{build_cp}
 # Merge multilib c++config.h to allow omitting the duplicate and
@@ -1826,6 +1833,7 @@ for i in `find %{GCCDIST}/[36]*/libstdc+
       echo "Urgs?"
       exit 1
     fi
+    
     cat > $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_dir_version}/%{GCCDIST}/bits/c++config.h <<EOF
 #ifndef _CPP_CPPCONFIG_WRAPPER
 #define _CPP_CPPCONFIG_WRAPPER 1
@@ -1846,6 +1854,7 @@ if ! test -z "$dir_ml"; then
 fi
 %endif
 # LIBJAVA-DELETE-END
+
 # move shared libs from versionspecific dir to main libdir
 for libname in \
 %if 0%{?building_libjava:1}
@@ -1896,6 +1905,7 @@ done
 ln -s libgcj.so.%{gcj_sover} $RPM_BUILD_ROOT%{mainlibdirbi}/libgcj_bc.so.1
 %endif
 %endif
+
 # LIBJAVA-DELETE-BEGIN
 # Move libgcc_s around
 rm -f $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so
@@ -1916,13 +1926,16 @@ chmod a+x $RPM_BUILD_ROOT/lib64/libgcc_s
 %endif
 %endif
 # LIBJAVA-DELETE-END
+
 %if %{build_ada}
 mv $RPM_BUILD_ROOT%{libsubdir}/adalib/lib*-*.so $RPM_BUILD_ROOT%{_libdir}
 ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} && echo libgnarl-*.so) $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnarl.so
 ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} && echo libgnat-*.so) $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnat.so
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/libgna*-*.so
 %endif
+
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/c++%{binsuffix}
+
 # Remove some crap from the .la files:
 for l in `find $RPM_BUILD_ROOT -name '*.la'`; do
   echo "changing $l"
@@ -1942,6 +1955,7 @@ for l in `find $RPM_BUILD_ROOT -name '*.
       < $l  > $l.new
   mv $l.new $l
 done
+
 %if %{run_tests} 
 cp `find . -name "*.sum"` ../testresults/
 cp `find . -name "*.log"  \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/
@@ -1974,9 +1988,9 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/includ
 rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/spe.h
 rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/bits
 rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys
-rm -f $RPM_BUILD_ROOT%{libsubdir}/include/cpuid.h
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f  $RPM_BUILD_ROOT%{_prefix}/bin/gccbug%{binsuffix}
+
 %if !0%{?building_libjava:1}
 # delete compile flag tracking from crt files
 crt_list=$RPM_BUILD_ROOT%{versmainlibdir}/crt*.o
@@ -1991,6 +2005,7 @@ for o in $crt_list $crt32_list $crt64_li
   objcopy -R ".comment.SUSE.OPTs" $o
 done
 %endif
+
 %if %{build_libjava}
 # gcj -static doesn't work properly anyway, unless using --whole-archive
 # let's save the space instead.
@@ -2002,8 +2017,10 @@ find $RPM_BUILD_ROOT -name libgcj.a \
 	-o -name libjvm.a \
 	-o -name libgcj_bc.a \
   | xargs rm -f
+
 find $RPM_BUILD_ROOT -name libgcj.spec | xargs \
   sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/'
+
 # Move libffi headers, remove empty libffi libtool file
 mv $RPM_BUILD_ROOT%{libsubdir}/include/ffitarget.h $RPM_BUILD_ROOT%{_prefix}/include/
 mv $RPM_BUILD_ROOT%{libsubdir}/include/ffi.h $RPM_BUILD_ROOT%{_prefix}/include/
@@ -2011,6 +2028,7 @@ rm -f $RPM_BUILD_ROOT%{mainlibdir}/libff
 %if %{biarch}
 rm -f $RPM_BUILD_ROOT%{mainlibdirbi}/libffi.la
 %endif
+
 # security files have broken install locations, also they cause conflicts
 # between libgcj versions.  Simply delete them here, libgcj will use its
 # defaults in this case (which is what these files contain anyway).
@@ -2040,6 +2058,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/libi
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libiberty.a
 %endif
 %endif
+
 %if 0%{?building_libjava:1}
 # For building libjava only we need to delete other info docs
 rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info*
@@ -2056,6 +2075,7 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_rm.in
 mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_unw.info $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_unw%{binsuffix}.info
 %endif
 %endif
+
 # LIBJAVA-DELETE-BEGIN
 cd ..
 %if 0%{suse_version} > 1000
@@ -2106,6 +2126,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/gnat_ug_unx%{binsuffix}.info.gz
 %endif
 
+
 %files
 %defattr(-,root,root)
 %dir %{_libdir}/gcc
@@ -2159,6 +2180,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %{libsubdir}/include/mmintrin.h
 %endif
 %ifarch %ix86 x86_64
+%{libsubdir}/include/cpuid.h
 %{libsubdir}/include/mm3dnow.h
 %{libsubdir}/include/mmintrin.h
 %{libsubdir}/include/mmintrin-common.h
@@ -2202,8 +2224,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 
 %doc %{_mandir}/man1/gcc%{binsuffix}.1.gz
 %doc %{_mandir}/man1/gcov%{binsuffix}.1.gz
-%if %{separate_biarch}
 
+%if %{separate_biarch}
 %files -n gcc43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %versbiarchlib *crt*.o
@@ -2233,8 +2255,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %endif
 
 %files locale -f gcc43-locale.lang
-%if %{build_cp}
 
+%if %{build_cp}
 %files c++
 %defattr(-,root,root)
 %dir %{_libdir}/gcc
@@ -2252,7 +2274,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libstdc++.so.*
 
 %if %{separate_biarch}
-
 %files -n libstdc++43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libstdc++.so.*
@@ -2268,7 +2289,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %versmainlib libsupc++.a
 
 %if %{separate_biarch}
-
 %files -n libstdc++43-devel%{separate_biarch_suffix}
 %defattr(-,root,root)
 %versbiarchlib libstdc++.a
@@ -2302,32 +2322,33 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %endif
 %endif
 %endif
-%if %{separate_bi64}
 
+%if %{separate_bi64}
 %files -n libgcc43-64bit
 %defattr(-,root,root)
 /lib64/libgcc_s.so.%{libgcc_s}
 %endif
-%if %{separate_bi32}
 
+%if %{separate_bi32}
 %files -n libgcc43-32bit
 %defattr(-,root,root)
 /lib/libgcc_s.so.%{libgcc_s}
 %endif
 
+
 %files -n libgomp43
 %defattr(-,root,root)
 %mainlib libgomp.so.1*
 
 %if %{separate_biarch}
-
 %files -n libgomp43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libgomp.so.1*
 
 %endif
-%if %{build_fortran}
 
+
+%if %{build_fortran}
 %files fortran
 %defattr(-,root,root)
 %dir %{libsubdir}/finclude
@@ -2341,8 +2362,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %versmainlib libgfortranbegin.a
 
 %doc %{_mandir}/man1/gfortran%{binsuffix}.1.gz
-%if %{separate_biarch}
 
+%if %{separate_biarch}
 %files fortran%{separate_biarch_suffix}
 %defattr(-,root,root)
 %versbiarchlib libgfortran.a
@@ -2358,15 +2379,14 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libgfortran.so.*
 
 %if %{separate_biarch}
-
 %files -n libgfortran43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libgfortran.so.*
 
 %endif
 %endif
-%if %{build_with_mudflap}
 
+%if %{build_with_mudflap}
 %files -n libmudflap43
 %defattr(-,root,root)
 %mainlib libmudflap.so.0*
@@ -2374,7 +2394,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libmudflapth.so.0*
 
 %if %{separate_biarch}
-
 %files -n libmudflap43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libmudflap.so.0*
@@ -2413,8 +2432,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %{libsubdir}/cc1
 #%{libsubdir}/specs
 %doc %{_mandir}/man1/cpp%{binsuffix}.1.gz
-%if %{build_objc}
 
+%if %{build_objc}
 %files objc
 %defattr(-,root,root)
 %{libsubdir}/cc1obj
@@ -2424,7 +2443,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %versmainlib libobjc.so
 
 %if %{separate_biarch}
-
 %files objc%{separate_biarch_suffix}
 %defattr(-,root,root)
 %versbiarchlib libobjc.a
@@ -2438,21 +2456,22 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libobjc.so.*
 
 %if %{separate_biarch}
-
 %files -n libobjc43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libobjc.so.*
 
 %endif
 %endif
-%if %{build_objcp}
 
+
+%if %{build_objcp}
 %files obj-c++
 %defattr(-,root,root)
 %{libsubdir}/cc1objplus
 %endif
-%if %{build_ada}
 
+
+%if %{build_ada}
 %files ada
 %defattr(-,root,root)
 %dir %{_libdir}/gcc
@@ -2475,9 +2494,10 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %{mainlibdir}/libgnat-*.so
 %endif
 # LIBJAVA-DELETE-END
+
+
 %if %{build_java}
 %if 0%{?building_libjava:1}
-
 %files -n gcc43-java
 %defattr(-,root,root)
 %{_prefix}/bin/gcj%{binsuffix}
@@ -2498,9 +2518,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
 %endif
 %endif
+
 %if %{build_java}
 %if %{build_libjava}
-
 %files -n libgcj43
 %defattr(-,root,root)
 %dir %{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}
@@ -2628,7 +2648,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libffi.so.*
 
 %if %{separate_biarch}
-
 %files -n libffi43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libffi.so.*
@@ -2644,7 +2663,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libffi.a
 
 %if %{separate_biarch}
-
 %files -n libffi43-devel%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libffi.so
@@ -2654,8 +2672,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %endif
 %endif
 %endif
-%if %{run_tests}
 
+%if %{run_tests}
 %files -n gcc43-testresults
 %defattr(-,root,root)
 %doc testresults/test_summary.txt
@@ -2663,4 +2681,5 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %doc testresults/*.log
 %endif
 
+
 %changelog
--- libgcj43.changes.orig
+++ libgcj43.changes
@@ -1,4 +1,15 @@
 -------------------------------------------------------------------
+Tue Aug  4 14:14:33 CEST 2009 - rguenther@suse.de
+
+- Update to GCC 4.3.4 release. 
+- Disable -Wl,--as-needed.
+
+-------------------------------------------------------------------
+Mon Aug  3 11:31:45 CEST 2009 - rguenther@suse.de
+
+- Package cpuid.h.  [bnc#527433]
+
+-------------------------------------------------------------------
 Tue Jul 14 12:41:23 CEST 2009 - rguenther@suse.de
 
 - Update to gcc-4_3-branch head (r149624).
--- libgcj43.spec.orig
+++ libgcj43.spec
@@ -1,5 +1,6 @@
-#
-# spec file for package libgcj43 (Version 4.3.3_20090714)
+%define building_libjava 1
+%define run_tests 1
+# spec file for package gcc43 (Version 4.3.x)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,25 +19,12 @@
 # norootforbuild
 # icecream 0
 
-%define building_libjava 1
-%define run_tests 1
-# spec file for package gcc43 (Version 4.3.x)
-#
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
+
 # Run the testsuite if there's a file named RUN_TESTS in the source
 %if 0%{!?run_tests:1}
 %define run_tests %(test -f %_sourcedir/RUN_TESTS && echo 1 || echo 0)
 %endif
+
 # Ada currently fails to build on a few platforms, enable it only
 # on those that work
 # Note that AdaCore only supports %ix86, x86_64 and ia64
@@ -46,6 +34,7 @@
 # alpha ppc64 s390x hppa
 %define build_ada 0
 %endif
+
 # We don't want to build java on arm
 %ifarch mips %arm
 %define build_java 0
@@ -54,39 +43,44 @@
 %define build_java 1
 %define build_libjava 0%{?building_libjava:1}
 %endif
+
 %define build_cp 1
 %define build_fortran 1
 %define build_objc 1
 %define build_objcp 0%{!?building_libjava:1}
 %define build_with_mudflap 0
+
 %if %{build_objcp}
 %define build_cp 1
 %define build_objc 1
 %endif
+
 %if %{build_libjava}
 %define build_cp 1
 %endif
 
-Name:           libgcj43
-BuildRequires:  bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel
+
+Name: libgcj43
+BuildRequires: bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel
 %if %{build_ada}
 %if %{suse_version} > 1110
 %define hostsuffix -4.3
-BuildRequires:  gcc43-ada
+BuildRequires: gcc43-ada
 %else
 %define hostsuffix %{nil}
-BuildRequires:  gcc-ada
+BuildRequires: gcc-ada
 %endif
 %endif
 %if %{build_libjava}
-BuildRequires:  fastjar gtk2-devel libart_lgpl-devel unzip
+BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip
 %endif
 %ifarch ia64
-BuildRequires:  libunwind-devel
+BuildRequires: libunwind-devel
 %endif
 %if %{run_tests}
-BuildRequires:  dejagnu expect
+BuildRequires: dejagnu expect
 %endif
+
 # Define version number of libgcc_s
 %ifarch hppa
 %define libgcc_s 4
@@ -100,6 +94,7 @@ BuildRequires:  dejagnu expect
 %else
 %define build_nof 0
 %endif
+
 %define separate_bi32 0
 %define separate_bi64 0
 %ifarch ppc
@@ -110,6 +105,7 @@ BuildRequires:  dejagnu expect
 %ifarch x86_64 s390x ppc64
 %define separate_bi32 1
 %endif
+
 # Define two macros to trigger -32bit or -64bit package variants
 %define separate_biarch 0
 %if %{separate_bi32}
@@ -120,157 +116,164 @@ BuildRequires:  dejagnu expect
 %define separate_biarch 1
 %define separate_biarch_suffix -64bit
 %endif
+
 %ifarch x86_64 ia64 s390x alpha ppc64
 # 64-bit is primary build target
 %define build_primary_64bit 1
 %else
 %define build_primary_64bit 0
 %endif
+
 %define biarch_libjava 0
+
 # COMMON-BEGIN
 %define biarch_targets x86_64 s390x powerpc64 powerpc
-Url:            http://gcc.gnu.org/
-Version:        4.3.3_20090714
-Release:        1
+
+URL:          http://gcc.gnu.org/
+Version: 4.3.4_20090804
+Release:      1
 %define gcc_version %(echo %version | sed 's/_.*//')
 %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
 %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
 %define binsuffix -4.3
 # COMMON-END
+
 %if 0%{?!building_libjava:1}
-Requires:       binutils glibc-devel
-Requires:       cpp43 = %{version}-%{release}
-Requires:       libgcc%{libgcc_s} >= %{version}-%{release}
-Requires:       libgomp1 >= %{version}-%{release}
+Requires:     binutils glibc-devel
+Requires:     cpp43 = %{version}-%{release}
+Requires:     libgcc%{libgcc_s} >= %{version}-%{release}
+Requires:     libgomp1 >= %{version}-%{release}
 %if %{build_with_mudflap}
-Requires:       libmudflap0 >= %{version}-%{release}
-Requires:       libmudflapth0 >= %{version}-%{release}
+Requires:     libmudflap0 >= %{version}-%{release}
+Requires:     libmudflapth0 >= %{version}-%{release}
 %endif
 %if 0%{suse_version} > 1000
-Suggests:       gcc43-info gcc43-locale
+Suggests:     gcc43-info gcc43-locale
 %endif
 %endif
+
 # COMMON-BEGIN
-AutoReqProv:    on
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         gcc-%{gcc_version}%{snapshot_date}.tar.bz2
-Source1:        change_spec
-Source2:        libgcj43-rpmlintrc
-Source3:        gcc43-rpmlintrc
-Source4:        ecj.jar
-Source5:        README.First-for.SuSE.packagers
-Patch1:         gcc-dir-version.patch
-Patch2:         gcc-sles-version.patch
-Patch3:         gcc-noalias-warn.diff
-Patch4:         gcc-add-defaultsspec.diff
-Patch5:         boehm-gc-strict-aliasing.patch
-Patch6:         suse-record-gcc-opts.diff
-Patch7:         acats-timeout.patch
-Patch10:        program-transform-name.diff
-Patch11:        program-transform-name-tools.diff
-Patch12:        gcc4-ppc64-m32-m64-multilib-only.patch
-Patch22:        libjava-no-static.diff
-Patch23:        libjava-no-multilib.diff
-Patch24:        tls-no-direct.diff
-Patch25:        pr27880.diff
-Patch28:        pr33763.diff
-Patch29:        pr40141.diff
-Patch30:        Wunprototyped-calls.diff
-Patch31:        pr27799-1.diff
-Patch32:        pr27799-2.diff
-Patch33:        pr27799-3.diff
-Patch41:        fpreserve-function-arguments43.patch
-Patch42:        pr27975.diff
-Patch43:        build-id.diff
-Patch44:        nvl428413.patch
-Patch45:        nvl423594.patch
+Autoreqprov:  on
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Source:       gcc-%{gcc_version}%{snapshot_date}.tar.bz2
+Source1:      change_spec
+Source2:      libgcj43-rpmlintrc
+Source3:      gcc43-rpmlintrc
+Source4:      ecj.jar
+Source5:      README.First-for.SuSE.packagers
+Patch1:		gcc-dir-version.patch
+Patch2:		gcc-sles-version.patch
+Patch3:		gcc-noalias-warn.diff
+Patch4:		gcc-add-defaultsspec.diff
+Patch5:		boehm-gc-strict-aliasing.patch
+Patch6:		suse-record-gcc-opts.diff
+Patch7:		acats-timeout.patch
+Patch10:	program-transform-name.diff
+Patch11:	program-transform-name-tools.diff
+Patch12:	gcc4-ppc64-m32-m64-multilib-only.patch
+Patch22:	libjava-no-static.diff
+Patch23:	libjava-no-multilib.diff
+Patch24:	tls-no-direct.diff
+Patch25:	pr27880.diff
+Patch28:	pr33763.diff
+Patch29:	pr40141.diff
+Patch30:	Wunprototyped-calls.diff
+Patch31:	pr27799-1.diff
+Patch32:	pr27799-2.diff
+Patch33:	pr27799-3.diff
+Patch41:	fpreserve-function-arguments43.patch
+Patch42:	pr27975.diff
+Patch43:	build-id.diff
+Patch44:	nvl428413.patch
+Patch45:	nvl423594.patch
 Patch46:        pr32277.diff
-Patch47:        gcc43-as-g0
-Patch202:       nvl440482.patch
-Patch204:       pr39675.diff
+Patch47:	gcc43-as-g0
+Patch202:	nvl440482.patch
+Patch204:	pr39675.diff
 # A set of patches from the RH srpm
-Patch50:        gcc43-c++-builtin-redecl.patch
-Patch51:        gcc41-ia64-stack-protector.patch
-Patch52:        gcc43-java-debug-iface-type.patch
-Patch53:        gcc43-libgomp-omp_h-multilib.patch
-Patch54:        gcc43-pr34037.patch
-Patch55:        gcc41-java-slow_pthread_self.patch
-Patch56:        gcc43-pr36741-revert.patch
-Patch57:        gcc41-ppc32-retaddr.patch
-Patch58:        gcc43-pr37189.patch
-Patch59:        gcc43-x86_64-va_start.patch
+Patch50:	gcc43-c++-builtin-redecl.patch
+Patch51:	gcc41-ia64-stack-protector.patch
+Patch52:	gcc43-java-debug-iface-type.patch
+Patch53:	gcc43-libgomp-omp_h-multilib.patch
+Patch54:	gcc43-pr34037.patch
+Patch55:	gcc41-java-slow_pthread_self.patch
+Patch56:	gcc43-pr36741-revert.patch
+Patch57:	gcc41-ppc32-retaddr.patch
+Patch58:	gcc43-pr37189.patch
+Patch59:	gcc43-x86_64-va_start.patch
 # Some patches taken from Debian
-Patch60:        gcc43-textdomain.patch
-Patch61:        gcc43-rename-info-files.patch
+Patch60:	gcc43-textdomain.patch
+Patch61:	gcc43-rename-info-files.patch
 # Patches for AMD features
-Patch70:        pr34043-1.diff
-Patch71:        pr34043-2.diff
-Patch72:        pr34043-3.diff
-Patch73:        pr34043-4.diff
-Patch74:        pr34043-5.diff
-Patch75:        amd-SSE5-shift-ppc-1.diff
-Patch76:        amd-SSE5-shift-ppc-2.diff
-Patch77:        amd-SSE5-shift.diff
-Patch78:        amd-cunroll-1.diff
-Patch79:        amd-cunroll-2.diff
-Patch81:        amd-cvect-1.diff
-Patch82:        amd-cvect-2.diff
+Patch70:	pr34043-1.diff
+Patch71:	pr34043-2.diff
+Patch72:	pr34043-3.diff
+Patch73:	pr34043-4.diff
+Patch74:	pr34043-5.diff
+Patch75:	amd-SSE5-shift-ppc-1.diff
+Patch76:	amd-SSE5-shift-ppc-2.diff
+Patch77:	amd-SSE5-shift.diff
+Patch78:	amd-cunroll-1.diff
+Patch79:	amd-cunroll-2.diff
+Patch81:	amd-cvect-1.diff
+Patch82:	amd-cvect-2.diff
 # Patches for Intel features
-Patch80:        intel303993-aes.diff
+Patch80:	intel303993-aes.diff
 # Patches for IBM features
-Patch90:        ibm304071-z10-1
-Patch91:        ibm304071-z10-2
-Patch92:        ibm304071-z10-3
-Patch93:        ibm304071-z10-4
-Patch94:        ibm304071-z10-5
-Patch95:        ibm304071-z10-6
-Patch96:        pr36745.diff
-Patch97:        pr36822.diff
-Patch99:        ibm-vector-keyword-1
-Patch100:       ibm-vector-keyword-2
-Patch101:       ibm-vector-keyword-3
-Patch102:       ibm304071-z10-7
-Patch103:       ibm304134-power7-1
-Patch104:       ibm-cell-split
-Patch105:       ibm-cell-split-fixes
-Patch106:       nvl425806.patch
-Patch109:       nvl425783.patch
-Patch110:       nvl425784.patch
-Patch111:       nvl425788.patch
-Patch112:       nvl425789.patch
-Patch114:       nvl425791.patch
-Patch115:       nvl425794.patch
-Patch116:       nvl425798-1.patch
-Patch117:       nvl425798-2.patch
-Patch118:       nvl425799.patch
-Patch119:       nvl426087.patch
-Patch120:       ibm304071-z10-8
-Patch121:       nvl434500.patch
-Patch122:       nvl436041.patch
+Patch90:	ibm304071-z10-1
+Patch91:	ibm304071-z10-2
+Patch92:	ibm304071-z10-3
+Patch93:	ibm304071-z10-4
+Patch94:	ibm304071-z10-5
+Patch95:	ibm304071-z10-6
+Patch96:	pr36745.diff
+Patch97:	pr36822.diff
+Patch99:	ibm-vector-keyword-1
+Patch100:	ibm-vector-keyword-2
+Patch101:	ibm-vector-keyword-3
+Patch102:	ibm304071-z10-7
+Patch103:	ibm304134-power7-1
+Patch104:	ibm-cell-split
+Patch105:	ibm-cell-split-fixes
+Patch106:	nvl425806.patch
+Patch109:	nvl425783.patch
+Patch110:	nvl425784.patch
+Patch111:	nvl425788.patch
+Patch112:	nvl425789.patch
+Patch114:	nvl425791.patch
+Patch115:	nvl425794.patch
+Patch116:	nvl425798-1.patch
+Patch117:	nvl425798-2.patch
+Patch118:	nvl425799.patch
+Patch119:	nvl426087.patch
+Patch120:	ibm304071-z10-8
+Patch121:	nvl434500.patch
+Patch122:	nvl436041.patch
 Patch123:       gcc43-no-unwind-tables.diff
-Patch124:       nvl441016.patch
+Patch124:	nvl441016.patch
 Patch126:       nvl447669.diff
-Patch127:       nvl464739.patch
+Patch127:	nvl464739.patch
 # Patches for SAP features
-Patch130:       sap303956-utf16-1.diff
-Patch131:       sap303956-utf16-2.diff
-Patch132:       sap303956-utf16-3.diff
-Patch133:       sap303956-utf16-4.diff
-Patch134:       sap303956-utf16-mangling.diff
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Java Runtime Library for gcc
-Group:          System/Libraries
+Patch130:	sap303956-utf16-1.diff
+Patch131:	sap303956-utf16-2.diff
+Patch132:	sap303956-utf16-3.diff
+Patch133:	sap303956-utf16-4.diff
+Patch134:	sap303956-utf16-mangling.diff
+
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Java Runtime Library for gcc
+Group:        System/Libraries
 %define gcj_sover 9
 %if 0%{suse_version} > 1000
-Recommends:     libgcj43-jar = %{version}-%{release}
+Recommends:   libgcj43-jar = %{version}-%{release}
 %endif
-Provides:       libgcj%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgcj%{gcj_sover} < %{version}-%{release}
-Provides:       libgij%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgij%{gcj_sover} < %{version}-%{release}
-Provides:       libgcj-tools%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgcj-tools%{gcj_sover} < %{version}-%{release}
-AutoReqProv:    on
+Provides:     libgcj%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgcj%{gcj_sover} < %{version}-%{release}
+Provides:     libgij%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgij%{gcj_sover} < %{version}-%{release}
+Provides:     libgcj-tools%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgcj-tools%{gcj_sover} < %{version}-%{release}
+Autoreqprov:  on
 
 %description 
 This library is needed if you want to use the GNU Java compiler, gcj.
@@ -282,38 +285,40 @@ Source code for this package is in gcc.
 %postun 
 /sbin/ldconfig
 
+
 %package -n gcc43-java
 License:        GPL v3 or later
-Summary:        The GNU Java Compiler
-Group:          Development/Languages/Java
-AutoReqProv:    on
-Requires:       gcc43 = %{version}
-Requires:       libgcj43-devel = %{version}-%{release}
+Summary:      The GNU Java Compiler
+Group:        Development/Languages/Java
+Autoreqprov:  on
+Requires:     gcc43 = %{version}
+Requires:     libgcj43-devel = %{version}-%{release}
 
 %description -n gcc43-java
 The Java compiler from the GCC-tools-suite.
 
 
 %package -n libgcj_bc43
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Fake library for BC-ABI compatibility.
-Group:          Development/Libraries/Java
-AutoReqProv:    on
-Provides:       libgcj_bc1 = %{version}-%{release}
-Obsoletes:      libgcj_bc1 < %{version}-%{release}
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Fake library for BC-ABI compatibility.
+Group:        Development/Libraries/Java
+Autoreqprov:  on
+Provides:     libgcj_bc1 = %{version}-%{release}
+Obsoletes:    libgcj_bc1 < %{version}-%{release}
 # libgcj_bc is special in that it just contains a symlink to
 # a proper libgcj version.  So require that library and add
 # provides for the shlib version as created at link time
-Requires:       libgcj%{gcj_sover}
+Requires:     libgcj%{gcj_sover}
 %ifarch x86_64 ia64 ppc64 s390x
-Provides:       libgcj_bc.so.1()(64bit)
+Provides:     libgcj_bc.so.1()(64bit)
 %else
-Provides:       libgcj_bc.so.1
+Provides:     libgcj_bc.so.1
 %endif
 # make rpm happy
-Obsoletes:      libgcj_bc42
+Obsoletes:    libgcj_bc42
 # make zypp happy
-Provides:       libgcj_bc42
+Provides:     libgcj_bc42
+
 
 %description -n libgcj_bc43
 A fake library that is used at link time only. It ensures that
@@ -323,29 +328,29 @@ libgcj.so changes.
 
 
 %package -n libgcj43-jar
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Java runtime library (jar files).
-Group:          Development/Libraries/Java
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Java runtime library (jar files).
+Group:        Development/Libraries/Java
 
 %description -n libgcj43-jar
 These are the jar files that go along with the gcj front end to gcc.
 
 
 %package -n libgcj43-devel
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Include Files and Libraries mandatory for Development.
-Group:          Development/Libraries/Java
-AutoReqProv:    on
-Requires:       libstdc++43-devel = %{version}
-Requires:       libgcj%{gcj_sover} >= %{version}-%{release}
-Requires:       libgcj_bc1 >= %{version}-%{release}
-Requires:       libgcj43-jar = %{version}-%{release}
-Requires:       gtk2-devel
-Requires:       libart_lgpl-devel
-Requires:       glibc-devel
-Requires:       zlib-devel
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Include Files and Libraries mandatory for Development.
+Group:        Development/Libraries/Java
+Autoreqprov:  on
+Requires:     libstdc++43-devel = %{version}
+Requires:     libgcj%{gcj_sover} >= %{version}-%{release}
+Requires:     libgcj_bc1 >= %{version}-%{release}
+Requires:     libgcj43-jar = %{version}-%{release}
+Requires:     gtk2-devel
+Requires:     libart_lgpl-devel
+Requires:     glibc-devel
+Requires:     zlib-devel
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libgcj43-devel
@@ -355,27 +360,29 @@ to develop applications that require the
 
 %package -n gcc43-gij
 License:        GPL v3 or later
-Summary:        Java Bytecode Interpreter for gcc
-Group:          Development/Libraries/Java
-Requires:       libgcj%{gcj_sover} >= %{version}-%{release}
-AutoReqProv:    on
+Summary:      Java Bytecode Interpreter for gcc
+Group:        Development/Libraries/Java
+Requires:     libgcj%{gcj_sover} >= %{version}-%{release}
+Autoreqprov:  on
 
 %description -n gcc43-gij
 This package contains the java bytecode interpreter gij and related tools.
 
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41 libffi42
+Obsoletes:    libffi41 libffi42
 # make zypp happy
-Provides:       libffi41 libffi42
+Provides:     libffi41 libffi42
 
 %description -n libffi43
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
@@ -388,24 +395,20 @@ A foreign function interface is the popu
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-32bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41-32bit libffi42-32bit
+Obsoletes:    libffi41-32bit libffi42-32bit
 # make zypp happy
-Provides:       libffi41-32bit libffi42-32bit
+Provides:     libffi41-32bit libffi42-32bit
 
 %description -n libffi43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
 
 %post -n libffi43-32bit
@@ -416,24 +419,20 @@ A foreign function interface is the popu
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-64bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41-64bit libffi42-64bit
+Obsoletes:    libffi41-64bit libffi42-64bit
 # make zypp happy
-Provides:       libffi41-64bit libffi42-64bit
+Provides:     libffi41-64bit libffi42-64bit
 
 %description -n libffi43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
 
 %post -n libffi43-64bit
@@ -442,53 +441,56 @@ A foreign function interface is the popu
 %postun -n libffi43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-devel
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43 >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43 >= %{version}-%{release}
 
 %description -n libffi43-devel
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43-devel-32bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43-32bit >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43-32bit >= %{version}-%{release}
 
 %description -n libffi43-devel-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43-devel-64bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43-64bit >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43-64bit >= %{version}-%{release}
 
 %description -n libffi43-devel-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
 
 %package -n gcc43-testresults
-License:        Public Domain, Freeware
-Summary:        Testsuite results
-Group:          Development/Languages/C and C++
+License:	Public Domain, Freeware
+Summary:      Testsuite results
+Group:        Development/Languages/C and C++
 
 %description -n gcc43-testresults
 Results from running the gcc and target library testsuites.
 
 
+# COMMON-BEGIN
 
+# Define the canonical target and host architecture
+#   %gcc_target_arch  is supposed to be the full target triple
+#   %TARGET_ARCH      is the canonicalized CPU part
+#   %CONFIGURE_TARGET is the target triple used for --target=
 %if 0%{?gcc_target_arch:1}
 %define CONFIGURE_TARGET %{gcc_target_arch}
 %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/")
@@ -505,15 +507,20 @@ Results from running the gcc and target 
 %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/")
 %endif
 %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/")
+
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
+
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
 %define GCCDIST %{HOST_ARCH}-suse-linux
 %endif
+
 %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_dir_version}
 %define gxxinclude %{_prefix}/include/c++/%{gcc_dir_version}
+
 # COMMON-END
+
 # Versionspecific directories
 %define versmainlibdir %{libsubdir}
 %define versmainlibdirbi32 %{libsubdir}/32
@@ -531,6 +538,7 @@ Results from running the gcc and target 
 %else
 %define versmainlibdirbi %{versmainlibdirbi64}
 %endif
+
 %define mainlibdir %{_libdir}
 %define mainlibdirbi32 %{_prefix}/lib
 %define mainlibdirbi64 %{_prefix}/lib64
@@ -540,6 +548,8 @@ Results from running the gcc and target 
 %else
 %define mainlibdirbi %{mainlibdirbi64}
 %endif
+
+
 # Now define a few macros that make it easy to package libs and
 # related files just to the right package, without caring for the
 # exact path the files are in.
@@ -580,6 +590,7 @@ Results from running the gcc and target 
 %endif
 %endif
 %endif
+
 %if %{build_nof}
 %define versmainlib() %{versmainlibdir}/%1\
 %{versnoflibdir}/%1\
@@ -614,6 +625,8 @@ Results from running the gcc and target 
 %endif
 %endif
 %endif
+
+
 # COMMON-BEGIN
 
 %prep
@@ -725,6 +738,7 @@ Results from running the gcc and target 
 %build
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
+
 # Split version file into version used for directories (X.Y) and
 # version to report with --version (X.Y.Z).
 # See also gcc-dir-version.patch.
@@ -735,6 +749,7 @@ else
   mv gcc/BASE-VER gcc/FULL-VER
 fi
 cat gcc/FULL-VER | cut -d '.' -f 1-2 > gcc/BASE-VER
+
 rm -rf obj-%{GCCDIST}
 mkdir obj-%{GCCDIST}
 cd obj-%{GCCDIST}
@@ -756,6 +771,7 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -
 %endif
 # Replace 2 spaces by one finally
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/  / /g'`
+
 languages=c
 %if %{build_cp}
 languages=$languages,c++
@@ -775,6 +791,7 @@ languages=$languages,java
 %if %{build_ada}
 languages=$languages,ada
 %endif
+
 J=%{?jobs:%jobs}
 if test -z "$J"; then
   J=$(getconf _NPROCESSORS_CONF)
@@ -790,26 +807,35 @@ if test "$JL" == "0"; then
   JL=1
 fi
 PARALLEL="-j$J -l$JL"
+
 # we don't want some miscompiles in the testsuite, or some fault in
 # the compiler to kill the machine.  Hence we limit the amount of memory
 # by the physical RAM plus half of swap
 #MEM=$(free -m | awk '/^Mem:/ {print $2}')
 #SWAP=$(free -m | awk '/^Swap:/ {print $2}')
 #ulimit -v $(((MEM + SWAP/2)*1024))
+
 # In general we want to ship release checking enabled compilers
 # and run BETA with checking enabled.
 #ENABLE_CHECKING="--enable-checking=yes"
 ENABLE_CHECKING="--enable-checking=release"
+
 %if "%{name}" != "gcc43"
 export PATH=/opt/cross/bin:$PATH
 %endif
+
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
+
+# -Wl,-as-needed breaks the libgcj setup
+export SUSE_ASNEEDED=0
+
 # configure tries to parse include/features.h to detect
 # if glibc supports SSP.  When cross compiling we would need
 # to install a cross glibc, which we don't, or make the whole
 # thing point to the native glibc, which is in /, hence the
 # --with-sysroot=/
+
 %if %{build_ada}
 # Using the host gnatmake like
 #   CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}"
@@ -915,7 +941,9 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_
 	--with-long-double-128 \
 %endif
 	--build=%{GCCDIST}
+
 # COMMON-END
+
 # Only run profiled bootstrap on archs where it works
 #%ifarch %ix86 x86_64 ppc ppc64 ia64
 #%ifarch %ix86 x86_64 ia64 s390 s390x
@@ -967,6 +995,7 @@ rm $RPM_BUILD_ROOT%{libsubdir}/jc1
 rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain
 %endif
 %endif
+
 # Remove some useless .la files
 for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \
     libgomp libstdc++ libsupc++ libgcj-tools libgij; do
@@ -975,6 +1004,7 @@ for lib in libobjc libgfortran libgfortr
   rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/$lib.la
 %endif
 done
+
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 %if %{biarch}
 %if %{build_primary_64bit}
@@ -983,6 +1013,8 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
 %endif
 %endif
+
+
 # move shared libs from versionspecific dir to main libdir
 for libname in \
 %if 0%{?building_libjava:1}
@@ -1033,13 +1065,17 @@ done
 ln -s libgcj.so.%{gcj_sover} $RPM_BUILD_ROOT%{mainlibdirbi}/libgcj_bc.so.1
 %endif
 %endif
+
+
 %if %{build_ada}
 mv $RPM_BUILD_ROOT%{libsubdir}/adalib/lib*-*.so $RPM_BUILD_ROOT%{_libdir}
 ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} && echo libgnarl-*.so) $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnarl.so
 ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} && echo libgnat-*.so) $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnat.so
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/libgna*-*.so
 %endif
+
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/c++%{binsuffix}
+
 # Remove some crap from the .la files:
 for l in `find $RPM_BUILD_ROOT -name '*.la'`; do
   echo "changing $l"
@@ -1059,6 +1095,7 @@ for l in `find $RPM_BUILD_ROOT -name '*.
       < $l  > $l.new
   mv $l.new $l
 done
+
 %if %{run_tests} 
 cp `find . -name "*.sum"` ../testresults/
 cp `find . -name "*.log"  \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/
@@ -1091,9 +1128,9 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/includ
 rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/spe.h
 rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/bits
 rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys
-rm -f $RPM_BUILD_ROOT%{libsubdir}/include/cpuid.h
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f  $RPM_BUILD_ROOT%{_prefix}/bin/gccbug%{binsuffix}
+
 %if !0%{?building_libjava:1}
 # delete compile flag tracking from crt files
 crt_list=$RPM_BUILD_ROOT%{versmainlibdir}/crt*.o
@@ -1108,6 +1145,7 @@ for o in $crt_list $crt32_list $crt64_li
   objcopy -R ".comment.SUSE.OPTs" $o
 done
 %endif
+
 %if %{build_libjava}
 # gcj -static doesn't work properly anyway, unless using --whole-archive
 # let's save the space instead.
@@ -1119,8 +1157,10 @@ find $RPM_BUILD_ROOT -name libgcj.a \
 	-o -name libjvm.a \
 	-o -name libgcj_bc.a \
   | xargs rm -f
+
 find $RPM_BUILD_ROOT -name libgcj.spec | xargs \
   sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/'
+
 # Move libffi headers, remove empty libffi libtool file
 mv $RPM_BUILD_ROOT%{libsubdir}/include/ffitarget.h $RPM_BUILD_ROOT%{_prefix}/include/
 mv $RPM_BUILD_ROOT%{libsubdir}/include/ffi.h $RPM_BUILD_ROOT%{_prefix}/include/
@@ -1128,6 +1168,7 @@ rm -f $RPM_BUILD_ROOT%{mainlibdir}/libff
 %if %{biarch}
 rm -f $RPM_BUILD_ROOT%{mainlibdirbi}/libffi.la
 %endif
+
 # security files have broken install locations, also they cause conflicts
 # between libgcj versions.  Simply delete them here, libgcj will use its
 # defaults in this case (which is what these files contain anyway).
@@ -1157,6 +1198,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/libi
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libiberty.a
 %endif
 %endif
+
 %if 0%{?building_libjava:1}
 # For building libjava only we need to delete other info docs
 rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info*
@@ -1173,9 +1215,11 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_rm.in
 mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_unw.info $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_unw%{binsuffix}.info
 %endif
 %endif
+
+
+
 %if %{build_java}
 %if 0%{?building_libjava:1}
-
 %files -n gcc43-java
 %defattr(-,root,root)
 %{_prefix}/bin/gcj%{binsuffix}
@@ -1196,9 +1240,9 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
 %endif
 %endif
+
 %if %{build_java}
 %if %{build_libjava}
-
 %files 
 %defattr(-,root,root)
 %dir %{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}
@@ -1326,7 +1370,6 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %mainlib libffi.so.*
 
 %if %{separate_biarch}
-
 %files -n libffi43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libffi.so.*
@@ -1342,7 +1385,6 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %mainlib libffi.a
 
 %if %{separate_biarch}
-
 %files -n libffi43-devel%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libffi.so
@@ -1352,8 +1394,8 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %endif
 %endif
 %endif
-%if %{run_tests}
 
+%if %{run_tests}
 %files -n gcc43-testresults
 %defattr(-,root,root)
 %doc testresults/test_summary.txt
@@ -1361,4 +1403,5 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %doc testresults/*.log
 %endif
 
+
 %changelog

Places

File project.diff of Package gcc43 (Revision 0b324b181ae4278cb4a6ec3f17afd0eb)

Places