From cb86c036cc15a63277839e754eb434261963a8a3 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 12 Jan 2012 18:58:05 +0100 Subject: [PATCH] 4.7.0-0.6 --- .gitignore | 1 + gcc.spec | 29 +++++++++++++++++++---------- gcc47-pr47333.patch | 24 ------------------------ gcc47-pr50127.patch | 27 --------------------------- sources | 2 +- 5 files changed, 21 insertions(+), 62 deletions(-) delete mode 100644 gcc47-pr47333.patch delete mode 100644 gcc47-pr50127.patch diff --git a/.gitignore b/.gitignore index 59f4a7d..7e552f7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /gcc-4.7.0-20120104.tar.bz2 /gcc-4.7.0-20120105.tar.bz2 /gcc-4.7.0-20120106.tar.bz2 +/gcc-4.7.0-20120112.tar.bz2 diff --git a/gcc.spec b/gcc.spec index c94f095..fd28128 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,9 +1,9 @@ -%global DATE 20120106 -%global SVNREV 182962 +%global DATE 20120112 +%global SVNREV 183134 %global gcc_version 4.7.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.5 +%global gcc_release 0.6 %global _unpackaged_files_terminate_build 0 %global multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha @@ -50,7 +50,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 @@ -174,8 +174,6 @@ Patch12: gcc47-libstdc++-docs.patch Patch13: gcc47-no-add-needed.patch Patch14: gcc47-ppl-0.10.patch Patch15: gcc47-libitm-fno-exceptions.patch -Patch16: gcc47-pr47333.patch -Patch17: gcc47-pr50127.patch Patch1000: fastjar-0.97-segfault.patch Patch1001: fastjar-0.97-len1.patch @@ -675,8 +673,6 @@ package or when debugging this package. %patch14 -p0 -b .ppl-0.10~ %endif %patch15 -p0 -b .libitm-fno-exceptions~ -%patch16 -p0 -b .pr47333~ -%patch17 -p0 -b .pr50127~ %if 0%{?_enable_debug_packages} cat > split-debuginfo.sh <<\EOF @@ -2629,8 +2625,21 @@ fi %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin %changelog -* Sat Jan 7 2012 Dan Horák 4.7.0-0.5.1 -- fix build without libitm +* Thu Jan 12 2012 Jakub Jelinek 4.7.0-0.6 +- update from trunk + - PRs ada/41929, bootstrap/51705, bootstrap/51796, c++/47450, + c++/48051, c++/50855, c++/51322, c++/51433, c++/51565, + c++/51613, c++/51614, c++/51818, c++/6057, debug/51471, + fortran/51057, fortran/51578, fortran/51616, fortran/51652, + fortran/51758, fortran/51791, fortran/51792, gcov-profile/50127, + gcov-profile/51715, gcov-profile/51717, libstdc++/51673, + middle-end/51516, middle-end/51806, preprocessor/33919, + preprocessor/51776, rtl-optimization/51271, target/47333, + rarget/49868, testsuite/51655, tree-optimization/49642, + tree-optimization/50913, tree-optimization/51600, + tree-optimization/51680, tree-optimization/51694, + tree-optimization/51759, tree-optimization/51775, + tree-optimization/51799, tree-optimization/51801 * Fri Jan 6 2012 Jakub Jelinek 4.7.0-0.5 - update from trunk diff --git a/gcc47-pr47333.patch b/gcc47-pr47333.patch deleted file mode 100644 index be09a11..0000000 --- a/gcc47-pr47333.patch +++ /dev/null @@ -1,24 +0,0 @@ -2012-01-06 Jakub Jelinek - - PR target/47333 - * cgraphunit.c (cgraph_optimize): Call output_weakrefs - before emitting functions. - ---- gcc/cgraphunit.c.jj 2011-12-15 08:06:54.000000000 +0100 -+++ gcc/cgraphunit.c 2012-01-06 14:50:50.291364878 +0100 -@@ -2187,6 +2187,7 @@ cgraph_optimize (void) - #endif - bitmap_obstack_release (NULL); - cgraph_mark_functions_to_output (); -+ output_weakrefs (); - - cgraph_state = CGRAPH_STATE_EXPANSION; - if (!flag_toplevel_reorder) -@@ -2201,7 +2202,6 @@ cgraph_optimize (void) - varpool_assemble_pending_decls (); - } - -- output_weakrefs (); - cgraph_process_new_functions (); - cgraph_state = CGRAPH_STATE_FINISHED; - diff --git a/gcc47-pr50127.patch b/gcc47-pr50127.patch deleted file mode 100644 index 0062f77..0000000 --- a/gcc47-pr50127.patch +++ /dev/null @@ -1,27 +0,0 @@ -2012-01-06 Jakub Jelinek - - PR gcov-profile/50127 - * bb-reorder.c (partition_hot_cold_basic_blocks): Clear - bb->aux before running df_analyze. - ---- gcc/bb-reorder.c.jj 2011-11-10 18:09:12.000000000 +0100 -+++ gcc/bb-reorder.c 2012-01-06 13:47:39.619401395 +0100 -@@ -2219,6 +2219,7 @@ static unsigned - partition_hot_cold_basic_blocks (void) - { - VEC(edge, heap) *crossing_edges; -+ basic_block bb; - - if (n_basic_blocks <= NUM_FIXED_BLOCKS + 1) - return 0; -@@ -2254,6 +2255,10 @@ partition_hot_cold_basic_blocks (void) - - add_reg_crossing_jump_notes (); - -+ /* Clear bb->aux fields that the above routines were using. */ -+ FOR_EACH_BB (bb) -+ bb->aux = NULL; -+ - VEC_free (edge, heap, crossing_edges); - - /* ??? FIXME: DF generates the bb info for a block immediately. diff --git a/sources b/sources index 07ec5fd..6bd74cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -880d74d47fad9799b9e3f98c61c5213f gcc-4.7.0-20120106.tar.bz2 +455a63796c213d036cbdf0e90586b295 gcc-4.7.0-20120112.tar.bz2