diff --git a/.cvsignore b/.cvsignore index a62f3b2..ed37349 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ fastjar-0.97.tar.gz -gcc-4.4.2-20091022.tar.bz2 +gcc-4.4.2-20091027.tar.bz2 diff --git a/gcc.spec b/gcc.spec index 4c5282e..3741176 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,9 +1,9 @@ -%global DATE 20091022 -%global SVNREV 153454 +%global DATE 20091027 +%global SVNREV 153608 %global gcc_version 4.4.2 # 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 6 +%global gcc_release 7 %global _unpackaged_files_terminate_build 0 %global multilib_64_archs sparc64 ppc64 s390x x86_64 %global include_gappletviewer 1 @@ -161,6 +161,7 @@ Patch16: gcc44-unwind-debug-hook.patch Patch17: gcc44-pr38757.patch Patch18: gcc44-libstdc++-docs.patch Patch19: gcc44-ppc64-aixdesc.patch +Patch20: gcc44-pr41762.patch Patch1000: fastjar-0.97-segfault.patch @@ -466,6 +467,7 @@ which are required to compile with the GNAT. %patch18 -p0 -b .libstdc++-docs~ %endif %patch19 -p0 -b .ppc64-aixdesc~ +%patch20 -p0 -b .pr41762~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* @@ -1847,6 +1849,16 @@ fi %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Tue Oct 27 2009 Jakub Jelinek 4.4.2-7 +- update from gcc-4_4-branch + - PRs c++/40808, c/41842, cp-tools/39177 +- VTA backports + - PR bootstrap/41345 +- don't emit DW_AT_name: etc. into debug info + (#530304, PR debug/41828) +- power7 ABI fixes (PR target/41787) +- fix ICE in ix86_pic_register_p (PR target/41762) + * Thu Oct 22 2009 Jakub Jelinek 4.4.2-6 - update from gcc-4_4-branch - PR target/41702 diff --git a/gcc44-pr41762.patch b/gcc44-pr41762.patch new file mode 100644 index 0000000..3ec97bb --- /dev/null +++ b/gcc44-pr41762.patch @@ -0,0 +1,53 @@ +2009-10-23 Jakub Jelinek + + PR target/41762 + * config/i386/i386.c (ix86_pic_register_p): Don't call + rtx_equal_for_cselib_p for VALUEs discarded as useless. + + * gcc.dg/pr41762.c: New test. + +--- gcc/config/i386/i386.c.jj 2009-09-29 17:58:03.000000000 +0200 ++++ gcc/config/i386/i386.c 2009-10-23 19:08:19.000000000 +0200 +@@ -10379,7 +10379,7 @@ i386_output_dwarf_dtprel (FILE *file, in + static bool + ix86_pic_register_p (rtx x) + { +- if (GET_CODE (x) == VALUE) ++ if (GET_CODE (x) == VALUE && CSELIB_VAL_PTR (x)) + return (pic_offset_table_rtx + && rtx_equal_for_cselib_p (x, pic_offset_table_rtx)); + else +--- gcc/testsuite/gcc.dg/pr41762.c.jj 2009-10-23 19:15:42.000000000 +0200 ++++ gcc/testsuite/gcc.dg/pr41762.c 2009-10-23 19:14:35.000000000 +0200 +@@ -0,0 +1,31 @@ ++/* PR target/41762 */ ++/* { dg-do compile } */ ++/* { dg-options "-O2 -ftracer -fsched2-use-superblocks" } */ ++/* { dg-options "-O2 -ftracer -fsched2-use-superblocks -fpic" { target fpic } } */ ++ ++extern __SIZE_TYPE__ strlen (const char *); ++extern int f1 (void *); ++extern char *f2 (void); ++extern void f3 (int, int); ++static char *a; ++char *b, *c, *d, *e; ++ ++void ++foo (void) ++{ ++ int f, g, h; ++ f = (a ? strlen (a) : strlen ("abcde")); ++ f += (b ? strlen (b) : 0); ++ f += (c ? strlen (c) : 0); ++ f += (d ? strlen (d) : 0); ++ f += (e ? strlen (e) : 0); ++ h = f1 (strlen); ++ g = strlen (a); ++ f3 (g, f); ++} ++ ++void ++bar (void) ++{ ++ a = f2 (); ++} diff --git a/sources b/sources index 9267d18..a37b5c3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -cb2cf846749da51f2041c375108f472f gcc-4.4.2-20091022.tar.bz2 +7b733f864bf498c34cd46f7bc9ff6134 gcc-4.4.2-20091027.tar.bz2