From f684732e50acdf4f168c278a5f17c28cf9bc9a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:53:43 +0200 Subject: [PATCH 1/7] Rebuilt for Python 3.8.0rc1 (#1748018) --- gcc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 2c62427..9bf86a2 100644 --- a/gcc.spec +++ b/gcc.spec @@ -101,7 +101,7 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}%{?dist} +Release: %{gcc_release}%{?dist}.1 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -2955,6 +2955,9 @@ end %endif %changelog +* Thu Oct 03 2019 Miro Hrončok - 9.2.1-1.1 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Tue Aug 27 2019 Jakub Jelinek 9.2.1-1 - update from 9 branch - GCC 9.2 release From 4c8c128cd036d371de2dece9d54d11e71beb055d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 8 Oct 2019 15:17:12 -0600 Subject: [PATCH 2/7] Build against mpfr3 and libmpc-mpfr3 so an mpfr 4.x version can be built. --- gcc.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc.spec b/gcc.spec index 9bf86a2..272cf62 100644 --- a/gcc.spec +++ b/gcc.spec @@ -101,7 +101,7 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}%{?dist}.1 +Release: %{gcc_release}%{?dist}.2 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -150,7 +150,7 @@ BuildRequires: glibc-static BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, sharutils BuildRequires: texinfo, texinfo-tex, /usr/bin/pod2man BuildRequires: systemtap-sdt-devel >= 1.3 -BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1, libmpc-devel >= 0.8.1 +BuildRequires: gmp-devel >= 4.1.2-8, mpfr3-devel >= 2.2.1, libmpc-mpfr3-devel >= 0.8.1 BuildRequires: python2-devel, python3-devel, /usr/bin/python BuildRequires: gcc, gcc-c++ %if %{build_go} @@ -726,7 +726,7 @@ This package contains static Go libraries. %package plugin-devel Summary: Support for compiling GCC plugins Requires: gcc = %{version}-%{release} -Requires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1, libmpc-devel >= 0.8.1 +Requires: gmp-devel >= 4.1.2-8, mpfr3-devel >= 2.2.1, libmpc-mpfr3-devel >= 0.8.1 %description plugin-devel This package contains header files and other support files @@ -801,6 +801,11 @@ fi # This test causes fork failures, because it spawns way too many threads rm -f gcc/testsuite/go.test/test/chan/goroutines.go +# Build against mpfr3 and libmpc-mpfr3 so we can build mpfr 4.x +grep -Frl '' | xargs sed -i 's///g' +grep -Frl '' | xargs sed -i 's///g' +sed -i 's/-lmpc -lmpfr/-lmpc-mpfr3 -lmpfr3/' configure + %build # Undo the broken autoconf change in recent Fedora versions @@ -2955,6 +2960,9 @@ end %endif %changelog +* Tue Oct 8 2019 Jerry James 9.2.1-1.2 +- Build against mpfr3 and libmpc-mpfr3 so an mpfr 4.x version can be built + * Thu Oct 03 2019 Miro Hrončok - 9.2.1-1.1 - Rebuilt for Python 3.8.0rc1 (#1748018) From 4110c033419216a8da81b9fe231da9b2517386fa Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 9 Oct 2019 19:48:38 -0600 Subject: [PATCH 3/7] Build against mpfr4 and libmpc linked with mpfr4. --- gcc.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gcc.spec b/gcc.spec index 272cf62..c6bceba 100644 --- a/gcc.spec +++ b/gcc.spec @@ -101,7 +101,7 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}%{?dist}.2 +Release: %{gcc_release}%{?dist}.3 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -150,7 +150,7 @@ BuildRequires: glibc-static BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, sharutils BuildRequires: texinfo, texinfo-tex, /usr/bin/pod2man BuildRequires: systemtap-sdt-devel >= 1.3 -BuildRequires: gmp-devel >= 4.1.2-8, mpfr3-devel >= 2.2.1, libmpc-mpfr3-devel >= 0.8.1 +BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1, libmpc-devel >= 0.8.1 BuildRequires: python2-devel, python3-devel, /usr/bin/python BuildRequires: gcc, gcc-c++ %if %{build_go} @@ -726,7 +726,7 @@ This package contains static Go libraries. %package plugin-devel Summary: Support for compiling GCC plugins Requires: gcc = %{version}-%{release} -Requires: gmp-devel >= 4.1.2-8, mpfr3-devel >= 2.2.1, libmpc-mpfr3-devel >= 0.8.1 +Requires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1, libmpc-devel >= 0.8.1 %description plugin-devel This package contains header files and other support files @@ -801,11 +801,6 @@ fi # This test causes fork failures, because it spawns way too many threads rm -f gcc/testsuite/go.test/test/chan/goroutines.go -# Build against mpfr3 and libmpc-mpfr3 so we can build mpfr 4.x -grep -Frl '' | xargs sed -i 's///g' -grep -Frl '' | xargs sed -i 's///g' -sed -i 's/-lmpc -lmpfr/-lmpc-mpfr3 -lmpfr3/' configure - %build # Undo the broken autoconf change in recent Fedora versions @@ -2960,6 +2955,9 @@ end %endif %changelog +* Wed Oct 9 2019 Jerry James 9.2.1-1.3 +- Build against mpfr4 and libmpc linked with mpfr4 + * Tue Oct 8 2019 Jerry James 9.2.1-1.2 - Build against mpfr3 and libmpc-mpfr3 so an mpfr 4.x version can be built From 56772a9401acbcf555df37034572e9e643d948b3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 9 Oct 2019 20:26:44 -0600 Subject: [PATCH 4/7] Drop multilib support for s390x since glibc32 already did. --- gcc.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gcc.spec b/gcc.spec index c6bceba..553f303 100644 --- a/gcc.spec +++ b/gcc.spec @@ -15,7 +15,7 @@ # Until annobin is fixed (#1519165). %undefine _annotated_build %endif -%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64 +%global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64 %if 0%{?rhel} > 7 %global build_ada 0 %global build_objc 0 @@ -86,9 +86,6 @@ %else %global build_offload_nvptx 0 %endif -%ifarch s390x -%global multilib_32_arch s390 -%endif %ifarch sparc64 %global multilib_32_arch sparcv9 %endif @@ -2957,6 +2954,7 @@ end %changelog * Wed Oct 9 2019 Jerry James 9.2.1-1.3 - Build against mpfr4 and libmpc linked with mpfr4 +- Drop multilib support for s390x since glibc32 already did * Tue Oct 8 2019 Jerry James 9.2.1-1.2 - Build against mpfr3 and libmpc-mpfr3 so an mpfr 4.x version can be built From 0d8c061e19f71b4554a50e53057a57c3dbd477a1 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 10 Oct 2019 08:42:52 +0200 Subject: [PATCH 5/7] Disable multilib on s390x --- gcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 553f303..0c5e275 100644 --- a/gcc.spec +++ b/gcc.spec @@ -886,7 +886,7 @@ CONFIGURE_OPTS="\ %ifarch ppc64le --enable-targets=powerpcle-linux \ %endif -%ifarch ppc64le %{mips} riscv64 +%ifarch ppc64le %{mips} riscv64 s390x --disable-multilib \ %else --enable-multilib \ From 52eb664223e394d30d2d51e61e53ba9e732291fd Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 20 Nov 2019 11:35:10 +0100 Subject: [PATCH 6/7] 9.2.1-2 --- .gitignore | 1 + gcc.spec | 77 +++++++++++++++++++++++++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 70 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 3f7b511..b8f2015 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ /gcc-9.1.1-20190503.tar.xz /gcc-9.1.1-20190605.tar.xz /gcc-9.2.1-20190827.tar.xz +/gcc-9.2.1-20191120.tar.xz diff --git a/gcc.spec b/gcc.spec index 0c5e275..22ada65 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,10 +1,10 @@ -%global DATE 20190827 -%global SVNREV 274959 +%global DATE 20191120 +%global SVNREV 278493 %global gcc_version 9.2.1 %global gcc_major 9 # 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 1 +%global gcc_release 2 %global nvptx_tools_gitrev c28050f60193b3b95a18866a96f03334e874e78f %global nvptx_newlib_gitrev aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24 %global _unpackaged_files_terminate_build 0 @@ -15,7 +15,11 @@ # Until annobin is fixed (#1519165). %undefine _annotated_build %endif +%if 0%{?fedora} < 31 +%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64 +%else %global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64 +%endif %if 0%{?rhel} > 7 %global build_ada 0 %global build_objc 0 @@ -86,6 +90,11 @@ %else %global build_offload_nvptx 0 %endif +%if 0%{?fedora} < 31 +%ifarch s390x +%global multilib_32_arch s390 +%endif +%endif %ifarch sparc64 %global multilib_32_arch sparcv9 %endif @@ -98,7 +107,7 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}%{?dist}.3 +Release: %{gcc_release}%{?dist} # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -887,7 +896,15 @@ CONFIGURE_OPTS="\ --enable-targets=powerpcle-linux \ %endif %ifarch ppc64le %{mips} riscv64 s390x +%ifarch s390x +%if 0%{?fedora} < 31 + --enable-multilib \ +%else --disable-multilib \ +%endif +%else + --disable-multilib \ +%endif %else --enable-multilib \ %endif @@ -2952,15 +2969,57 @@ end %endif %changelog +* Wed Nov 20 2019 Jakub Jelinek 9.2.1-2 +- update from 9 branch + - PRs ada/91995, bootstrap/90543, c++/85254, c++/88203, c++/90767, + c++/90947, c++/90998, c++/91129, c++/91155, c++/91606, c++/91705, + c++/91740, c++/91923, c++/91925, c++/91974, c++/92015, c++/92062, + c++/92106, c++/92201, c++/92343, c++/92384, c++/92504, c/90898, + c/91401, debug/91772, debug/91887, driver/69471, fortran/47054, + fortran/69455, fortran/83113, fortran/84487, fortran/86248, + fortran/87752, fortran/89943, fortran/91253, fortran/91496, + fortran/91550, fortran/91551, fortran/91552, fortran/91553, + fortran/91557, fortran/91564, fortran/91565, fortran/91566, + fortran/91586, fortran/91587, fortran/91588, fortran/91589, + fortran/91641, fortran/91642, fortran/91649, fortran/91660, + fortran/91714, fortran/91715, fortran/91716, fortran/91727, + fortran/91785, fortran/91801, fortran/91802, fortran/91863, + fortran/91864, fortran/91926, fortran/91942, fortran/92113, + fortran/92174, fortran/92208, fortran/92277, fortran/92284, + fortran/92321, fortran/92470, fortran/92500, gcov-profile/91601, + go/91617, libfortran/90038, libstdc++/61761, libstdc++/89164, + libstdc++/90682, libstdc++/91067, libstdc++/91456, libstdc++/91748, + libstdc++/92059, libstdc++/92143, lto/91572, lto/91968, + middle-end/90840, middle-end/91001, middle-end/91105, + middle-end/91106, middle-end/91450, middle-end/91623, + middle-end/91920, middle-end/92153, middle-end/92231, pch/61250, + preprocessor/92296, rtl-optimization/88751, rtl-optimization/89435, + rtl-optimization/89795, rtl-optimization/91720, + rtl-optimization/92007, rtl-optimization/92430, sanitizer/92154, + target/59888, target/65342, target/67183, target/70010, target/80672, + target/81800, target/86040, target/86805, target/87243, target/87833, + target/87853, target/88167, target/88562, target/88630, target/89400, + target/90867, target/91269, target/91275, target/91289, target/91472, + target/91481, target/91635, target/91683, target/91704, target/91769, + target/92022, target/92093, target/92095, target/92225, target/92389, + tree-optimization/85887, tree-optimization/90278, + tree-optimization/90637, tree-optimization/90930, + tree-optimization/91351, tree-optimization/91568, + tree-optimization/91597, tree-optimization/91632, + tree-optimization/91665, tree-optimization/91723, + tree-optimization/91734, tree-optimization/91790, + tree-optimization/91812, tree-optimization/91885, + tree-optimization/92056, tree-optimization/92131 + * Wed Oct 9 2019 Jerry James 9.2.1-1.3 -- Build against mpfr4 and libmpc linked with mpfr4 -- Drop multilib support for s390x since glibc32 already did +- build against mpfr4 and libmpc linked with mpfr4 +- drop multilib support for s390x since glibc32 already did * Tue Oct 8 2019 Jerry James 9.2.1-1.2 -- Build against mpfr3 and libmpc-mpfr3 so an mpfr 4.x version can be built +- build against mpfr3 and libmpc-mpfr3 so an mpfr 4.x version can be built -* Thu Oct 03 2019 Miro Hrončok - 9.2.1-1.1 -- Rebuilt for Python 3.8.0rc1 (#1748018) +* Thu Oct 03 2019 Miro Hrončok 9.2.1-1.1 +- rebuilt for Python 3.8.0rc1 (#1748018) * Tue Aug 27 2019 Jakub Jelinek 9.2.1-1 - update from 9 branch diff --git a/sources b/sources index cc2631b..04b7e4e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (gcc-9.2.1-20190827.tar.xz) = 211ab74cb6859e171cfcefc199d7f2e67add5405996caef10f04c6e38e78781881c047a6016842edeb29026056510f1a6c6e91bf572ce65bf6741c01c379faf7 +SHA512 (gcc-9.2.1-20191120.tar.xz) = cbd156d19afc4d4e752df3aee159906899f229342c314dcb16699e29bb43c0ac63b35ced11fcc50c4017c20e4e0e5609d941d88abcfe16e3903c3e7da6050acd SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) = 94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04 SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) = a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1 From b05570344e6c43fe0339e5064e55571af0754be0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 20 Nov 2019 11:37:12 +0100 Subject: [PATCH 7/7] 9.2.1-2 --- gcc.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc.spec b/gcc.spec index 22ada65..0d2d9a3 100644 --- a/gcc.spec +++ b/gcc.spec @@ -15,7 +15,7 @@ # Until annobin is fixed (#1519165). %undefine _annotated_build %endif -%if 0%{?fedora} < 31 +%if 0%{?fedora} < 32 %global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64 %else %global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64 @@ -90,7 +90,7 @@ %else %global build_offload_nvptx 0 %endif -%if 0%{?fedora} < 31 +%if 0%{?fedora} < 32 %ifarch s390x %global multilib_32_arch s390 %endif @@ -897,7 +897,7 @@ CONFIGURE_OPTS="\ %endif %ifarch ppc64le %{mips} riscv64 s390x %ifarch s390x -%if 0%{?fedora} < 31 +%if 0%{?fedora} < 32 --enable-multilib \ %else --disable-multilib \