This commit is contained in:
Jakub Jelinek 2015-07-07 10:29:46 +02:00
parent 274d6185bd
commit c148037b80
4 changed files with 21 additions and 87 deletions

1
.gitignore vendored
View File

@ -20,3 +20,4 @@
/gcc-5.1.1-20150606.tar.bz2 /gcc-5.1.1-20150606.tar.bz2
/gcc-5.1.1-20150612.tar.bz2 /gcc-5.1.1-20150612.tar.bz2
/gcc-5.1.1-20150618.tar.bz2 /gcc-5.1.1-20150618.tar.bz2
/gcc-5.1.1-20150707.tar.bz2

View File

@ -1,9 +1,9 @@
%global DATE 20150618 %global DATE 20150707
%global SVNREV 224595 %global SVNREV 225505
%global gcc_version 5.1.1 %global gcc_version 5.1.1
# 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 4 %global gcc_release 5
%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
@ -205,7 +205,6 @@ Patch12: gcc5-libgo-p224.patch
Patch13: gcc5-aarch64-async-unw-tables.patch Patch13: gcc5-aarch64-async-unw-tables.patch
Patch14: gcc5-libsanitize-aarch64-va42.patch Patch14: gcc5-libsanitize-aarch64-va42.patch
Patch15: gcc5-pr65689.patch Patch15: gcc5-pr65689.patch
Patch16: gcc5-pr65956.patch
# On ARM EABI systems, we do want -gnueabi to be part of the # On ARM EABI systems, we do want -gnueabi to be part of the
# target triple. # target triple.
@ -773,12 +772,6 @@ rm -f libgo/go/crypto/elliptic/p224{,_test}.go
%patch13 -p0 -b .aarch64-async-unw-tables~ %patch13 -p0 -b .aarch64-async-unw-tables~
%patch14 -p0 -b .libsanitize-aarch64-va42~ %patch14 -p0 -b .libsanitize-aarch64-va42~
%patch15 -p0 -b .pr65689~ %patch15 -p0 -b .pr65689~
%patch16 -p0 -b .pr65956~
%ifarch %{arm}
# Workaround PR65956, undo the overalignment optimization
# on ARM because it has broken backend.
sed -i -e 's/align != TYPE_ALIGN/align < TYPE_ALIGN/' gcc/tree-sra.c
%endif
sed -i -e 's/ -Wl,-z,nodlopen//g' gcc/ada/gcc-interface/Makefile.in sed -i -e 's/ -Wl,-z,nodlopen//g' gcc/ada/gcc-interface/Makefile.in
%if 0%{?_enable_debug_packages} %if 0%{?_enable_debug_packages}
@ -962,7 +955,7 @@ CONFIGURE_OPTS="\
--enable-plugin --enable-initfini-array \ --enable-plugin --enable-initfini-array \
--disable-libgcj \ --disable-libgcj \
%if 0%{fedora} >= 21 && 0%{fedora} <= 22 %if 0%{fedora} >= 21 && 0%{fedora} <= 22
--with-default-libstdcxx-abi=c++98 \ --with-default-libstdcxx-abi=gcc4-compatible \
%endif %endif
%if %{build_isl} %if %{build_isl}
--with-isl \ --with-isl \
@ -2195,6 +2188,7 @@ fi
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/clflushoptintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/clflushoptintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/clwbintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/clwbintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/pcommitintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/pcommitintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mwaitxintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xsavecintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xsavecintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xsavesintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xsavesintrin.h
%endif %endif
@ -2230,6 +2224,7 @@ fi
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/s390intrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/s390intrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/htmintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/htmintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/htmxlintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/htmxlintrin.h
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/vecintrin.h
%endif %endif
%if %{build_libcilkrts} %if %{build_libcilkrts}
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cilk %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cilk
@ -3078,6 +3073,19 @@ fi
%doc rpm.doc/changelogs/libcc1/ChangeLog* %doc rpm.doc/changelogs/libcc1/ChangeLog*
%changelog %changelog
* Tue Jul 7 2015 Jakub Jelinek <jakub@redhat.com> 5.1.1-5
- update from the 5 branch
- PRs bootstrap/63740, c++/65750, c++/65843, c++/65879, c++/65880,
c++/65882, c++/65919, c++/65945, c++/65973, c++/66001, c++/66067,
c++/66216, c++/66501, c++/66515, c++/66585, c++/66647, c++/66743,
debug/66301, fortran/66549, jit/66539, jit/66546, jit/66628,
jit/66700, libstdc++/65393, libstdc++/66055, middle-end/66413,
middle-end/66633, middle-end/66702, target/37072, target/52482,
target/63408, target/64833, target/65711, target/65914, target/66114,
target/66136, target/66200, target/66412, target/66509, target/66563,
target/66611, testsuite/66667, tree-optimization/66119,
tree-optimization/66375, tree-optimization/66422
* Thu Jun 18 2015 Jakub Jelinek <jakub@redhat.com> 5.1.1-4 * Thu Jun 18 2015 Jakub Jelinek <jakub@redhat.com> 5.1.1-4
- update from the 5 branch - update from the 5 branch
- fix C++ ICE in build_ctor_subob_ref (#1232679, #1233030, #1233068, - fix C++ ICE in build_ctor_subob_ref (#1232679, #1233030, #1233068,

View File

@ -1,75 +0,0 @@
2015-05-05 Jakub Jelinek <jakub@redhat.com>
PR target/65956
* gcc.c-torture/execute/pr65956.c: New test.
--- gcc/testsuite/gcc.c-torture/execute/pr65956.c.jj 2015-05-01 10:32:34.730150257 +0200
+++ gcc/testsuite/gcc.c-torture/execute/pr65956.c 2015-05-01 10:32:13.000000000 +0200
@@ -0,0 +1,67 @@
+/* PR target/65956 */
+
+struct A { char *a; int b; long long c; };
+char v[3];
+
+__attribute__((noinline, noclone)) void
+fn1 (char *x, char *y)
+{
+ if (x != &v[1] || y != &v[2])
+ __builtin_abort ();
+ v[1]++;
+}
+
+__attribute__((noinline, noclone)) int
+fn2 (char *x)
+{
+ asm volatile ("" : "+g" (x) : : "memory");
+ return x == &v[0];
+}
+
+__attribute__((noinline, noclone)) void
+fn3 (const char *x)
+{
+ if (x[0] != 0)
+ __builtin_abort ();
+}
+
+static struct A
+foo (const char *x, struct A y, struct A z)
+{
+ struct A r = { 0, 0, 0 };
+ if (y.b && z.b)
+ {
+ if (fn2 (y.a) && fn2 (z.a))
+ switch (x[0])
+ {
+ case '|':
+ break;
+ default:
+ fn3 (x);
+ }
+ fn1 (y.a, z.a);
+ }
+ return r;
+}
+
+__attribute__((noinline, noclone)) int
+bar (int x, struct A *y)
+{
+ switch (x)
+ {
+ case 219:
+ foo ("+", y[-2], y[0]);
+ case 220:
+ foo ("-", y[-2], y[0]);
+ }
+}
+
+int
+main ()
+{
+ struct A a[3] = { { &v[1], 1, 1LL }, { &v[0], 0, 0LL }, { &v[2], 2, 2LL } };
+ bar (220, a + 2);
+ if (v[1] != 1)
+ __builtin_abort ();
+ return 0;
+}

View File

@ -1 +1 @@
a46ccda769a0a2abb03ae73e1ca4a5ee gcc-5.1.1-20150618.tar.bz2 98afead01852b05821be25e1d826b9da gcc-5.1.1-20150707.tar.bz2