diff --git a/.cvsignore b/.cvsignore index a1dcbef..2aab667 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ fastjar-0.97.tar.gz -gcc-4.4.1-20091008.tar.bz2 +gcc-4.4.1-20091010.tar.bz2 diff --git a/gcc.spec b/gcc.spec index 91bb163..4a6a9ac 100644 --- a/gcc.spec +++ b/gcc.spec @@ -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 GNAT. %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 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 4.4.1-20 - update from gcc-4_4-branch - PRs c++/39863, c++/41038 diff --git a/gcc44-pr41646.patch b/gcc44-pr41646.patch index b5f2763..beeb584 100644 --- a/gcc44-pr41646.patch +++ b/gcc44-pr41646.patch @@ -9,15 +9,15 @@ --- gcc/calls.c (revision 152596) +++ gcc/calls.c (revision 152597) -@@ -3020,7 +3020,10 @@ expand_call (tree exp, rtx target, int i +@@ -3019,7 +3019,10 @@ expand_call (tree exp, rtx target, int i } - else if (TYPE_MODE (rettype) == BLKmode) + else if (TYPE_MODE (TREE_TYPE (exp)) == BLKmode) { -- target = copy_blkmode_from_reg (target, valreg, rettype); +- target = copy_blkmode_from_reg (target, valreg, TREE_TYPE (exp)); + rtx val = valreg; + if (GET_MODE (val) != BLKmode) + val = avoid_likely_spilled_reg (val); -+ target = copy_blkmode_from_reg (target, val, rettype); ++ target = copy_blkmode_from_reg (target, val, TREE_TYPE (exp)); /* We can not support sibling calls for this case. */ sibcall_failure = 1; diff --git a/gcc44-rhel6-power4.patch b/gcc44-rhel6-power4.patch new file mode 100644 index 0000000..3d56dad --- /dev/null +++ b/gcc44-rhel6-power4.patch @@ -0,0 +1,34 @@ +2009-10-10 Jakub Jelinek + + * 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 + . */ + ++/* 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) diff --git a/gcc44-vta-pr41353-c9.patch b/gcc44-vta-pr41353-c9.patch deleted file mode 100644 index e580114..0000000 --- a/gcc44-vta-pr41353-c9.patch +++ /dev/null @@ -1,46 +0,0 @@ -2009-10-07 Alexandre Oliva - - PR debug/41353 - * regmove.c (regmove_backward_pass): Replace src with dst in the - debug insn, and check for dst before rather than after. - ---- gcc/regmove.c.orig 2009-10-06 03:51:43.000000000 -0300 -+++ gcc/regmove.c 2009-10-07 02:35:36.000000000 -0300 -@@ -1117,23 +1117,28 @@ regmove_backward_pass (void) - break; - } - -- /* We can't make this change if SRC is read or -+ /* We can't make this change if DST is mentioned at -+ all in P, since we are going to change its value. -+ We can't make this change if SRC is read or - partially written in P, since we are going to -- eliminate SRC. We can't make this change -- if DST is mentioned at all in P, -- since we are going to change its value. */ -- if (reg_overlap_mentioned_p (src, PATTERN (p))) -+ eliminate SRC. However, if it's a debug insn, we -+ can't refrain from making the change, for this -+ would cause codegen differences, so instead we -+ invalidate debug expressions that reference DST, -+ and adjust references to SRC in them so that they -+ become references to DST. */ -+ if (reg_mentioned_p (dst, PATTERN (p))) - { - if (DEBUG_INSN_P (p)) -- validate_replace_rtx_group (dst, src, insn); -+ validate_change (p, &INSN_VAR_LOCATION_LOC (p), -+ gen_rtx_UNKNOWN_VAR_LOC (), 1); - else - break; - } -- if (reg_mentioned_p (dst, PATTERN (p))) -+ if (reg_overlap_mentioned_p (src, PATTERN (p))) - { - if (DEBUG_INSN_P (p)) -- validate_change (p, &INSN_VAR_LOCATION_LOC (p), -- gen_rtx_UNKNOWN_VAR_LOC (), 1); -+ validate_replace_rtx_group (src, dst, p); - else - break; - } diff --git a/sources b/sources index 053e804..a423b51 100644 --- a/sources +++ b/sources @@ -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