diff --git a/.gitignore b/.gitignore index f3cbb4d..1dc73e2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /gcc-10.2.1-20201005.tar.xz /gcc-10.2.1-20201016.tar.xz /gcc-10.2.1-20201102.tar.xz +/gcc-10.2.1-20201112.tar.xz diff --git a/gcc.spec b/gcc.spec index aa64aa1..4277563 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,10 +1,10 @@ -%global DATE 20201102 -%global gitrev 736fd853f0e75ad3f91bdc7156f6b4475a1b60c1 +%global DATE 20201112 +%global gitrev 86495efb7a403b1ee3419fb3b3b1aaf26345ada5 %global gcc_version 10.2.1 %global gcc_major 10 # 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 8 %global nvptx_tools_gitrev 5f6f343a302d620b0868edab376c00b15741e39e %global newlib_cygwin_gitrev 50e2a63b04bdd018484605fbb954fd1bd5147fa0 %global _unpackaged_files_terminate_build 0 @@ -171,7 +171,7 @@ BuildRequires: texinfo, texinfo-tex, /usr/bin/pod2man BuildRequires: systemtap-sdt-devel >= 1.3 BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 3.1.0, libmpc-devel >= 0.8.1 BuildRequires: python3-devel, /usr/bin/python -BuildRequires: gcc, gcc-c++ +BuildRequires: gcc, gcc-c++, make %if %{build_go} BuildRequires: hostname, procps %endif @@ -248,6 +248,8 @@ Requires: glibc >= 2.16 %endif Requires: libgcc >= %{version}-%{release} Requires: libgomp = %{version}-%{release} +# lto-wrapper invokes make +Requires: make %if !%{build_ada} Obsoletes: gcc-gnat < %{version}-%{release} %endif @@ -272,6 +274,7 @@ Patch12: gcc10-pr96383.patch Patch13: gcc10-pr96939.patch Patch14: gcc10-pr96939-2.patch Patch15: gcc10-pr96939-3.patch +Patch16: gcc10-pr97060.patch # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -788,6 +791,7 @@ to NVidia PTX capable devices if available. %patch14 -p0 -b .pr96939-2~ %patch15 -p0 -b .pr96939-3~ find gcc/testsuite -name \*.pr96939~ | xargs rm -f +%patch16 -p0 -b .pr97060~ echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE @@ -3054,6 +3058,18 @@ end %endif %changelog +* Thu Nov 12 2020 Jakub Jelinek 10.2.1-8 +- update from releases/gcc-10 branch + - PRs c++/97412, fortran/92793, fortran/97652, libstdc++/92285, + libstdc++/96269, libstdc++/97362, libstdc++/97731, middle-end/97392, + target/85486, target/97360, target/97638, target/97685, + testsuite/80219, testsuite/85303, testsuite/97688, testsuite/97797, + tree-optimization/97633, tree-optimization/97764 + - fix up Fortran ICE on operator with CHARACTER operand (#1895612, + PR fortran/97768) +- emit DW_AT_declaration on declaration-only DIEs (#1889516, PR debug/97060) +- add BuildRequires: make and Requires: make, the latter for -flto reasons + * Mon Nov 2 2020 Jakub Jelinek 10.2.1-7 - update from releases/gcc-10 branch - PRs c++/95132, c++/96241, c++/97010, c++/97197, c++/97328, fortran/95979, diff --git a/gcc10-pr97060.patch b/gcc10-pr97060.patch new file mode 100644 index 0000000..bd0d7be --- /dev/null +++ b/gcc10-pr97060.patch @@ -0,0 +1,34 @@ +2020-11-11 Jason Merrill + + PR debug/97060 + * dwarf2out.c (gen_subprogram_die): It's a declaration + if DECL_INITIAL isn't set. + + * gcc.dg/debug/dwarf2/pr97060.c: New test. + +--- gcc/dwarf2out.c ++++ gcc/dwarf2out.c +@@ -22859,6 +22859,7 @@ gen_subprogram_die (tree decl, dw_die_ref context_die) + available. + */ + int declaration = (current_function_decl != decl ++ || (!DECL_INITIAL (decl) && !origin) + || class_or_namespace_scope_p (context_die)); + + /* A declaration that has been previously dumped needs no +--- gcc/testsuite/gcc.dg/debug/dwarf2/pr97060.c ++++ gcc/testsuite/gcc.dg/debug/dwarf2/pr97060.c +@@ -0,0 +1,13 @@ ++/* PR debug/97060 */ ++/* { dg-do compile } */ ++/* { dg-options "-g -dA" } */ ++/* { dg-final { scan-assembler-times "DW_AT_declaration" 2 } } */ ++ ++extern int foo (unsigned int, unsigned int); ++ ++int ++bar (void) ++{ ++ foo (1, 2); ++ return 0; ++} diff --git a/sources b/sources index bc362aa..5302408 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (gcc-10.2.1-20201102.tar.xz) = 2b94ad339648bb5da08d47f6e3158c3e21a2b393049d105f491012a28f8b37949ceabba59d071d5faefe60035635157ddecc8b37e7296277592355bcf539ade8 +SHA512 (gcc-10.2.1-20201112.tar.xz) = 6f624eee77c0a35939978d59e7411764343a29d969a25e1a78c5fa27fc74b539c4a65c591f5699268cfe118df0054b5996b49b6cd2c02ce105ff86b5b935b2a1 SHA512 (newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz) = 002a48a7b689a81abbf16161bcaec001a842e67dfbe372e9e109092703bfc666675f16198f60ca429370e8850d564547dc505df81bc3aaca4ce6defbc014ad6c SHA512 (nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz) = f6d10db94fa1570ae0f94df073fa3c73c8e5ee16d59070b53d94f7db0de8a031bc44d7f3f1852533da04b625ce758e022263855ed43cfc6867e0708d001e53c7