This commit is contained in:
Jakub Jelinek 2014-02-20 21:22:24 +01:00
parent 39f49505ef
commit 39b12a1a1b
4 changed files with 1420 additions and 4 deletions

View File

@ -3,7 +3,7 @@
%global gcc_version 4.8.2 %global gcc_version 4.8.2
# Note, gcc_release must be integer, if you want to add suffixes to # Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line. # %{release}, append them after %{gcc_release} on Release: line.
%global gcc_release 14 %global gcc_release 15
%global _unpackaged_files_terminate_build 0 %global _unpackaged_files_terminate_build 0
%global _performance_build 1 %global _performance_build 1
%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64 %global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
@ -49,6 +49,11 @@
%endif %endif
%global build_cloog 1 %global build_cloog 1
%global build_libstdcxx_docs 1 %global build_libstdcxx_docs 1
%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 s390 s390x %{arm} aarch64
%global attr_ifunc 1
%else
%global attr_ifunc 0
%endif
# If you don't have already a usable gcc-java and libgcj for your arch, # If you don't have already a usable gcc-java and libgcj for your arch,
# do on some arch which has it rpmbuild -bc --with java_tar gcc.spec # do on some arch which has it rpmbuild -bc --with java_tar gcc.spec
# which creates libjava-classes-%{version}-%{release}.tar.bz2 # which creates libjava-classes-%{version}-%{release}.tar.bz2
@ -198,7 +203,10 @@ Patch13: gcc48-pr56564.patch
Patch14: gcc48-pr56493.patch Patch14: gcc48-pr56493.patch
Patch15: gcc48-color-auto.patch Patch15: gcc48-color-auto.patch
Patch16: gcc48-pr28865.patch Patch16: gcc48-pr28865.patch
Patch17: gcc48-pr60010.patch Patch17: gcc48-libgo-p224.patch
Patch18: gcc48-pr60137.patch
Patch19: gcc48-pr60010.patch
Patch20: gcc48-pr60046.patch
Patch1000: fastjar-0.97-segfault.patch Patch1000: fastjar-0.97-segfault.patch
Patch1001: fastjar-0.97-len1.patch Patch1001: fastjar-0.97-len1.patch
@ -759,7 +767,11 @@ package or when debugging this package.
%patch15 -p0 -b .color-auto~ %patch15 -p0 -b .color-auto~
%endif %endif
%patch16 -p0 -b .pr28865~ %patch16 -p0 -b .pr28865~
%patch17 -p0 -b .pr60010~ %patch17 -p0 -b .libgo-p224~
rm -f libgo/go/crypto/elliptic/p224{,_test}.go
%patch18 -p0 -b .pr60137~
%patch19 -p0 -b .pr60010~
%patch20 -p0 -b .pr60046~
%if 0%{?_enable_debug_packages} %if 0%{?_enable_debug_packages}
cat > split-debuginfo.sh <<\EOF cat > split-debuginfo.sh <<\EOF
@ -1042,6 +1054,11 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
%else %else
--without-isl --without-cloog \ --without-isl --without-cloog \
%endif %endif
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
%if %{attr_ifunc}
--enable-gnu-indirect-function \
%endif
%endif
%ifarch %{arm} %ifarch %{arm}
--disable-sjlj-exceptions \ --disable-sjlj-exceptions \
%endif %endif
@ -3027,8 +3044,16 @@ fi
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
%changelog %changelog
* Fri Jan 31 2014 Kyle McMartin <kyle@redhat.com> 4.8.2-14 * Thu Feb 20 2014 Jakub Jelinek <jakub@redhat.com> 4.8.2-15
- fix exception spec instantiation ICE (#1067398, PR c++/60046)
- fix pch on aarch64 (#1058991, PR pch/60010) - fix pch on aarch64 (#1058991, PR pch/60010)
- configure with --enable-gnu-indirect-function on architectures
and distros that support it and don't support it by default
yet (#1067245)
* Wed Feb 19 2014 Jakub Jelinek <jakub@redhat.com> 4.8.2-14
- remove libgo P.224 elliptic curve (#1066539)
- fix -mcpu=power8 ICE (#1064242, PR target/60137)
* Tue Jan 21 2014 Jakub Jelinek <jakub@redhat.com> 4.8.2-13 * Tue Jan 21 2014 Jakub Jelinek <jakub@redhat.com> 4.8.2-13
- when removing -Wall from CXXFLAGS, if -Werror=format-security - when removing -Wall from CXXFLAGS, if -Werror=format-security

1302
gcc48-libgo-p224.patch Normal file

File diff suppressed because it is too large Load Diff

43
gcc48-pr60046.patch Normal file
View File

@ -0,0 +1,43 @@
2014-02-19 Jason Merrill <jason@redhat.com>
PR c++/60046
* pt.c (maybe_instantiate_noexcept): Don't instantiate exception
spec from template context.
--- gcc/cp/pt.c (revision 207920)
+++ gcc/cp/pt.c (revision 207921)
@@ -18567,6 +18567,10 @@ maybe_instantiate_noexcept (tree fn)
{
tree fntype, spec, noex, clone;
+ /* Don't instantiate a noexcept-specification from template context. */
+ if (processing_template_decl)
+ return;
+
if (DECL_CLONED_FUNCTION_P (fn))
fn = DECL_CLONED_FUNCTION (fn);
fntype = TREE_TYPE (fn);
--- gcc/testsuite/g++.dg/cpp0x/noexcept22.C (revision 0)
+++ gcc/testsuite/g++.dg/cpp0x/noexcept22.C (revision 207921)
@@ -0,0 +1,21 @@
+// PR c++/60046
+// { dg-require-effective-target c++11 }
+
+constexpr bool foo () { return noexcept (true); }
+template <typename T>
+struct V
+{
+ void bar (V &) noexcept (foo ()) {}
+};
+template <typename T>
+struct W : public V <int>
+{
+ void bar (W &x) { V <int>::bar (x); }
+};
+
+int
+main ()
+{
+ W <int> a, b;
+ a.bar (b);
+}

46
gcc48-pr60137.patch Normal file
View File

@ -0,0 +1,46 @@
2014-02-11 Michael Meissner <meissner@linux.vnet.ibm.com>
PR target/60137
* config/rs6000/rs6000.md (128-bit GPR splitter): Add a splitter
for VSX/Altivec vectors that land in GPR registers.
* gcc.target/powerpc/pr60137.c: New file.
--- gcc/config/rs6000/rs6000.md (revision 207698)
+++ gcc/config/rs6000/rs6000.md (revision 207699)
@@ -9963,6 +9963,15 @@ (define_insn_and_split "reload_vsx_from_
[(set_attr "length" "12")
(set_attr "type" "three")])
+(define_split
+ [(set (match_operand:FMOVE128_GPR 0 "nonimmediate_operand" "")
+ (match_operand:FMOVE128_GPR 1 "input_operand" ""))]
+ "reload_completed
+ && (int_reg_operand (operands[0], <MODE>mode)
+ || int_reg_operand (operands[1], <MODE>mode))"
+ [(pc)]
+{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; })
+
;; Move SFmode to a VSX from a GPR register. Because scalar floating point
;; type is stored internally as double precision in the VSX registers, we have
;; to convert it from the vector format.
--- gcc/testsuite/gcc.target/powerpc/pr60137.c (revision 0)
+++ gcc/testsuite/gcc.target/powerpc/pr60137.c (revision 207699)
@@ -0,0 +1,17 @@
+/* { dg-do compile { target { powerpc*-*-* } } } */
+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
+/* { dg-require-effective-target powerpc_p8vector_ok } */
+/* { dg-options "-mcpu=power8 -O3 -mno-vsx" } */
+
+/* target/60137, compiler got a 'could not split insn error'. */
+
+extern int target_flags;
+extern char fixed_regs[53];
+extern char call_used_regs[53];
+
+void init_reg_sets_1(void)
+{
+ int i;
+ for (i = 0; i < 53; i++)
+ fixed_regs[i] = call_used_regs[i] = (call_used_regs[i] &((target_flags & 0x02000000) ? 2 : 1)) != 0;
+}