rpms/gcc/F-12 gcc44-pr41646.patch, NONE, 1.1 gcc44-rhel6-power4.patch, NONE, 1.1 .cvsignore, 1.298, 1.299 gcc.spec, 1.77, 1.78 sources, 1.302, 1.303 gcc44-vta-pr41353-c9.patch, 1.1, NONE

[Jakub Jelinek]

Author: jakub

Update of /cvs/pkgs/rpms/gcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31015

Modified Files:
	.cvsignore gcc.spec sources 
Added Files:
	gcc44-pr41646.patch gcc44-rhel6-power4.patch 
Removed Files:
	gcc44-vta-pr41353-c9.patch 
Log Message:
4.4.1-21

gcc44-pr41646.patch:
 calls.c                                   |    5 ++++-
 testsuite/gcc.c-torture/compile/pr41646.c |   28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

--- NEW FILE gcc44-pr41646.patch ---
2009-10-09  Jakub Jelinek  <jakub at redhat.com>

	PR rtl-optimization/41646
	* calls.c (expand_call): For BLKmode types returned in registers
	avoid likely spilled hard regs in copy_blkmode_from_reg generated
	insns.

	* gcc.c-torture/compile/pr41646.c: New test.

--- gcc/calls.c	(revision 152596)
+++ gcc/calls.c	(revision 152597)
@@ -3020,7 +3020,10 @@ expand_call (tree exp, rtx target, int i
 	}
       else if (TYPE_MODE (rettype) == BLKmode)
 	{
-	  target = copy_blkmode_from_reg (target, valreg, rettype);
+	  rtx val = valreg;
+	  if (GET_MODE (val) != BLKmode)
+	    val = avoid_likely_spilled_reg (val);
+	  target = copy_blkmode_from_reg (target, val, rettype);
 
 	  /* We can not support sibling calls for this case.  */
 	  sibcall_failure = 1;
--- gcc/testsuite/gcc.c-torture/compile/pr41646.c	(revision 0)
+++ gcc/testsuite/gcc.c-torture/compile/pr41646.c	(revision 152597)
@@ -0,0 +1,28 @@
+/* PR rtl-optimization/41646 */
+
+struct A { unsigned long a; };
+struct B { unsigned short b, c, d; };
+struct B bar (unsigned long);
+
+char *
+foo (char *a, struct A *x)
+{
+  struct B b = bar (x->a);
+  unsigned char c;
+  unsigned short d;
+  a[3] = ((unsigned char) (b.b % 10) + 48);
+  d = b.b / 10;
+  a[2] = ((unsigned char) (d % 10) + 48);
+  d = d / 10;
+  a[1] = ((unsigned char) (d % 10) + 48);
+  a[0] = ((unsigned char) ((d / 10) % 10) + 48);
+  a[4] = 46;
+  c = (unsigned char) b.c;
+  a[6] = (c % 10 + 48);
+  a[5] = ((c / 10) % 10 + 48);
+  a[7] = 46;
+  c = b.d;
+  a[9] = (c % 10 + 48);
+  a[8] = ((c / 10) % 10 + 48);
+  return a + 10;
+}

gcc44-rhel6-power4.patch:
 default64.h |    4 +++-
 sysv4.h     |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE gcc44-rhel6-power4.patch ---
2009-10-10  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/sysv4.h (TARGET_DEFAULT): Override to default to
	power4 for RHEL6.
	* config/rs6000/default64.h (TARGET_DEFAULT): Likewise.

--- gcc/config/rs6000/sysv4.h	2009-10-07 16:45:42.000000000 +0200
+++ gcc/config/rs6000/sysv4.h	2009-10-10 15:48:38.197497571 +0200
@@ -239,9 +239,10 @@ do {									\
 } while (0)
 #endif
 
-/* Override rs6000.h definition.  */
+/* Override rs6000.h definition.  RHEL6 defaults to power4 CPU, power6 tuning.  */
 #undef	TARGET_DEFAULT
-#define	TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS)
+#define	TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_POWERPC64 \
+			| MASK_PPC_GPOPT | MASK_PPC_GFXOPT | MASK_MFCRF)
 
 /* Override rs6000.h definition.  */
 #undef	PROCESSOR_DEFAULT
--- gcc/config/rs6000/default64.h	2009-01-14 12:06:23.000000000 +0100
+++ gcc/config/rs6000/default64.h	2009-10-10 15:49:44.533872481 +0200
@@ -18,7 +18,9 @@ You should have received a copy of the G
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+/* RHEL6 defaults to power4 CPU, power6 tuning.  */
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT \
   (MASK_POWERPC | MASK_PPC_GFXOPT | \
-   MASK_POWERPC64 | MASK_64BIT | MASK_NEW_MNEMONICS)
+   MASK_POWERPC64 | MASK_64BIT | MASK_NEW_MNEMONICS \
+   MASK_PPC_GPOPT | MASK_MFCRF)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/.cvsignore,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- .cvsignore	8 Oct 2009 08:41:15 -0000	1.298
+++ .cvsignore	10 Oct 2009 17:19:46 -0000	1.299
@@ -1,2 +1,2 @@
 fastjar-0.97.tar.gz
-gcc-4.4.1-20091008.tar.bz2
+gcc-4.4.1-20091010.tar.bz2


Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/gcc.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- gcc.spec	8 Oct 2009 08:41:15 -0000	1.77
+++ gcc.spec	10 Oct 2009 17:19:46 -0000	1.78
@@ -1,9 +1,9 @@
-%global DATE 20091008
-%global SVNREV 152555
+%global DATE 20091010
+%global SVNREV 152620
 %global gcc_version 4.4.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 20
+%global gcc_release 21
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 %global include_gappletviewer 1
@@ -162,7 +162,8 @@ Patch18: gcc44-libstdc++-docs.patch
 Patch19: gcc44-ppc64-aixdesc.patch
 Patch20: gcc44-vta-rh521991.patch
 Patch21: gcc44-vta-rh521991-2.patch
-Patch22: gcc44-vta-pr41353-c9.patch
+Patch22: gcc44-pr41646.patch
+Patch23: gcc44-rhel6-power4.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 
@@ -471,7 +472,10 @@ which are required to compile with the G
 %patch19 -p0 -b .ppc64-aixdesc~
 %patch20 -p0 -b .vta-rh521991~
 %patch21 -p0 -b .vta-rh521991-2~
-%patch22 -p0 -b .vta-pr41353-c9~
+%patch22 -p0 -b .pr41646~
+%if 0%{?rhel} >= 6
+%patch23 -p0 -b .rhel6-power4~
+%endif
 
 # This testcase doesn't compile.
 rm libjava/testsuite/libjava.lang/PR35020*
@@ -1841,6 +1845,18 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Oct 10 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-21
+- update from gcc-4_4-branch
+  - fix s390{,x} prefetch for pre-z10 CPUs (#524552)
+- VTA backports
+  - fix debug info differences with/without -save-temps
+    (PR preprocessor/41445)
+- fix ICE with small BLKmode returning call (#516028,
+  PR rtl-optimization/41646)
+%if 0%{?rhel} >= 6
+- if -mcpu= isn't specified, default to -mcpu=power4 (#463549)
+%endif
+
 * Thu Oct  8 2009 Jakub Jelinek <jakub at redhat.com> 4.4.1-20
 - update from gcc-4_4-branch
   - PRs c++/39863, c++/41038


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/F-12/sources,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -p -r1.302 -r1.303
--- sources	8 Oct 2009 08:41:15 -0000	1.302
+++ sources	10 Oct 2009 17:19:46 -0000	1.303
@@ -1,2 +1,2 @@
 2659f09c2e43ef8b7d4406321753f1b2  fastjar-0.97.tar.gz
-c4c9ad868e890c2a8de2f96496e74b12  gcc-4.4.1-20091008.tar.bz2
+911d98c3e797c669fe0564eb880eee2c  gcc-4.4.1-20091010.tar.bz2


--- gcc44-vta-pr41353-c9.patch DELETED ---