From 6b90f867141f55a8bd001ee3d708098afb203fad Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 16 Sep 2020 11:51:20 +0200 Subject: [PATCH] 10.2.1-4 --- gcc.spec | 26 ++++++++++++-------------- gcc10-pr96385.patch | 22 ---------------------- 2 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 gcc10-pr96385.patch diff --git a/gcc.spec b/gcc.spec index 22001c7..40d011c 100644 --- a/gcc.spec +++ b/gcc.spec @@ -269,13 +269,12 @@ Patch9: gcc10-Wno-format-security.patch Patch10: gcc10-rh1574936.patch Patch11: gcc10-d-shared-libphobos.patch Patch12: gcc10-pr96383.patch -Patch13: gcc10-pr96385.patch -Patch14: gcc10-pr96690.patch -Patch15: gcc10-pr96939.patch -Patch16: gcc10-pr96939-2.patch -Patch17: gcc10-pr96939-3.patch -Patch18: gcc10-pr97032.patch -Patch19: gcc10-pr97060.patch +Patch13: gcc10-pr96690.patch +Patch14: gcc10-pr96939.patch +Patch15: gcc10-pr96939-2.patch +Patch16: gcc10-pr96939-3.patch +Patch17: gcc10-pr97032.patch +Patch18: gcc10-pr97060.patch # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -788,13 +787,12 @@ to NVidia PTX capable devices if available. %endif %patch11 -p0 -b .d-shared-libphobos~ %patch12 -p0 -b .pr96383~ -%patch13 -p0 -b .pr96385~ -%patch14 -p0 -b .pr96690~ -%patch15 -p0 -b .pr96939~ -%patch16 -p0 -b .pr96939-2~ -%patch17 -p0 -b .pr96939-3~ -%patch18 -p0 -b .pr97032~ -%patch19 -p0 -b .pr97060~ +%patch13 -p0 -b .pr96690~ +%patch14 -p0 -b .pr96939~ +%patch15 -p0 -b .pr96939-2~ +%patch16 -p0 -b .pr96939-3~ +%patch17 -p0 -b .pr97032~ +%patch18 -p0 -b .pr97060~ find gcc/testsuite -name \*.pr96939~ | xargs rm -f echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE diff --git a/gcc10-pr96385.patch b/gcc10-pr96385.patch deleted file mode 100644 index 22fe68e..0000000 --- a/gcc10-pr96385.patch +++ /dev/null @@ -1,22 +0,0 @@ -2020-08-03 Richard Biener - - PR lto/96385 -libiberty/ - * simple-object-elf.c - (simple_object_elf_copy_lto_debug_sections): Localize global - UNDEFs and reuse the prevailing name. - ---- libiberty/simple-object-elf.c -+++ libiberty/simple-object-elf.c -@@ -1467,6 +1467,11 @@ simple_object_elf_copy_lto_debug_sections (simple_object_read *sobj, - && st_shndx < shnum - && pfnret[st_shndx - 1] == -1) - discard = 1; -+ /* We also need to remove global UNDEFs which can -+ cause link fails later. */ -+ else if (st_shndx == SHN_UNDEF -+ && ELF_ST_BIND (*st_info) == STB_GLOBAL) -+ discard = 1; - - if (discard) - {