From 6c02716f783647fd8ac51c59b0f5c94ed7c8e5b8 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Apr 20 2009 20:25:17 +0000 Subject: 4.4.0-0.35 --- diff --git a/.cvsignore b/.cvsignore index 973d5b9..055b350 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ fastjar-0.97.tar.gz -gcc-4.4.0-20090414.tar.bz2 +gcc-4.4.0-20090420.tar.bz2 diff --git a/gcc.spec b/gcc.spec index e9dccf8..05c3a01 100644 --- a/gcc.spec +++ b/gcc.spec @@ -150,7 +150,6 @@ Patch24: gcc44-atom.patch Patch26: gcc44-power7.patch Patch28: gcc44-pr38757.patch Patch30: gcc44-pr39543.patch -Patch31: gcc44-pr39763.patch Patch1000: fastjar-0.97-segfault.patch @@ -439,7 +438,6 @@ which are required to compile with the GNAT. %patch26 -p0 -b .power7~ %patch28 -p0 -b .pr38757~ #%patch30 -p0 -b .pr39543~ -%patch31 -p0 -b .pr39763~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* diff --git a/gcc44-atom.patch b/gcc44-atom.patch index e122e46..bddd13e 100644 --- a/gcc44-atom.patch +++ b/gcc44-atom.patch @@ -2409,7 +2409,7 @@ | m_NOCONA | m_CORE2 | m_GENERIC; static enum stringop_alg stringop_alg = no_stringop; -@@ -1952,7 +2038,8 @@ static const struct ptt processor_target +@@ -1953,7 +2039,8 @@ static const struct ptt processor_target {&core2_cost, 16, 10, 16, 10, 16}, {&generic32_cost, 16, 7, 16, 7, 16}, {&generic64_cost, 16, 10, 16, 10, 16}, @@ -2419,7 +2419,7 @@ }; static const char *const cpu_names[TARGET_CPU_DEFAULT_max] = -@@ -1970,6 +2057,7 @@ static const char *const cpu_names[TARGE +@@ -1971,6 +2058,7 @@ static const char *const cpu_names[TARGE "prescott", "nocona", "core2", @@ -2427,7 +2427,7 @@ "geode", "k6", "k6-2", -@@ -2528,6 +2616,9 @@ override_options (bool main_args_p) +@@ -2529,6 +2617,9 @@ override_options (bool main_args_p) {"core2", PROCESSOR_CORE2, CPU_CORE2, PTA_64BIT | PTA_MMX | PTA_SSE | PTA_SSE2 | PTA_SSE3 | PTA_SSSE3 | PTA_CX16}, @@ -2437,7 +2437,7 @@ {"geode", PROCESSOR_GEODE, CPU_GEODE, PTA_MMX | PTA_3DNOW | PTA_3DNOW_A |PTA_PREFETCH_SSE}, {"k6", PROCESSOR_K6, CPU_K6, PTA_MMX}, -@@ -12866,6 +12957,263 @@ ix86_expand_unary_operator (enum rtx_cod +@@ -12903,6 +12994,263 @@ ix86_expand_unary_operator (enum rtx_cod emit_move_insn (operands[0], dst); } @@ -2701,7 +2701,7 @@ /* Return TRUE or FALSE depending on whether the unary operator meets the appropriate constraints. */ -@@ -18985,6 +19333,7 @@ ix86_issue_rate (void) +@@ -19022,6 +19370,7 @@ ix86_issue_rate (void) switch (ix86_tune) { case PROCESSOR_PENTIUM: @@ -2709,7 +2709,7 @@ case PROCESSOR_K6: return 2; -@@ -19051,41 +19400,21 @@ ix86_flags_dependent (rtx insn, rtx dep_ +@@ -19088,41 +19437,21 @@ ix86_flags_dependent (rtx insn, rtx dep_ return 1; } @@ -2764,7 +2764,7 @@ } static int -@@ -19113,8 +19442,19 @@ ix86_adjust_cost (rtx insn, rtx link, rt +@@ -19150,8 +19479,19 @@ ix86_adjust_cost (rtx insn, rtx link, rt { case PROCESSOR_PENTIUM: /* Address Generation Interlock adds a cycle of latency. */ @@ -2786,7 +2786,7 @@ /* ??? Compares pair with jump/setcc. */ if (ix86_flags_dependent (insn, dep_insn, insn_type)) -@@ -19123,7 +19463,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt +@@ -19160,7 +19500,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt /* Floating point stores require value to be ready one cycle earlier. */ if (insn_type == TYPE_FMOV && get_attr_memory (insn) == MEMORY_STORE @@ -2795,7 +2795,7 @@ cost += 1; break; -@@ -19146,7 +19486,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt +@@ -19183,7 +19523,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt in parallel with previous instruction in case previous instruction is not needed to compute the address. */ if ((memory == MEMORY_LOAD || memory == MEMORY_BOTH) @@ -2804,7 +2804,7 @@ { /* Claim moves to take one cycle, as core can issue one load at time and the next load can start cycle later. */ -@@ -19175,7 +19515,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt +@@ -19212,7 +19552,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt in parallel with previous instruction in case previous instruction is not needed to compute the address. */ if ((memory == MEMORY_LOAD || memory == MEMORY_BOTH) @@ -2813,7 +2813,7 @@ { /* Claim moves to take one cycle, as core can issue one load at time and the next load can start cycle later. */ -@@ -19192,6 +19532,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt +@@ -19229,6 +19569,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt case PROCESSOR_ATHLON: case PROCESSOR_K8: case PROCESSOR_AMDFAM10: @@ -2821,7 +2821,7 @@ case PROCESSOR_GENERIC32: case PROCESSOR_GENERIC64: memory = get_attr_memory (insn); -@@ -19200,7 +19541,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt +@@ -19237,7 +19578,7 @@ ix86_adjust_cost (rtx insn, rtx link, rt in parallel with previous instruction in case previous instruction is not needed to compute the address. */ if ((memory == MEMORY_LOAD || memory == MEMORY_BOTH) diff --git a/gcc44-pr39763.patch b/gcc44-pr39763.patch deleted file mode 100644 index 44f3bb4..0000000 --- a/gcc44-pr39763.patch +++ /dev/null @@ -1,68 +0,0 @@ -2009-04-14 Jason Merrill - - PR c++/39763 - * name-lookup.c (pushdecl_maybe_friend): Avoid all warnings - about shadowing by tentative parms. - - * g++.dg/warn/Wshadow-4.C: Extend. - ---- gcc/cp/name-lookup.c (revision 146053) -+++ gcc/cp/name-lookup.c (revision 146054) -@@ -1002,13 +1002,18 @@ pushdecl_maybe_friend (tree x, bool is_f - && TREE_PUBLIC (x)) - TREE_PUBLIC (name) = 1; - -+ /* Don't complain about the parms we push and then pop -+ while tentatively parsing a function declarator. */ -+ if (TREE_CODE (x) == PARM_DECL && DECL_CONTEXT (x) == NULL_TREE) -+ /* Ignore. */; -+ - /* Warn if shadowing an argument at the top level of the body. */ -- if (oldlocal != NULL_TREE && !DECL_EXTERNAL (x) -- /* Inline decls shadow nothing. */ -- && !DECL_FROM_INLINE (x) -- && TREE_CODE (oldlocal) == PARM_DECL -- /* Don't check the `this' parameter. */ -- && !DECL_ARTIFICIAL (oldlocal)) -+ else if (oldlocal != NULL_TREE && !DECL_EXTERNAL (x) -+ /* Inline decls shadow nothing. */ -+ && !DECL_FROM_INLINE (x) -+ && TREE_CODE (oldlocal) == PARM_DECL -+ /* Don't check the `this' parameter. */ -+ && !DECL_ARTIFICIAL (oldlocal)) - { - bool err = false; - -@@ -1032,10 +1037,7 @@ pushdecl_maybe_friend (tree x, bool is_f - } - } - -- if (warn_shadow && !err -- /* Don't complain about the parms we push and then pop -- while tentatively parsing a function declarator. */ -- && !(TREE_CODE (x) == PARM_DECL && DECL_CONTEXT (x) == NULL_TREE)) -+ if (warn_shadow && !err) - { - warning (OPT_Wshadow, "declaration of %q#D shadows a parameter", x); - warning (OPT_Wshadow, "%Jshadowed declaration is here", oldlocal); ---- gcc/testsuite/g++.dg/warn/Wshadow-4.C (revision 146053) -+++ gcc/testsuite/g++.dg/warn/Wshadow-4.C (revision 146054) -@@ -18,3 +18,15 @@ int foo(int infoo) // { dg-warning "sha - }; - return outfoo; - } -+ -+// PR c++/39763 -+int foo2(void) -+{ -+ int infoo = 0; // { dg-warning "shadowed declaration" } -+ int outfoo( INetURLObject( infoo ).GetMainURL()); // { dg-bogus "shadows" } -+ struct A -+ { -+ void f(int infoo) { } // { dg-warning "shadows a previous local" } -+ }; -+ return outfoo; -+} - 2009-04-13 Jason Merrill - - PR c++/39480 diff --git a/sources b/sources index b14756b..c79572f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -004cfd0a49b225032953517a827da968 gcc-4.4.0-20090414.tar.bz2 +1e900acdd986c1a3971169e89f70ce94 gcc-4.4.0-20090420.tar.bz2