From 308f1508a65f10e4e43c70e6fb67124d417edfbb Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 15 Jan 2014 10:56:53 +0100 Subject: [PATCH] 4.8.2-11 --- .gitignore | 1 + gcc.spec | 146 +++++++++++++++++++++++++------------------- gcc48-pr56564.patch | 7 ++- gcc48-pr58956.patch | 99 ------------------------------ sources | 2 +- 5 files changed, 90 insertions(+), 165 deletions(-) delete mode 100644 gcc48-pr58956.patch diff --git a/.gitignore b/.gitignore index bbda15a..5086f1d 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ /gcc-4.8.2-20131111.tar.bz2 /gcc-4.8.2-20131209.tar.bz2 /gcc-4.8.2-20131212.tar.bz2 +/gcc-4.8.2-20140115.tar.bz2 diff --git a/gcc.spec b/gcc.spec index e5494f2..ca34dd0 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,12 +1,13 @@ -%global DATE 20131212 -%global SVNREV 205936 +%global DATE 20140115 +%global SVNREV 206627 %global gcc_version 4.8.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 7 +%global gcc_release 11 %global _unpackaged_files_terminate_build 0 -%global multilib_64_archs sparc64 ppc64 s390x x86_64 -%ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha +%global _performance_build 1 +%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64 +%ifarch %{ix86} x86_64 ia64 ppc ppc64 ppc64p7 alpha %global build_ada 1 %else %global build_ada 0 @@ -16,7 +17,7 @@ %else %global build_java 1 %endif -%ifarch %{ix86} x86_64 ppc ppc64 s390 s390x %{arm} +%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 s390 s390x %{arm} %global build_go 1 %else %global build_go 0 @@ -26,7 +27,7 @@ %else %global build_libquadmath 0 %endif -%ifarch %{ix86} x86_64 ppc ppc64 +%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 %global build_libasan 1 %else %global build_libasan 0 @@ -36,12 +37,12 @@ %else %global build_libtsan 0 %endif -%ifarch %{ix86} x86_64 ppc ppc64 s390 s390x %{arm} +%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 s390 s390x %{arm} %global build_libatomic 1 %else %global build_libatomic 0 %endif -%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 s390 s390x +%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64p7 s390 s390x %global build_libitm 1 %else %global build_libitm 0 @@ -60,7 +61,7 @@ %ifarch sparc64 %global multilib_32_arch sparcv9 %endif -%ifarch ppc64 +%ifarch ppc64 ppc64p7 %global multilib_32_arch ppc %endif %ifarch x86_64 @@ -123,7 +124,7 @@ BuildRequires: gcc-java, libgcj BuildRequires: glibc-devel >= 2.4.90-13 BuildRequires: elfutils-devel >= 0.147 BuildRequires: elfutils-libelf-devel >= 0.147 -%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha +%ifarch ppc ppc64 ppc64p7 s390 s390x sparc sparcv9 alpha # Make sure glibc supports TFmode long double BuildRequires: glibc >= 2.3.90-35 %endif @@ -160,7 +161,7 @@ Requires: binutils >= 2.20.51.0.2-12 # Make sure gdb will understand DW_FORM_strp Conflicts: gdb < 5.1-2 Requires: glibc-devel >= 2.2.90-12 -%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha +%ifarch ppc ppc64 ppc64p7 s390 s390x sparc sparcv9 alpha # Make sure glibc supports TFmode long double Requires: glibc >= 2.3.90-35 %endif @@ -196,7 +197,6 @@ Patch12: gcc48-no-add-needed.patch Patch13: gcc48-pr56564.patch Patch14: gcc48-pr56493.patch Patch15: gcc48-color-auto.patch -Patch16: gcc48-pr58956.patch Patch1000: fastjar-0.97-segfault.patch Patch1001: fastjar-0.97-len1.patch @@ -215,10 +215,10 @@ Patch1100: isl-%{isl_version}-aarch64-config.patch %ifarch sparcv9 %global gcc_target_platform sparc64-%{_vendor}-%{_target_os} %endif -%ifarch ppc +%ifarch ppc ppc64p7 %global gcc_target_platform ppc64-%{_vendor}-%{_target_os} %endif -%ifnarch sparcv9 ppc +%ifnarch sparcv9 ppc ppc64p7 %global gcc_target_platform %{_target_platform} %endif @@ -756,7 +756,6 @@ package or when debugging this package. %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 %patch15 -p0 -b .color-auto~ %endif -%patch16 -p0 -b .pr58956~ %if 0%{?_enable_debug_packages} cat > split-debuginfo.sh <<\EOF @@ -986,7 +985,7 @@ EOF chmod +x gcc64 CC=`pwd`/gcc64 %endif -%ifarch ppc64 +%ifarch ppc64 ppc64p7 if gcc -m64 -xc -S /dev/null -o - > /dev/null 2>&1; then cat > gcc64 <<"EOF" #!/bin/sh @@ -1041,10 +1040,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \ %ifarch %{arm} --disable-sjlj-exceptions \ %endif -%ifarch ppc ppc64 +%ifarch ppc ppc64 ppc64p7 --enable-secureplt \ %endif -%ifarch sparc sparcv9 sparc64 ppc ppc64 s390 s390x alpha +%ifarch sparc sparcv9 sparc64 ppc ppc64 ppc64p7 s390 s390x alpha --with-long-double-128 \ %endif %ifarch sparc @@ -1056,7 +1055,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \ %ifarch sparc sparcv9 --host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7 %endif -%ifarch ppc ppc64 +%ifarch ppc ppc64 ppc64p7 %if 0%{?rhel} >= 7 --with-cpu-32=power7 --with-tune-32=power7 --with-cpu-64=power7 --with-tune-64=power7 \ %endif @@ -1087,7 +1086,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \ %endif %ifarch s390 s390x %if 0%{?rhel} >= 7 - --with-arch=z10 --with-tune=zEC12 --enable-decimal-float \ + --with-arch=z196 --with-tune=zEC12 --enable-decimal-float \ %else --with-arch=z9-109 --with-tune=z10 --enable-decimal-float \ %endif @@ -1290,7 +1289,7 @@ find ../rpm.doc/libstdc++-v3 -name \*~ | xargs rm ln -f %{buildroot}%{_prefix}/bin/%{gcc_target_platform}-gcc \ %{buildroot}%{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc %endif -%ifarch ppc ppc64 +%ifarch ppc ppc64 ppc64p7 ln -f %{buildroot}%{_prefix}/bin/%{gcc_target_platform}-gcc \ %{buildroot}%{_prefix}/bin/ppc-%{_vendor}-%{_target_os}-gcc %endif @@ -1298,7 +1297,7 @@ ln -f %{buildroot}%{_prefix}/bin/%{gcc_target_platform}-gcc \ %ifarch sparcv9 ppc FULLLPATH=$FULLPATH/lib32 %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 FULLLPATH=$FULLPATH/lib64 %endif if [ -n "$FULLLPATH" ]; then @@ -1345,7 +1344,7 @@ echo '/* GNU ld script OUTPUT_FORMAT(elf32-powerpc) GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so %endif -%ifarch ppc64 +%ifarch ppc64 ppc64p7 rm -f $FULLPATH/32/libgcc_s.so echo '/* GNU ld script Use the shared library, but some functions are only in @@ -1659,7 +1658,7 @@ ln -sf ../`echo ../../../../lib64/libgij.so.14.* | sed s~/../lib64/~/~` 32/libgi mv -f %{buildroot}%{_prefix}/lib/libobjc.*a 32/ mv -f %{buildroot}%{_prefix}/lib/libgomp.*a 32/ %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 ln -sf ../lib32/libgfortran.a 32/libgfortran.a ln -sf lib64/libgfortran.a libgfortran.a ln -sf ../lib32/libstdc++.a 32/libstdc++.a @@ -1833,7 +1832,7 @@ rm -f %{buildroot}%{_prefix}/lib/lib*.a rm -f %{buildroot}/lib/libgcc_s*.so* %if %{build_go} rm -rf %{buildroot}%{_prefix}/lib/go/%{gcc_version}/%{gcc_target_platform} -%ifnarch sparc64 ppc64 +%ifnarch sparc64 ppc64 ppc64p7 ln -sf %{multilib_32_arch}-%{_vendor}-%{_target_os} %{buildroot}%{_prefix}/lib/go/%{gcc_version}/%{gcc_target_platform} %endif %endif @@ -2100,7 +2099,7 @@ fi %ifarch sparc64 sparcv9 %{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc %endif -%ifarch ppc64 +%ifarch ppc64 ppc64p7 %{_prefix}/bin/ppc-%{_vendor}-%{_target_os}-gcc %endif %{_prefix}/bin/%{gcc_target_platform}-gcc @@ -2175,7 +2174,7 @@ fi %ifarch ia64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/ia64intrin.h %endif -%ifarch ppc ppc64 +%ifarch ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/ppc-asm.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/altivec.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/spe.h @@ -2280,7 +2279,7 @@ fi %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libasan_preinit.o %endif %endif -%ifarch sparcv9 sparc64 ppc ppc64 +%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so @@ -2367,7 +2366,7 @@ fi %ifarch sparcv9 ppc %{multilib_64_archs} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.so %endif -%ifarch sparcv9 sparc64 ppc ppc64 +%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libsupc++.a %endif @@ -2410,12 +2409,12 @@ fi %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libstdc++.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libsupc++.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libstdc++.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libsupc++.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libsupc++.a %endif @@ -2485,7 +2484,7 @@ fi %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.spec %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortranbegin.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libcaf_single.a -%ifarch sparcv9 sparc64 ppc ppc64 +%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.a %endif %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.so @@ -2518,11 +2517,11 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libgfortran.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgfortran.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.a %endif @@ -2549,7 +2548,7 @@ fi %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/jvgenmain %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj-tools.so -%ifarch sparcv9 sparc64 ppc ppc64 +%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so %endif %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgij.so @@ -2639,11 +2638,11 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libgcj_bc.so %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgcj_bc.so %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so %endif %dir %{_prefix}/include/c++ @@ -2684,7 +2683,7 @@ fi %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/adainclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/adalib %endif -%ifarch sparcv9 sparc64 ppc ppc64 +%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adainclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib %endif @@ -2708,14 +2707,14 @@ fi %exclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/adalib/libgnat.a %exclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/adalib/libgnarl.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adainclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib %exclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib/libgnat.a %exclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib/libgnarl.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adainclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib %exclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib/libgnat.a @@ -2733,13 +2732,13 @@ fi %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/adalib/libgnat.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/adalib/libgnarl.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib/libgnat.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib/libgnarl.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib/libgnat.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib/libgnarl.a @@ -2764,7 +2763,7 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version} %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mf-runtime.h -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so %endif @@ -2780,12 +2779,12 @@ fi %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflap.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libmudflapth.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflap.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflapth.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a %endif @@ -2805,7 +2804,7 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/quadmath.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/quadmath_weak.h -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libquadmath.so %endif %doc rpm.doc/libquadmath/ChangeLog* @@ -2819,11 +2818,11 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libquadmath.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libquadmath.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libquadmath.a %endif %endif @@ -2842,7 +2841,7 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include #%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/itm.h #%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/itm_weak.h -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libitm.so %endif %doc rpm.doc/libitm/ChangeLog* @@ -2856,11 +2855,11 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libitm.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libitm.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libitm.a %endif %endif @@ -2879,11 +2878,11 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libatomic.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libatomic.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libatomic.a %endif %doc rpm.doc/changelogs/libatomic/ChangeLog* @@ -2903,11 +2902,11 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libasan.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libasan.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libasan.a %endif %doc rpm.doc/changelogs/libsanitizer/ChangeLog* libsanitizer/LICENSE.TXT @@ -2954,7 +2953,7 @@ fi %ifarch sparcv9 ppc %{multilib_64_archs} %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgo.so %endif -%ifarch sparcv9 sparc64 ppc ppc64 +%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgo.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgobegin.a %endif @@ -2974,7 +2973,7 @@ fi %dir %{_prefix}/%{_lib}/go/%{gcc_version} %{_prefix}/%{_lib}/go/%{gcc_version}/%{gcc_target_platform} %ifarch %{multilib_64_archs} -%ifnarch sparc64 ppc64 +%ifnarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/go %dir %{_prefix}/lib/go/%{gcc_version} %{_prefix}/lib/go/%{gcc_version}/%{gcc_target_platform} @@ -2984,11 +2983,11 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libgobegin.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgobegin.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgobegin.a %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgo.so %endif @@ -3002,11 +3001,11 @@ fi %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libgo.a %endif -%ifarch sparc64 ppc64 +%ifarch sparc64 ppc64 ppc64p7 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgo.a %endif -%ifnarch sparcv9 sparc64 ppc ppc64 +%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgo.a %endif %endif @@ -3023,6 +3022,29 @@ fi %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin %changelog +* Wed Jan 15 2014 Jakub Jelinek 4.8.2-11 +- update from the 4.8 branch + - fix s390x reload bug (#1052372, PR target/59803) + +* Tue Jan 14 2014 Jakub Jelinek 4.8.2-10 +- update from the 4.8 branch (#1052892) + - PR ada/55946, ada/59772, c++/56060, c++/58954, c++/59255, c++/59730, + fortran/57042, fortran/58998, fortran/59493, fortran/59612, + fortran/59654, ipa/59610, middle-end/59584, pch/59436, + rtl-optimization/54300, rtl-optimization/58668, + rtl-optimization/59137, rtl-optimization/59647, + rtl-optimization/59724, target/57386, target/59587, target/59625, + target/59652, testsuite/58630, tree-optimization/54570, + tree-optimization/59125, tree-optimization/59362, + tree-optimization/59715, tree-optimization/59745 +- default to -march=z196 instead of -march=z10 on s390/s390x (#1052890) + +* Fri Jan 10 2014 Jakub Jelinek 4.8.2-9 +- define %%global _performance_build 1 (#1051064) + +* Tue Jan 7 2014 Jakub Jelinek 4.8.2-8 +- treat ppc64p7 as ppc64 (#1048859) + * Thu Dec 12 2013 Jakub Jelinek 4.8.2-7 - update from the 4.8 branch - PRs libgomp/59467, rtl-optimization/58295, target/56807, diff --git a/gcc48-pr56564.patch b/gcc48-pr56564.patch index a220599..d81e02d 100644 --- a/gcc48-pr56564.patch +++ b/gcc48-pr56564.patch @@ -378,14 +378,15 @@ extern unsigned int ix86_minimum_alignment (tree, enum machine_mode, --- gcc/config/i386/i386.c (revision 199897) +++ gcc/config/i386/i386.c (revision 199898) -@@ -25375,11 +25375,12 @@ ix86_constant_alignment (tree exp, int a +@@ -25292,12 +25292,13 @@ ix86_constant_alignment (tree exp, int a instead of that alignment to align the object. */ int -ix86_data_alignment (tree type, int align) +ix86_data_alignment (tree type, int align, bool opt) { - int max_align = optimize_size ? BITS_PER_WORD : MIN (256, MAX_OFILE_ALIGNMENT); + int max_align + = optimize_size ? BITS_PER_WORD : MIN (256, MAX_OFILE_ALIGNMENT); - if (AGGREGATE_TYPE_P (type) + if (opt @@ -393,7 +394,7 @@ && TYPE_SIZE (type) && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= (unsigned) max_align -@@ -25391,14 +25392,17 @@ ix86_data_alignment (tree type, int alig +@@ -25309,14 +25310,17 @@ ix86_data_alignment (tree type, int alig to 16byte boundary. */ if (TARGET_64BIT) { diff --git a/gcc48-pr58956.patch b/gcc48-pr58956.patch deleted file mode 100644 index 0a4e4ea..0000000 --- a/gcc48-pr58956.patch +++ /dev/null @@ -1,99 +0,0 @@ -2013-12-12 Jakub Jelinek - - PR middle-end/58956 - PR middle-end/59470 - * tree-ssa-ter.c (find_ssa_name): New helper function. - (find_replaceable_in_bb): For calls, only set same_root_var - if USE is used somewhere in gimple_call_lhs, for GIMPLE_ASM, - only set same_root_var if USE is used somewhere in output operand - trees. - - * gcc.target/i386/pr59470.c: New test. - ---- gcc/tree-ssa-ter.c.jj 2013-12-10 08:52:13.000000000 +0100 -+++ gcc/tree-ssa-ter.c 2013-12-12 10:43:26.177866960 +0100 -@@ -554,6 +554,20 @@ mark_replaceable (temp_expr_table_p tab, - } - - -+/* Helper function for find_replaceable_in_bb. Called via walk_tree to -+ find a SSA_NAME DATA somewhere in *TP. */ -+ -+static tree -+find_ssa_name (tree *tp, int *walk_subtrees, void *data) -+{ -+ tree var = (tree) data; -+ if (*tp == var) -+ return var; -+ else if (IS_TYPE_OR_DECL_P (*tp)) -+ *walk_subtrees = 0; -+ return NULL_TREE; -+} -+ - /* This function processes basic block BB, and looks for variables which can - be replaced by their expressions. Results are stored in the table TAB. */ - -@@ -618,7 +632,42 @@ find_replaceable_in_bb (temp_expr_table_ - && gimple_assign_single_p (def_stmt) - && stmt_may_clobber_ref_p (stmt, - gimple_assign_rhs1 (def_stmt))) -- same_root_var = true; -+ { -+ if (is_gimple_call (stmt)) -+ { -+ /* For calls, it is not a problem if USE is among -+ call's arguments or say OBJ_TYPE_REF argument, -+ all those necessarily need to be evaluated before -+ the call that may clobber the memory. But if -+ LHS of the call refers to USE, expansion might -+ evaluate it after the call, prevent TER in that -+ case. */ -+ if (gimple_call_lhs (stmt) -+ && TREE_CODE (gimple_call_lhs (stmt)) != SSA_NAME -+ && walk_tree (gimple_call_lhs_ptr (stmt), -+ find_ssa_name, use, NULL)) -+ same_root_var = true; -+ } -+ else if (gimple_code (stmt) == GIMPLE_ASM) -+ { -+ /* For inline asm, allow TER of loads into input -+ arguments, but disallow TER for USEs that occur -+ somewhere in outputs. */ -+ unsigned int i; -+ for (i = 0; i < gimple_asm_noutputs (stmt); i++) -+ if (TREE_CODE (gimple_asm_output_op (stmt, i)) -+ != SSA_NAME -+ && walk_tree (gimple_asm_output_op_ptr (stmt, -+ i), -+ find_ssa_name, use, NULL)) -+ { -+ same_root_var = true; -+ break; -+ } -+ } -+ else -+ same_root_var = true; -+ } - } - - /* Mark expression as replaceable unless stmt is volatile, or the ---- gcc/testsuite/gcc.target/i386/pr59470.c.jj 2013-12-12 10:31:54.746517544 +0100 -+++ gcc/testsuite/gcc.target/i386/pr59470.c 2013-12-12 10:32:42.045273313 +0100 -@@ -0,0 +1,17 @@ -+/* PR middle-end/58956 */ -+/* PR middle-end/59470 */ -+/* { dg-do run } */ -+/* { dg-options "-O2" } */ -+ -+int a, b, d[1024]; -+ -+int -+main () -+{ -+ int c = a; -+ asm ("{movl $6, (%2); movl $1, %0|mov dword ptr [%2], 6; mov %0, 1}" -+ : "=r" (d[c]) : "rm" (b), "r" (&a) : "memory"); -+ if (d[0] != 1 || d[6] != 0) -+ __builtin_abort (); -+ return 0; -+} diff --git a/sources b/sources index c5ab59c..171d8cc 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ be78a47bd82523250eb3e91646db5b3d cloog-0.18.0.tar.gz 2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz -06f880ae1aa11c375f44e419a7671573 gcc-4.8.2-20131212.tar.bz2 +ac6863dd2e049521aa5c3cb5e686c98c gcc-4.8.2-20140115.tar.bz2 bce1586384d8635a76d2f017fb067cd2 isl-0.11.1.tar.bz2