From 5d9509e3f64655e542d9c0c64ee0ae14a220f641 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 20 Sep 2012 18:55:09 +0200 Subject: [PATCH] 4.7.2-1 --- .gitignore | 1 + gcc.spec | 17 +++-- gcc47-pr54564.patch | 166 -------------------------------------------- sources | 2 +- 4 files changed, 12 insertions(+), 174 deletions(-) delete mode 100644 gcc47-pr54564.patch diff --git a/.gitignore b/.gitignore index e61dcb9..d9d821a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /gcc-4.7.1-20120810.tar.bz2 /gcc-4.7.1-20120813.tar.bz2 /gcc-4.7.1-20120913.tar.bz2 +/gcc-4.7.2-20120920.tar.bz2 diff --git a/gcc.spec b/gcc.spec index c6ec6a3..25681b7 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,9 +1,9 @@ -%global DATE 20120913 -%global SVNREV 191278 -%global gcc_version 4.7.1 +%global DATE 20120920 +%global SVNREV 191572 +%global gcc_version 4.7.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 8 +%global gcc_release 1 %global _unpackaged_files_terminate_build 0 %global multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha @@ -185,7 +185,6 @@ Patch14: gcc47-ppl-0.10.patch Patch15: gcc47-libitm-fno-exceptions.patch Patch16: gcc47-rh837630.patch Patch17: gcc47-arm-hfp-ldso.patch -Patch18: gcc47-pr54564.patch Patch1000: fastjar-0.97-segfault.patch Patch1001: fastjar-0.97-len1.patch @@ -691,7 +690,6 @@ package or when debugging this package. %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %patch17 -p0 -b .arm-hfp-ldso~ %endif -%patch18 -p0 -b .pr54564~ %if 0%{?_enable_debug_packages} cat > split-debuginfo.sh <<\EOF @@ -755,7 +753,7 @@ tar xzf %{SOURCE4} tar xjf %{SOURCE10} %endif -sed -i -e 's/4\.7\.2/4.7.1/' gcc/BASE-VER +sed -i -e 's/4\.7\.3/4.7.2/' gcc/BASE-VER echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE %if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 @@ -2665,6 +2663,11 @@ fi %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin %changelog +* Thu Sep 20 2012 Jakub Jelinek 4.7.2-1 +- update from the 4.7 branch + - GCC 4.7.2 release + - PRs c++/53661, lto/54312, tree-optimization/54563 + * Thu Sep 13 2012 Jakub Jelinek 4.7.1-8 - update from the 4.7 branch - PRs c++/53836, c++/53839, c++/54086, c++/54197, c++/54253, c++/54341, diff --git a/gcc47-pr54564.patch b/gcc47-pr54564.patch deleted file mode 100644 index 422c32c..0000000 --- a/gcc47-pr54564.patch +++ /dev/null @@ -1,166 +0,0 @@ -2012-09-13 Jakub Jelinek - - PR target/54564 - * config/i386/sse.md (fmai_vmfmadd_): Use (match_dup 1) - instead of (match_dup 0) as second argument to vec_merge. - (*fmai_fmadd_, *fmai_fmsub_): Likewise. - Remove third alternative. - (*fmai_fnmadd_, *fmai_fnmsub_): Likewise. Negate - operand 2 instead of operand 1, but put it as first argument - of fma. - - * config/i386/fmaintrin.h (_mm_fnmadd_sd, _mm_fnmadd_ss, - _mm_fnmsub_sd, _mm_fnmsub_ss): Negate the second argument instead - of the first. - ---- gcc/config/i386/sse.md.jj 2012-09-05 18:27:03.000000000 +0200 -+++ gcc/config/i386/sse.md 2012-09-13 13:49:49.504968716 +0200 -@@ -2072,79 +2072,75 @@ (define_expand "fmai_vmfmadd_" - (match_operand:VF_128 1 "nonimmediate_operand") - (match_operand:VF_128 2 "nonimmediate_operand") - (match_operand:VF_128 3 "nonimmediate_operand")) -- (match_dup 0) -+ (match_dup 1) - (const_int 1)))] - "TARGET_FMA") - - (define_insn "*fmai_fmadd_" -- [(set (match_operand:VF_128 0 "register_operand" "=x,x,x") -+ [(set (match_operand:VF_128 0 "register_operand" "=x,x") - (vec_merge:VF_128 - (fma:VF_128 -- (match_operand:VF_128 1 "nonimmediate_operand" "%0, 0,x") -- (match_operand:VF_128 2 "nonimmediate_operand" "xm, x,xm") -- (match_operand:VF_128 3 "nonimmediate_operand" " x,xm,0")) -- (match_dup 0) -+ (match_operand:VF_128 1 "nonimmediate_operand" " 0, 0") -+ (match_operand:VF_128 2 "nonimmediate_operand" "xm, x") -+ (match_operand:VF_128 3 "nonimmediate_operand" " x,xm")) -+ (match_dup 1) - (const_int 1)))] - "TARGET_FMA" - "@ - vfmadd132\t{%2, %3, %0|%0, %3, %2} -- vfmadd213\t{%3, %2, %0|%0, %2, %3} -- vfmadd231\t{%2, %1, %0|%0, %1, %2}" -+ vfmadd213\t{%3, %2, %0|%0, %2, %3}" - [(set_attr "type" "ssemuladd") - (set_attr "mode" "")]) - - (define_insn "*fmai_fmsub_" -- [(set (match_operand:VF_128 0 "register_operand" "=x,x,x") -+ [(set (match_operand:VF_128 0 "register_operand" "=x,x") - (vec_merge:VF_128 - (fma:VF_128 -- (match_operand:VF_128 1 "nonimmediate_operand" "%0, 0,x") -- (match_operand:VF_128 2 "nonimmediate_operand" "xm, x,xm") -+ (match_operand:VF_128 1 "nonimmediate_operand" " 0, 0") -+ (match_operand:VF_128 2 "nonimmediate_operand" "xm, x") - (neg:VF_128 -- (match_operand:VF_128 3 "nonimmediate_operand" " x,xm,0"))) -- (match_dup 0) -+ (match_operand:VF_128 3 "nonimmediate_operand" " x,xm"))) -+ (match_dup 1) - (const_int 1)))] - "TARGET_FMA" - "@ - vfmsub132\t{%2, %3, %0|%0, %3, %2} -- vfmsub213\t{%3, %2, %0|%0, %2, %3} -- vfmsub231\t{%2, %1, %0|%0, %1, %2}" -+ vfmsub213\t{%3, %2, %0|%0, %2, %3}" - [(set_attr "type" "ssemuladd") - (set_attr "mode" "")]) - - (define_insn "*fmai_fnmadd_" -- [(set (match_operand:VF_128 0 "register_operand" "=x,x,x") -+ [(set (match_operand:VF_128 0 "register_operand" "=x,x") - (vec_merge:VF_128 - (fma:VF_128 - (neg:VF_128 -- (match_operand:VF_128 1 "nonimmediate_operand" "%0, 0,x")) -- (match_operand:VF_128 2 "nonimmediate_operand" "xm, x,xm") -- (match_operand:VF_128 3 "nonimmediate_operand" " x,xm,0")) -- (match_dup 0) -+ (match_operand:VF_128 2 "nonimmediate_operand" "xm, x")) -+ (match_operand:VF_128 1 "nonimmediate_operand" " 0, 0") -+ (match_operand:VF_128 3 "nonimmediate_operand" " x,xm")) -+ (match_dup 1) - (const_int 1)))] - "TARGET_FMA" - "@ - vfnmadd132\t{%2, %3, %0|%0, %3, %2} -- vfnmadd213\t{%3, %2, %0|%0, %2, %3} -- vfnmadd231\t{%2, %1, %0|%0, %1, %2}" -+ vfnmadd213\t{%3, %2, %0|%0, %2, %3}" - [(set_attr "type" "ssemuladd") - (set_attr "mode" "")]) - - (define_insn "*fmai_fnmsub_" -- [(set (match_operand:VF_128 0 "register_operand" "=x,x,x") -+ [(set (match_operand:VF_128 0 "register_operand" "=x,x") - (vec_merge:VF_128 - (fma:VF_128 - (neg:VF_128 -- (match_operand:VF_128 1 "nonimmediate_operand" "%0, 0,x")) -- (match_operand:VF_128 2 "nonimmediate_operand" "xm, x,xm") -+ (match_operand:VF_128 2 "nonimmediate_operand" "xm, x")) -+ (match_operand:VF_128 1 "nonimmediate_operand" " 0, 0") - (neg:VF_128 -- (match_operand:VF_128 3 "nonimmediate_operand" " x,xm,0"))) -- (match_dup 0) -+ (match_operand:VF_128 3 "nonimmediate_operand" " x,xm"))) -+ (match_dup 1) - (const_int 1)))] - "TARGET_FMA" - "@ - vfnmsub132\t{%2, %3, %0|%0, %3, %2} -- vfnmsub213\t{%3, %2, %0|%0, %2, %3} -- vfnmsub231\t{%2, %1, %0|%0, %1, %2}" -+ vfnmsub213\t{%3, %2, %0|%0, %2, %3}" - [(set_attr "type" "ssemuladd") - (set_attr "mode" "")]) - ---- gcc/config/i386/fmaintrin.h.jj 2011-09-02 16:29:38.000000000 +0200 -+++ gcc/config/i386/fmaintrin.h 2012-09-13 13:32:20.162333244 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2011 Free Software Foundation, Inc. -+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -164,7 +164,7 @@ extern __inline __m128d - __attribute__((__gnu_inline__, __always_inline__, __artificial__)) - _mm_fnmadd_sd (__m128d __A, __m128d __B, __m128d __C) - { -- return (__m128d)__builtin_ia32_vfmaddsd3 (-(__v2df)__A, (__v2df)__B, -+ return (__m128d)__builtin_ia32_vfmaddsd3 ((__v2df)__A, -(__v2df)__B, - (__v2df)__C); - } - -@@ -172,7 +172,7 @@ extern __inline __m128 - __attribute__((__gnu_inline__, __always_inline__, __artificial__)) - _mm_fnmadd_ss (__m128 __A, __m128 __B, __m128 __C) - { -- return (__m128)__builtin_ia32_vfmaddss3 (-(__v4sf)__A, (__v4sf)__B, -+ return (__m128)__builtin_ia32_vfmaddss3 ((__v4sf)__A, -(__v4sf)__B, - (__v4sf)__C); - } - -@@ -212,7 +212,7 @@ extern __inline __m128d - __attribute__((__gnu_inline__, __always_inline__, __artificial__)) - _mm_fnmsub_sd (__m128d __A, __m128d __B, __m128d __C) - { -- return (__m128d)__builtin_ia32_vfmaddsd3 (-(__v2df)__A, (__v2df)__B, -+ return (__m128d)__builtin_ia32_vfmaddsd3 ((__v2df)__A, -(__v2df)__B, - -(__v2df)__C); - } - -@@ -220,7 +220,7 @@ extern __inline __m128 - __attribute__((__gnu_inline__, __always_inline__, __artificial__)) - _mm_fnmsub_ss (__m128 __A, __m128 __B, __m128 __C) - { -- return (__m128)__builtin_ia32_vfmaddss3 (-(__v4sf)__A, (__v4sf)__B, -+ return (__m128)__builtin_ia32_vfmaddss3 ((__v4sf)__A, -(__v4sf)__B, - -(__v4sf)__C); - } - diff --git a/sources b/sources index e7c3681..af8b2fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -10dae15ffd394a99eef1c3f164ab05d8 gcc-4.7.1-20120913.tar.bz2 +24e41bf33cf28647ad8f1cdf3df6301c gcc-4.7.2-20120920.tar.bz2