From 753dd73e327d7317c1509984bb74a0c56a98dc48 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 12 Feb 2011 22:14:49 +0100 Subject: [PATCH] 4.6.0-0.7 --- .gitignore | 1 + gcc.spec | 38 ++++++++++++++++++++++++++++++-------- gcc46-pr47610.patch | 23 ----------------------- gcc46-pr47620.patch | 23 +++++++++++++++++++++++ sources | 2 +- 5 files changed, 55 insertions(+), 32 deletions(-) delete mode 100644 gcc46-pr47610.patch create mode 100644 gcc46-pr47620.patch diff --git a/.gitignore b/.gitignore index 95935dd..ea6a04f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /fastjar-0.97.tar.gz /gcc-4.6.0-20110128.tar.bz2 /gcc-4.6.0-20110205.tar.bz2 +/gcc-4.6.0-20110212.tar.bz2 diff --git a/gcc.spec b/gcc.spec index 5550c7e..d9d0cd9 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,9 +1,9 @@ -%global DATE 20110205 -%global SVNREV 169849 +%global DATE 20110212 +%global SVNREV 170087 %global gcc_version 4.6.0 # 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 0.6 +%global gcc_release 0.7 %global _unpackaged_files_terminate_build 0 %global multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha @@ -45,7 +45,7 @@ Summary: Various compilers (C, C++, Objective-C, Java, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}%{?dist}.1 +Release: %{gcc_release}%{?dist} # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -167,7 +167,7 @@ Patch18: gcc46-unwind-debughook-sdt.patch Patch19: gcc46-ppl-0.10.patch Patch20: gcc46-Woverlength-string.patch Patch21: gcc46-Woverlength-string-asm.patch -Patch22: gcc46-pr47610.patch +Patch22: gcc46-pr47620.patch Patch1000: fastjar-0.97-segfault.patch Patch1001: fastjar-0.97-len1.patch @@ -601,7 +601,7 @@ not stable, so plugins must be rebuilt any time GCC is updated. %patch19 -p0 -b .ppl-0.10~ %patch20 -p0 -b .Woverlength-string~ %patch21 -p0 -b .Woverlength-string-asm~ -%patch22 -p0 -b .pr47610~ +%patch22 -p0 -b .pr47620~ # This testcase doesn't compile. rm libjava/testsuite/libjava.lang/PR35020* @@ -2337,8 +2337,30 @@ fi %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/plugin %changelog -* Tue Feb 08 2011 Fedora Release Engineering - 4.6.0-0.6.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Sat Feb 12 2011 Jakub Jelinek 4.6.0-0.7 +- update from trunk + - PRs binutils/12283, c++/47511, debug/42631, debug/47684, driver/47678, + fortran/42434, fortran/45290, fortran/45586, fortran/47352, + fortran/47463, fortran/47550, fortran/47574, fortran/47583, + fortran/47592, fortran/47637, libffi/46661, libfortran/47571, + libgfortran/47567, libstdc++/43863, libstdc++/47433, + libstdc++/47628, libstdc++/47668, lto/47225, lto/47241, + middle-end/45505, middle-end/47610, middle-end/47639, + middle-end/47646, target/42333, target/44606, target/45701, + target/46481, target/46610, target/46997, target/47032, + target/47324, target/47534, target/47548, target/47558, + target/47629, target/47636, target/47665, target/47683, + testsuite/47400, testsuite/47622, tree-optimization/42893, + tree-optimization/46834, tree-optimization/46994, + tree-optimization/46995, tree-optimization/47420, + tree-optimization/47615, tree-optimization/47621, + tree-optimization/47632, tree-optimization/47641, + tree-optimization/47664, tree-optimization/47707 + - fix postreload on auto inc/decrement instructions (#675787, + PR rtl-optimization/47614) + - fix a hang in VRP (#676473, PR tree-optimization/47677) + - fix STL headers with -fno-operator-names (#676910, PR libstdc++/47662) +- fix scheduling of debug insns (#675711, PR debug/47620) * Sat Feb 5 2011 Jakub Jelinek 4.6.0-0.6 - update from trunk diff --git a/gcc46-pr47610.patch b/gcc46-pr47610.patch deleted file mode 100644 index 777ce7b..0000000 --- a/gcc46-pr47610.patch +++ /dev/null @@ -1,23 +0,0 @@ -2011-02-05 Jakub Jelinek - - PR middle-end/47610 - * varasm.c (default_section_type_flags): If decl is NULL, - and name is .data.rel.ro or .data.rel.ro.local, set SECTION_RELRO - bit. - ---- gcc/varasm.c.jj 2011-02-03 20:09:38.000000000 +0100 -+++ gcc/varasm.c 2011-02-05 00:01:59.911796344 +0100 -@@ -6060,7 +6060,12 @@ default_section_type_flags (tree decl, c - flags = SECTION_WRITE; - } - else -- flags = SECTION_WRITE; -+ { -+ flags = SECTION_WRITE; -+ if (strcmp (name, ".data.rel.ro") == 0 -+ || strcmp (name, ".data.rel.ro.local") == 0) -+ flags |= SECTION_RELRO; -+ } - - if (decl && DECL_ONE_ONLY (decl)) - flags |= SECTION_LINKONCE; diff --git a/gcc46-pr47620.patch b/gcc46-pr47620.patch new file mode 100644 index 0000000..25a1738 --- /dev/null +++ b/gcc46-pr47620.patch @@ -0,0 +1,23 @@ +2011-02-12 Alexandre Oliva + + PR debug/47620 + * haifa-sched.c (fix_tick_ready): Don't queue debug insns. + +--- gcc/haifa-sched.c.orig 2011-02-12 10:26:29.000000000 -0200 ++++ gcc/haifa-sched.c 2011-02-12 10:39:17.584244783 -0200 +@@ -3929,6 +3929,15 @@ fix_tick_ready (rtx next) + if (!full_p) + break; + } ++ ++ /* We can't queue debug insns, but we would try to during ++ init_ready_list when a debug insn is the very first. Arrange ++ for it to be added to the ready list instead. */ ++ if (!tick && clock_var == -1 && DEBUG_INSN_P (next)) ++ { ++ gcc_checking_assert (q_size == 0); ++ tick = -1; ++ } + } + else + tick = -1; diff --git a/sources b/sources index 224f569..0671d23 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -262b320051245fab671a5ec8429381cf gcc-4.6.0-20110205.tar.bz2 +377a8e1f26bb818ef4874452ed34b9b9 gcc-4.6.0-20110212.tar.bz2