4.3.1-1

.cvsignore

@@ -1,2 +1,2 @@
-gcc-4.3.0-20080428.tar.bz2
+gcc-4.3.1-20080609.tar.bz2
 fastjar-0.95.tar.gz

gcc43-cpp-pragma.patch

@@ -1,284 +0,0 @@
-2008-02-26  Jakub Jelinek  <jakub@redhat.com>
-
-	* c-ppoutput.c (scan_translation_unit): Handle CPP_PRAGMA
-	and CPP_PRAGMA_EOL.
-	* c-pragma.c (pragma_ns_name): New typedef.
-	(registered_pp_pragmas): New variable.
-	(c_pp_lookup_pragma): New function.
-	(c_register_pragma_1): If flag_preprocess_only, do nothing
-	for non-expanded pragmas, for expanded ones push pragma's
-	namespace and name into registered_pp_pragmas vector.
-	(c_invoke_pragma_handler): Register OpenMP pragmas even when
-	flag_preprocess_only, don't register GCC pch_preprocess
-	pragma if flag_preprocess_only.
-	* c-opts.c (c_common_init): Call init_pragma even if
-	flag_preprocess_only.
-	* c-pragma.c (c_pp_lookup_pragma): New prototype.
-	* config/darwin.h (DARWIN_REGISTER_TARGET_PRAGMAS): Don't call
-	cpp_register_pragma if flag_preprocess_only.
-
-	* gcc.dg/gomp/preprocess-1.c: New test.
-
---- gcc/c-ppoutput.c.jj	2008-01-26 18:01:16.000000000 +0100
-+++ gcc/c-ppoutput.c	2008-02-26 22:54:57.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Preprocess only, using cpplib.
--   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007
--   Free Software Foundation, Inc.
-+   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007,
-+   2008 Free Software Foundation, Inc.
-    Written by Per Bothner, 1994-95.
- 
-    This program is free software; you can redistribute it and/or modify it
-@@ -177,7 +177,24 @@ scan_translation_unit (cpp_reader *pfile
-       avoid_paste = false;
-       print.source = NULL;
-       print.prev = token;
--      cpp_output_token (token, print.outf);
-+      if (token->type == CPP_PRAGMA)
-+	{
-+	  const char *space;
-+	  const char *name;
-+
-+	  maybe_print_line (token->src_loc);
-+	  fputs ("#pragma ", print.outf);
-+	  c_pp_lookup_pragma (token->val.pragma, &space, &name);
-+	  if (space)
-+	    fprintf (print.outf, "%s %s", space, name);
-+	  else
-+	    fprintf (print.outf, "%s", name);
-+	  print.printed = 1;
-+	}
-+      else if (token->type == CPP_PRAGMA_EOL)
-+	maybe_print_line (token->src_loc);
-+      else
-+	cpp_output_token (token, print.outf);
- 
-       if (token->type == CPP_COMMENT)
- 	account_for_newlines (token->val.str.text, token->val.str.len);
---- gcc/c-pragma.c.jj	2008-02-15 18:43:03.000000000 +0100
-+++ gcc/c-pragma.c	2008-02-26 22:59:44.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Handle #pragma, system V.4 style.  Supports #pragma weak and #pragma pack.
-    Copyright (C) 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
--   2006, 2007 Free Software Foundation, Inc.
-+   2006, 2007, 2008 Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -872,6 +872,61 @@ DEF_VEC_ALLOC_O (pragma_handler, heap);
- 
- static VEC(pragma_handler, heap) *registered_pragmas;
- 
-+typedef struct
-+{
-+  const char *space;
-+  const char *name;
-+} pragma_ns_name;
-+
-+DEF_VEC_O (pragma_ns_name);
-+DEF_VEC_ALLOC_O (pragma_ns_name, heap);
-+
-+static VEC(pragma_ns_name, heap) *registered_pp_pragmas;
-+
-+struct omp_pragma_def { const char *name; unsigned int id; };
-+static const struct omp_pragma_def omp_pragmas[] = {
-+  { "atomic", PRAGMA_OMP_ATOMIC },
-+  { "barrier", PRAGMA_OMP_BARRIER },
-+  { "critical", PRAGMA_OMP_CRITICAL },
-+  { "flush", PRAGMA_OMP_FLUSH },
-+  { "for", PRAGMA_OMP_FOR },
-+  { "master", PRAGMA_OMP_MASTER },
-+  { "ordered", PRAGMA_OMP_ORDERED },
-+  { "parallel", PRAGMA_OMP_PARALLEL },
-+  { "section", PRAGMA_OMP_SECTION },
-+  { "sections", PRAGMA_OMP_SECTIONS },
-+  { "single", PRAGMA_OMP_SINGLE },
-+  { "threadprivate", PRAGMA_OMP_THREADPRIVATE }
-+};
-+
-+void
-+c_pp_lookup_pragma (unsigned int id, const char **space, const char **name)
-+{
-+  const int n_omp_pragmas = sizeof (omp_pragmas) / sizeof (*omp_pragmas);
-+  int i;
-+
-+  for (i = 0; i < n_omp_pragmas; ++i)
-+    if (omp_pragmas[i].id == id)
-+      {
-+	*space = "omp";
-+	*name = omp_pragmas[i].name;
-+	return;
-+      }
-+
-+  if (id >= PRAGMA_FIRST_EXTERNAL
-+      && (id < PRAGMA_FIRST_EXTERNAL
-+	  + VEC_length (pragma_ns_name, registered_pp_pragmas)))
-+    {
-+      *space = VEC_index (pragma_ns_name, registered_pp_pragmas,
-+			  id - PRAGMA_FIRST_EXTERNAL)->space;
-+      *name = VEC_index (pragma_ns_name, registered_pp_pragmas,
-+			 id - PRAGMA_FIRST_EXTERNAL)->name;
-+      return;
-+    }
-+
-+  gcc_unreachable ();
-+}
-+
- /* Front-end wrappers for pragma registration to avoid dragging
-    cpplib.h in almost everywhere.  */
- 
-@@ -881,13 +936,29 @@ c_register_pragma_1 (const char *space, 
- {
-   unsigned id;
- 
--  VEC_safe_push (pragma_handler, heap, registered_pragmas, &handler);
--  id = VEC_length (pragma_handler, registered_pragmas);
--  id += PRAGMA_FIRST_EXTERNAL - 1;
--
--  /* The C++ front end allocates 6 bits in cp_token; the C front end
--     allocates 7 bits in c_token.  At present this is sufficient.  */
--  gcc_assert (id < 64);
-+  if (flag_preprocess_only)
-+    {
-+      pragma_ns_name ns_name;
-+
-+      if (!allow_expansion)
-+	return;
-+
-+      ns_name.space = space;
-+      ns_name.name = name;
-+      VEC_safe_push (pragma_ns_name, heap, registered_pp_pragmas, &ns_name);
-+      id = VEC_length (pragma_ns_name, registered_pp_pragmas);
-+      id += PRAGMA_FIRST_EXTERNAL - 1;
-+    }
-+  else
-+    {
-+      VEC_safe_push (pragma_handler, heap, registered_pragmas, &handler);
-+      id = VEC_length (pragma_handler, registered_pragmas);
-+      id += PRAGMA_FIRST_EXTERNAL - 1;
-+
-+      /* The C++ front end allocates 6 bits in cp_token; the C front end
-+	 allocates 7 bits in c_token.  At present this is sufficient.  */
-+      gcc_assert (id < 64);
-+    }
- 
-   cpp_register_deferred_pragma (parse_in, space, name, id,
- 				allow_expansion, false);
-@@ -921,24 +992,8 @@ c_invoke_pragma_handler (unsigned int id
- void
- init_pragma (void)
- {
--  if (flag_openmp && !flag_preprocess_only)
-+  if (flag_openmp)
-     {
--      struct omp_pragma_def { const char *name; unsigned int id; };
--      static const struct omp_pragma_def omp_pragmas[] = {
--	{ "atomic", PRAGMA_OMP_ATOMIC },
--	{ "barrier", PRAGMA_OMP_BARRIER },
--	{ "critical", PRAGMA_OMP_CRITICAL },
--	{ "flush", PRAGMA_OMP_FLUSH },
--	{ "for", PRAGMA_OMP_FOR },
--	{ "master", PRAGMA_OMP_MASTER },
--	{ "ordered", PRAGMA_OMP_ORDERED },
--	{ "parallel", PRAGMA_OMP_PARALLEL },
--	{ "section", PRAGMA_OMP_SECTION },
--	{ "sections", PRAGMA_OMP_SECTIONS },
--	{ "single", PRAGMA_OMP_SINGLE },
--	{ "threadprivate", PRAGMA_OMP_THREADPRIVATE }
--      };
--
-       const int n_omp_pragmas = sizeof (omp_pragmas) / sizeof (*omp_pragmas);
-       int i;
- 
-@@ -947,8 +1002,9 @@ init_pragma (void)
- 				      omp_pragmas[i].id, true, true);
-     }
- 
--  cpp_register_deferred_pragma (parse_in, "GCC", "pch_preprocess",
--				PRAGMA_GCC_PCH_PREPROCESS, false, false);
-+  if (!flag_preprocess_only)
-+    cpp_register_deferred_pragma (parse_in, "GCC", "pch_preprocess",
-+				  PRAGMA_GCC_PCH_PREPROCESS, false, false);
- 
- #ifdef HANDLE_PRAGMA_PACK
- #ifdef HANDLE_PRAGMA_PACK_WITH_EXPANSION
---- gcc/c-opts.c.jj	2008-02-26 22:53:23.000000000 +0100
-+++ gcc/c-opts.c	2008-02-26 22:54:57.000000000 +0100
-@@ -1,5 +1,5 @@
- /* C/ObjC/C++ command line option handling.
--   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
-+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
-    Free Software Foundation, Inc.
-    Contributed by Neil Booth.
- 
-@@ -1239,6 +1239,9 @@ c_common_init (void)
-   if (version_flag)
-     c_common_print_pch_checksum (stderr);
- 
-+  /* Has to wait until now so that cpplib has its hash table.  */
-+  init_pragma ();
-+
-   if (flag_preprocess_only)
-     {
-       finish_options ();
-@@ -1246,9 +1249,6 @@ c_common_init (void)
-       return false;
-     }
- 
--  /* Has to wait until now so that cpplib has its hash table.  */
--  init_pragma ();
--
-   return true;
- }
- 
---- gcc/c-pragma.h.jj	2008-01-26 18:01:16.000000000 +0100
-+++ gcc/c-pragma.h	2008-02-26 22:54:57.000000000 +0100
-@@ -1,6 +1,6 @@
- /* Pragma related interfaces.
-    Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
--   2007  Free Software Foundation, Inc.
-+   2007, 2008  Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
-@@ -124,4 +124,6 @@ extern enum cpp_ttype pragma_lex (tree *
- extern enum cpp_ttype c_lex_with_flags (tree *, location_t *, unsigned char *,
- 					int);
- 
-+extern void c_pp_lookup_pragma (unsigned int, const char **, const char **);
-+
- #endif /* GCC_C_PRAGMA_H */
---- gcc/config/darwin.h.jj	2008-02-11 14:48:12.000000000 +0100
-+++ gcc/config/darwin.h	2008-02-26 22:54:57.000000000 +0100
-@@ -892,8 +892,9 @@ enum machopic_addr_class {
- 
- #define DARWIN_REGISTER_TARGET_PRAGMAS()			\
-   do {								\
--    cpp_register_pragma (parse_in, NULL, "mark",		\
--			 darwin_pragma_ignore, false);		\
-+    if (!flag_preprocess_only)					\
-+      cpp_register_pragma (parse_in, NULL, "mark",		\
-+			   darwin_pragma_ignore, false);	\
-     c_register_pragma (0, "options", darwin_pragma_options);	\
-     c_register_pragma (0, "segment", darwin_pragma_ignore);	\
-     c_register_pragma (0, "unused", darwin_pragma_unused);	\
---- gcc/testsuite/gcc.dg/gomp/preprocess-1.c.jj	2008-02-26 22:54:57.000000000 +0100
-+++ gcc/testsuite/gcc.dg/gomp/preprocess-1.c	2008-02-26 22:54:57.000000000 +0100
-@@ -0,0 +1,16 @@
-+/* { dg-do preprocess } */
-+
-+void foo (void)
-+{
-+  int i1, j1, k1;
-+#define p parallel
-+#define P(x) private (x##1)
-+#define S(x) shared (x##1)
-+#define F(x) firstprivate (x##1)
-+#pragma omp p P(i) \
-+  S(j) \
-+  F(k)
-+  ;
-+}
-+
-+/* { dg-final { scan-file preprocess-1.i "(^|\n)#pragma omp parallel private \\(i1\\) shared \\(j1\\) firstprivate \\(k1\\)($|\n)" } } */

gcc43-libgomp-omp_h-multilib.patch

@@ -0,0 +1,17 @@
+2008-06-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* omp.h.in (omp_nest_lock_t): Fix up for Linux multilibs.
+
+--- libgomp/omp.h.in.jj	2008-06-09 13:34:05.000000000 +0200
++++ libgomp/omp.h.in	2008-06-09 13:34:48.000000000 +0200
+@@ -42,8 +42,8 @@ typedef struct
+ 
+ typedef struct
+ {
+-  unsigned char _x[@OMP_NEST_LOCK_SIZE@] 
+-    __attribute__((__aligned__(@OMP_NEST_LOCK_ALIGN@)));
++  unsigned char _x[8 + sizeof (void *)] 
++    __attribute__((__aligned__(sizeof (void *))));
+ } omp_nest_lock_t;
+ #endif
+ 

gcc43-pr35650.patch

@@ -1,50 +0,0 @@
-2008-04-21  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/35650
-	* parser.c (cp_parser_lookup_name): Look through single function
-	OVERLOAD.
-
-	* g++.dg/init/ref17.C: New test.
-
---- gcc/cp/parser.c.jj	2008-04-18 17:00:44.000000000 +0200
-+++ gcc/cp/parser.c	2008-04-21 23:58:00.000000000 +0200
-@@ -16407,6 +16407,13 @@ cp_parser_lookup_name (cp_parser *parser
- 	  decl = lookup_qualified_name (parser->scope, name,
- 					tag_type != none_type,
- 					/*complain=*/true);
-+
-+	  /* If we have a single function from a using decl, pull it out.  */
-+	  if (decl
-+	      && TREE_CODE (decl) == OVERLOAD
-+	      && !really_overloaded_fn (decl))
-+	    decl = OVL_FUNCTION (decl);
-+
- 	  if (pushed_scope)
- 	    pop_scope (pushed_scope);
- 	}
---- gcc/testsuite/g++.dg/init/ref17.C.jj	2008-04-21 22:48:02.000000000 +0200
-+++ gcc/testsuite/g++.dg/init/ref17.C	2008-04-21 22:47:09.000000000 +0200
-@@ -0,0 +1,23 @@
-+// PR c++/35650
-+// { dg-do compile }
-+
-+void f1 ();
-+
-+namespace N
-+{
-+  using::f1;
-+  void f2 ();
-+  void f3 ();
-+}
-+
-+using N::f3;
-+
-+void
-+test ()
-+{
-+  void (&a) () = f1;
-+  void (&b) () = N::f1;
-+  void (&c) () = N::f2;
-+  void (&d) () = f3;
-+  void (&e) () = ::f3;
-+}

gcc43-pr35909.patch

@@ -1,41 +0,0 @@
-2008-04-24  Alexandre Oliva  <aoliva@redhat.com>
-
-	PR c++/35909
-	* call.c (convert_like_real): Convert bitfield to desired type
-	before creating temporary.
-
-	* g++.dg/conversion/bitfield9.C: New.
-
---- gcc/cp/call.c.orig	2008-04-22 03:26:25.000000000 -0300
-+++ gcc/cp/call.c	2008-04-22 03:26:27.000000000 -0300
-@@ -4580,7 +4580,10 @@ convert_like_real (conversion *convs, tr
- 		return error_mark_node;
- 	      }
- 	    if (lvalue & clk_bitfield)
--	      expr = convert_bitfield_to_declared_type (expr);
-+	      {
-+		expr = convert_bitfield_to_declared_type (expr);
-+		expr = fold_convert (type, expr);
-+	      }
- 	    expr = build_target_expr_with_type (expr, type);
- 	  }
- 
---- gcc/testsuite/g++.dg/conversion/bitfield9.C	1970-01-01 00:00:00.000000000 +0000
-+++ gcc/testsuite/g++.dg/conversion/bitfield9.C	2008-04-22 03:26:27.000000000 -0300
-@@ -0,0 +1,16 @@
-+// PR c++/35909
-+// { dg-do compile }
-+
-+struct MidiCommand
-+{
-+  unsigned data1 : 8;
-+};
-+
-+void g(const unsigned char &);
-+void h(const unsigned int &);
-+
-+void f(MidiCommand mc)
-+{
-+  g(mc.data1);
-+  h(mc.data1);
-+}

gcc43-pr35987.patch

@@ -1,37 +0,0 @@
-2008-04-21  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/35987
-	* typeck.c (build_modify_expr) <case PREINCREMENT_EXPR>: Don't build
-	COMPOUND_EXPR if the second argument would be error_mark_node.
-
-	* g++.dg/other/error28.C: New test.
-
---- gcc/cp/typeck.c.jj	2008-04-18 17:00:44.000000000 +0200
-+++ gcc/cp/typeck.c	2008-04-21 16:03:45.000000000 +0200
-@@ -5667,10 +5667,11 @@ build_modify_expr (tree lhs, enum tree_c
- 	lhs = build2 (TREE_CODE (lhs), TREE_TYPE (lhs),
- 		      stabilize_reference (TREE_OPERAND (lhs, 0)),
- 		      TREE_OPERAND (lhs, 1));
--      return build2 (COMPOUND_EXPR, lhstype,
--		     lhs,
--		     build_modify_expr (TREE_OPERAND (lhs, 0),
--					modifycode, rhs));
-+      newrhs = build_modify_expr (TREE_OPERAND (lhs, 0),
-+				  modifycode, rhs);
-+      if (newrhs == error_mark_node)
-+	return error_mark_node;
-+      return build2 (COMPOUND_EXPR, lhstype, lhs, newrhs);
- 
-       /* Handle (a, b) used as an "lvalue".  */
-     case COMPOUND_EXPR:
---- gcc/testsuite/g++.dg/other/error28.C.jj	2008-04-21 15:42:09.000000000 +0200
-+++ gcc/testsuite/g++.dg/other/error28.C	2008-04-21 15:37:00.000000000 +0200
-@@ -0,0 +1,8 @@
-+// PR c++/35987
-+// { dg-do compile }
-+
-+void
-+foo (char *p)
-+{
-+  if (++p = true);	// { dg-error "cannot convert" }
-+}

gcc43-sparc-config-detection.patch

@@ -0,0 +1,40 @@
+--- gcc/config.gcc.jj	2008-04-24 15:42:46.000000000 -0500
++++ gcc/config.gcc	2008-04-24 15:44:51.000000000 -0500
+@@ -2343,7 +2343,7 @@ sparc-*-elf*)
+ 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+ 	use_fixproto=yes
+ 	;;
+-sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
++sparc-*-linux* | sparcv9*-*-linux*)		# SPARC's running GNU/Linux, libc6
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
+ 	extra_options="${extra_options} sparc/long-double-switch.opt"
+ 	tmake_file="${tmake_file} sparc/t-linux sparc/t-crtfm"
+@@ -2477,7 +2477,7 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*
+ 	esac
+ 	need_64bit_hwint=yes
+ 	;;
+-sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
++sparc64*-*-linux*)		# 64-bit SPARC's running GNU/Linux
+ 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
+ 	extra_options="${extra_options} sparc/long-double-switch.opt"
+ 	tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
+--- libgcc/config.host.jj	2008-04-24 15:46:19.000000000 -0500
++++ libgcc/config.host	2008-04-24 15:46:49.000000000 -0500
+@@ -572,7 +572,7 @@ sparc64-*-openbsd*)
+ 	;;
+ sparc-*-elf*)
+ 	;;
+-sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
++sparc-*-linux* | sparcv9*-*-linux*)		# SPARC's running GNU/Linux, libc6
+ 	extra_parts="$extra_parts crtfastmath.o"
+ 	tmake_file="${tmake_file} sparc/t-crtfm"
+ 	;;
+@@ -590,7 +590,7 @@ sparc-wrs-vxworks)
+ 	;;
+ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
+ 	;;
+-sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
++sparc64*-*-linux*)		# 64-bit SPARC's running GNU/Linux
+ 	extra_parts="$extra_parts crtfastmath.o"
+ 	tmake_file="${tmake_file} sparc/t-crtfm"
+ 	;;

gcc43.spec

@@ -1,6 +1,6 @@
-%define DATE 20080428
+%define DATE 20080609
-%define gcc_version 4.3.0
+%define gcc_version 4.3.1
-%define gcc_release 8
+%define gcc_release 1
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -20,7 +20,7 @@
 %define multilib_32_arch s390
 %endif
 %ifarch sparc64
-%define multilib_32_arch sparc
+%define multilib_32_arch sparcv9
 %endif
 %ifarch ppc64
 %define multilib_32_arch ppc
@@ -71,7 +71,7 @@ BuildRequires: elfutils-devel >= 0.72
 # Make sure glibc supports TFmode long double
 BuildRequires: glibc >= 2.3.90-35
 %endif
-%ifarch %{multilib_64_archs} sparc ppc
+%ifarch %{multilib_64_archs} sparcv9 ppc
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
@@ -138,27 +138,24 @@ Patch8: gcc43-pr32139.patch
 Patch9: gcc43-pr33763.patch
 Patch10: gcc43-rh330771.patch
 Patch11: gcc43-rh341221.patch
-Patch12: gcc43-cpp-pragma.patch
+Patch12: gcc43-java-debug-iface-type.patch
-Patch13: gcc43-java-debug-iface-type.patch
+Patch13: gcc43-i386-libgomp.patch
-Patch14: gcc43-libgomp-speedup.patch
+Patch14: gcc43-rh251682.patch
-Patch15: gcc43-pr35909.patch
+Patch15: gcc43-sparc-config-detection.patch
-Patch16: gcc43-i386-libgomp.patch
+Patch16: gcc43-libgomp-omp_h-multilib.patch
-Patch17: gcc43-pr35987.patch
-Patch18: gcc43-rh251682.patch
-Patch19: gcc43-pr35650.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
 %ifnarch %{arm}
 %define _gnu %{nil}
 %endif
-%ifarch sparc
+%ifarch sparcv9
 %define gcc_target_platform sparc64-%{_vendor}-%{_target_os}
 %endif
 %ifarch ppc
 %define gcc_target_platform ppc64-%{_vendor}-%{_target_os}
 %endif
-%ifnarch sparc ppc
+%ifnarch sparcv9 ppc
 %define gcc_target_platform %{_target_platform}
 %endif
 
@@ -441,14 +438,11 @@ which are required to run programs compiled with the GNAT.
 %patch9 -p0 -b .pr33763~
 %patch10 -p0 -b .rh330771~
 %patch11 -p0 -b .rh341221~
-%patch12 -p0 -b .cpp-pragma~
+%patch12 -p0 -b .java-debug-iface-type~
-%patch13 -p0 -b .java-debug-iface-type~
+%patch13 -p0 -b .i386-libgomp~
-%patch14 -p0 -b .libgomp-speedup~
+%patch14 -p0 -b .rh251682~
-%patch15 -p0 -b .pr35909~
+%patch15 -p0 -b .sparc-config-detection~
-%patch16 -p0 -b .i386-libgomp~
+%patch16 -p0 -b .libgomp-omp_h-multilib~
-%patch17 -p0 -b .pr35987~
-%patch18 -p0 -b .rh251682~
-%patch19 -p0 -b .pr35650~
 
 tar xzf %{SOURCE4}
 
@@ -456,7 +450,7 @@ tar xzf %{SOURCE4}
 tar xjf %{SOURCE10}
 %endif
 
-sed -i -e 's/4\.3\.1/4.3.0/' gcc/BASE-VER
+sed -i -e 's/4\.3\.2/4.3.1/' gcc/BASE-VER
 echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
 
 cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
@@ -544,7 +538,7 @@ cd ..
 CC=gcc
 OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
-%ifarch sparc sparc64
+%ifarch sparc
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g;s/-mcpu=v[78]//g'`
 %endif
 %ifarch %{ix86}
@@ -601,11 +595,17 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 %ifarch ppc ppc64
 	--enable-secureplt \
 %endif
-%ifarch sparc ppc ppc64 s390 s390x alpha
+%ifarch sparc sparcv9 sparc64 ppc ppc64 s390 s390x alpha
 	--with-long-double-128 \
 %endif
 %ifarch sparc
-	--build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7
+	--disable-linux-futex \
+%endif
+%ifarch sparc64
+	--with-cpu=ultrasparc \
+%endif
+%ifarch sparc sparcv9
+	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7
 %endif
 %ifarch ppc
 	--build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
@@ -616,7 +616,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 %ifarch s390 s390x
 	--with-tune=z9-109 \
 %endif
-%ifnarch sparc ppc
+%ifnarch sparc sparcv9 ppc
 	--build=%{gcc_target_platform}
 %endif
 
@@ -788,7 +788,7 @@ done
 # shipping this for everybody is unnecessary.
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_version}/%{gcc_target_platform}/bits/stdc++.h.gch
 
-%ifarch sparc sparc64
+%ifarch sparcv9 sparc64
 ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
   $RPM_BUILD_ROOT%{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc
 %endif
@@ -797,7 +797,7 @@ ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
   $RPM_BUILD_ROOT%{_prefix}/bin/ppc-%{_vendor}-%{_target_os}-gcc
 %endif
 
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 FULLLPATH=$FULLPATH/lib32
 %endif
 %ifarch sparc64 ppc64
@@ -827,7 +827,7 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgcc_s.so.1 $RPM_BUILD_ROOT/%{_lib}/li
 chmod 755 $RPM_BUILD_ROOT/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
 ln -sf libgcc_s-%{gcc_version}-%{DATE}.so.1 $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so.1
 ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 ln -sf /lib64/libgcc_s.so.1 $FULLPATH/64/libgcc_s.so
 %endif
 %ifarch %{multilib_64_archs}
@@ -913,7 +913,7 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.*a .
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libmudflap{,th}.*a $FULLLPATH/
 
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 ln -sf ../../../../../lib64/libobjc.so.2 64/libobjc.so
 ln -sf ../`echo ../../../../lib/libstdc++.so.6.* | sed s~/lib/~/lib64/~` 64/libstdc++.so
 ln -sf ../`echo ../../../../lib/libgfortran.so.3.* | sed s~/lib/~/lib64/~` 64/libgfortran.so
@@ -1055,7 +1055,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libssp*
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.so*
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.a
 %else
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.so*
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.a
 %endif
@@ -1199,10 +1199,10 @@ fi
 %{_prefix}/bin/gcov
 %{_prefix}/bin/protoize
 %{_prefix}/bin/unprotoize
-%ifarch sparc ppc
+%ifarch ppc
 %{_prefix}/bin/%{_target_platform}-gcc
 %endif
-%ifarch sparc64
+%ifarch sparc64 sparcv9
 %{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc
 %endif
 %ifarch ppc64
@@ -1264,7 +1264,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.spec
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgomp.so
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/crt*.o
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc.a
@@ -1292,7 +1292,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflap.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libmudflapth.so
 %endif
-%ifarch sparc sparc64 ppc ppc64
+%ifarch sparcv9 sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
@@ -1333,7 +1333,7 @@ fi
 %dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
 %dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/cc1plus
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libstdc++.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libstdc++.a
@@ -1345,11 +1345,11 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libstdc++.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libsupc++.a
 %endif
-%ifarch sparc ppc %{multilib_64_archs}
+%ifarch sparcv9 ppc %{multilib_64_archs}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libsupc++.a
 %endif
-%ifarch sparc sparc64 ppc ppc64
+%ifarch sparcv9 sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.a
 %endif
 %doc rpm.doc/changelogs/gcc/cp/ChangeLog*
@@ -1368,7 +1368,7 @@ fi
 %dir %{_prefix}/lib/gcc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libstdc++.a
 %endif
@@ -1376,10 +1376,10 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libstdc++.a
 %endif
-%ifnarch sparc sparc64 ppc ppc64
+%ifnarch sparcv9 sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.a
 %endif
-%ifnarch sparc ppc %{multilib_64_archs}
+%ifnarch sparcv9 ppc %{multilib_64_archs}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libsupc++.a
 %endif
@@ -1398,7 +1398,7 @@ fi
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/cc1obj
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libobjc.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libobjc.so
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libobjc.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libobjc.so
@@ -1443,7 +1443,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortranbegin.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.so
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgfortranbegin.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgfortran.a
@@ -1484,11 +1484,11 @@ fi
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/jvgenmain
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj-tools.so
-%ifarch sparc sparc64 ppc ppc64
+%ifarch sparcv9 sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
 %endif
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgij.so
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj-tools.so
@@ -1578,7 +1578,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jni_md.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jvmpi.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.spec
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libgcj_bc.so
 %endif
@@ -1586,7 +1586,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgcj_bc.so
 %endif
-%ifnarch sparc sparc64 ppc ppc64
+%ifnarch sparcv9 sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
 %endif
 %dir %{_prefix}/include/c++
@@ -1645,7 +1645,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mf-runtime.h
-%ifarch sparc ppc
+%ifarch sparcv9 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflapth.a
@@ -1655,7 +1655,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflapth.a
 %endif
-%ifnarch sparc sparc64 ppc ppc64
+%ifnarch sparcv9 sparc64 ppc ppc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
@@ -1664,6 +1664,40 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Jun 9  2008 Jakub Jelinek <jakub@redhat.com> 4.3.1-1
+- update from gcc-4_3-branch
+  - 4.3.1 release
+  - PRs ada/24880, ada/26635, bootstrap/35169, bootstrap/36452, c++/35578,
+	c++/35986, c++/36023, c++/36237, c++/36308, fortran/35184,
+	fortran/35743, fortran/35745, fortran/35756, fortran/35759,
+	fortran/35780, fortran/35864, fortran/35997, fortran/36176,
+	fortran/36233, libfortran/35990, libfortran/35993, libfortran/35995,
+	libgcj/36252, libstdc++/35922, middle-end/34973, middle-end/36013,
+	middle-end/36077, middle-end/36093, middle-end/36106,
+	middle-end/36137, middle-end/36154, middle-end/36172,
+	middle-end/36194, middle-end/36227, middle-end/36244,
+	middle-end/36300, middle-end/PR28690, rtl-optimization/36111,
+	rtl-optimization/36419, target/27386, target/30243, target/34932,
+	target/35661, target/35921, target/36079, target/36090, target/36095,
+	target/36182, target/36224, target/36321, target/36362,
+	tree-optimization/34244, tree-optimization/34330,
+	tree-optimization/34976, tree-optimization/35204,
+	tree-optimization/36098, tree-optimization/36119,
+	tree-optimization/36129, tree-optimization/36181,
+	tree-optimization/36187, tree-optimization/36245,
+	tree-optimization/36262, tree-optimization/36291,
+	tree-optimization/36293, tree-optimization/36339
+- OpenMP 3.0 support
+
+* Tue May 20 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4.3.0-11
+- fix missing file with sparcv9
+
+* Sun May 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4.3.0-10
+- make sparcv9 the multilib_32_arch for sparc64
+
+* Sun May 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4.3.0-9
+- sparcv9 support and detection
+
 * Mon Apr 28 2008 Jakub Jelinek <jakub@redhat.com> 4.3.0-8
 - update from gcc-4_3-branch
   - decrease compile time stack usage during GC (#443739, PR debug/36060)

sources

@@ -1,2 +1,2 @@
-5dd05f97c3d766c2369fdf52c3f71017  gcc-4.3.0-20080428.tar.bz2
+91abbb3cb390ca0441acec2bb0908eab  gcc-4.3.1-20080609.tar.bz2
 92a70f9e56223b653bce0f58f90cf950  fastjar-0.95.tar.gz