From f400de5616239b6273c16415bbc65bd481564a689270ecdeea190da891296a04 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 8 Mar 2022 10:47:11 +0000 Subject: [PATCH 1/5] - Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, gcc7-x86-Add-mindirect-branch-cs-prefix.patch, gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to backport -mharden-sls support. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=227 --- cross-aarch64-gcc7.changes | 9 + cross-aarch64-gcc7.spec | 8 + cross-arm-gcc7.changes | 9 + cross-arm-gcc7.spec | 8 + cross-arm-none-gcc7-bootstrap.changes | 9 + cross-arm-none-gcc7-bootstrap.spec | 8 + cross-arm-none-gcc7.changes | 9 + cross-arm-none-gcc7.spec | 8 + cross-avr-gcc7-bootstrap.changes | 9 + cross-avr-gcc7-bootstrap.spec | 8 + cross-avr-gcc7.changes | 9 + cross-avr-gcc7.spec | 8 + cross-epiphany-gcc7-bootstrap.changes | 9 + cross-epiphany-gcc7-bootstrap.spec | 8 + cross-epiphany-gcc7.changes | 9 + cross-epiphany-gcc7.spec | 8 + cross-hppa-gcc7.changes | 9 + cross-hppa-gcc7.spec | 8 + cross-i386-gcc7.changes | 9 + cross-i386-gcc7.spec | 8 + cross-m68k-gcc7.changes | 9 + cross-m68k-gcc7.spec | 8 + cross-mips-gcc7.changes | 9 + cross-mips-gcc7.spec | 8 + cross-nvptx-gcc7.changes | 9 + cross-nvptx-gcc7.spec | 8 + cross-ppc64-gcc7.changes | 9 + cross-ppc64-gcc7.spec | 8 + cross-ppc64le-gcc7.changes | 9 + cross-ppc64le-gcc7.spec | 8 + cross-rx-gcc7-bootstrap.changes | 9 + cross-rx-gcc7-bootstrap.spec | 8 + cross-rx-gcc7.changes | 9 + cross-rx-gcc7.spec | 8 + cross-s390x-gcc7.changes | 9 + cross-s390x-gcc7.spec | 8 + cross-sparc-gcc7.changes | 9 + cross-sparc-gcc7.spec | 8 + cross-sparc64-gcc7.changes | 9 + cross-sparc64-gcc7.spec | 8 + cross-x86_64-gcc7.changes | 9 + cross-x86_64-gcc7.spec | 8 + gcc.spec.in | 8 + gcc7-testresults.changes | 9 + gcc7-testresults.spec | 8 + ...-sls-none-all-return-indirect-branch.patch | 301 ++++++++++++++++++ gcc7-x86-Add-mindirect-branch-cs-prefix.patch | 148 +++++++++ ...enerate-INT3-for-__builtin_eh_return.patch | 54 ++++ ...n-sls-indirect-branch-to-harden-sls-.patch | 109 +++++++ gcc7.changes | 9 + gcc7.spec | 8 + 51 files changed, 1011 insertions(+) create mode 100644 gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch create mode 100644 gcc7-x86-Add-mindirect-branch-cs-prefix.patch create mode 100644 gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch create mode 100644 gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index 4fce7d3..2e6a980 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index fd57b20..6eda047 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-arm-none-gcc7-bootstrap.changes b/cross-arm-none-gcc7-bootstrap.changes index bdd8a60..2685cbc 100644 --- a/cross-arm-none-gcc7-bootstrap.changes +++ b/cross-arm-none-gcc7-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-arm-none-gcc7-bootstrap.spec b/cross-arm-none-gcc7-bootstrap.spec index b195140..0dca1d0 100644 --- a/cross-arm-none-gcc7-bootstrap.spec +++ b/cross-arm-none-gcc7-bootstrap.spec @@ -177,6 +177,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -363,6 +367,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-arm-none-gcc7.changes b/cross-arm-none-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-arm-none-gcc7.changes +++ b/cross-arm-none-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-arm-none-gcc7.spec b/cross-arm-none-gcc7.spec index 4c8d305..1ed9bf8 100644 --- a/cross-arm-none-gcc7.spec +++ b/cross-arm-none-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index bdd8a60..2685cbc 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index f6e8a51..778e0ab 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index d7f3595..255a47a 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index bdd8a60..2685cbc 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index 10be471..c6e3c4a 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -177,6 +177,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -363,6 +367,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index adb7860..e6f72a1 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index 13abded..9ce346e 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index 40d717d..d58e769 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index 383096c..17459e1 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index c644363..38297f5 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index ff18ac9..f6954ff 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index 88580f6..1c79f00 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index 1e66ee0..0a0f324 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index bdd8a60..2685cbc 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index 1e6bec4..dec4a20 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -177,6 +177,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -363,6 +367,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index 6242a65..f359739 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index d5108ca..0d28783 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index 4e4eff1..23edf51 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index 8a9beeb..d939ba0 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index bdd8a60..2685cbc 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index 69ef4af..f4f3278 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -176,6 +176,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -362,6 +366,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/gcc.spec.in b/gcc.spec.in index e93cbe5..2b86b0a 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -359,6 +359,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # GCC-TESTSUITE-DELETE-BEGIN # SRC-COMMON-END @@ -1155,6 +1159,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index bdd8a60..2685cbc 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec index 0d9531a..d6360fa 100644 --- a/gcc7-testresults.spec +++ b/gcc7-testresults.spec @@ -373,6 +373,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch Summary: Testsuite results License: SUSE-Public-Domain @@ -544,6 +548,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end diff --git a/gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch b/gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch new file mode 100644 index 0000000..c8839fe --- /dev/null +++ b/gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch @@ -0,0 +1,301 @@ +From bceb67fd35ac486e889d325c40f1cee1dc188b3e Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 27 Oct 2021 07:48:54 -0700 +Subject: [PATCH 1/4] x86: Add -mharden-sls=[none|all|return|indirect-branch] +To: gcc-patches@gcc.gnu.org + +Add -mharden-sls= to mitigate against straight line speculation (SLS) +for function return and indirect branch by adding an INT3 instruction +after function return and indirect branch. + +gcc/ + + PR target/102952 + * config/i386/i386-opts.h (harden_sls): New enum. + * config/i386/i386.c (output_indirect_thunk): Mitigate against + SLS for function return. + (ix86_output_function_return): Likewise. + (ix86_output_jmp_thunk_or_indirect): Mitigate against indirect + branch. + (ix86_output_indirect_jmp): Likewise. + (ix86_output_call_insn): Likewise. + * config/i386/i386.opt: Add -mharden-sls=. + * doc/invoke.texi: Document -mharden-sls=. + +gcc/testsuite/ + + PR target/102952 + * gcc.target/i386/harden-sls-1.c: New test. + * gcc.target/i386/harden-sls-2.c: Likewise. + * gcc.target/i386/harden-sls-3.c: Likewise. + * gcc.target/i386/harden-sls-4.c: Likewise. + * gcc.target/i386/harden-sls-5.c: Likewise. + +(cherry picked from commit 53a643f8568067d7700a9f2facc8ba39974973d3) +--- + gcc/config/i386/i386-opts.h | 13 ++++++++++++ + gcc/config/i386/i386.c | 22 ++++++++++++++------ + gcc/config/i386/i386.opt | 21 +++++++++++++++++++ + gcc/doc/invoke.texi | 10 ++++++++- + gcc/testsuite/gcc.target/i386/harden-sls-1.c | 14 +++++++++++++ + gcc/testsuite/gcc.target/i386/harden-sls-2.c | 14 +++++++++++++ + gcc/testsuite/gcc.target/i386/harden-sls-3.c | 14 +++++++++++++ + gcc/testsuite/gcc.target/i386/harden-sls-4.c | 16 ++++++++++++++ + gcc/testsuite/gcc.target/i386/harden-sls-5.c | 17 +++++++++++++++ + 9 files changed, 134 insertions(+), 7 deletions(-) + create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-1.c + create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-2.c + create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-3.c + create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-4.c + create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-5.c + +diff --git a/gcc/config/i386/i386-opts.h b/gcc/config/i386/i386-opts.h +index efcdc3b1a14..fb2d6ccdd40 100644 +--- a/gcc/config/i386/i386-opts.h ++++ b/gcc/config/i386/i386-opts.h +@@ -112,4 +112,17 @@ enum indirect_branch { + indirect_branch_thunk_extern + }; + ++enum instrument_return { ++ instrument_return_none = 0, ++ instrument_return_call, ++ instrument_return_nop5 ++}; ++ ++enum harden_sls { ++ harden_sls_none = 0, ++ harden_sls_return = 1 << 0, ++ harden_sls_indirect_branch = 1 << 1, ++ harden_sls_all = harden_sls_return | harden_sls_indirect_branch ++}; ++ + #endif +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index de71f56be6b..7a4dfaa8ab5 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -12208,6 +12208,8 @@ output_indirect_thunk (bool need_bnd_p, unsigned int regno) + fputs ("\tbnd ret\n", asm_out_file); + else + fputs ("\tret\n", asm_out_file); ++ if ((ix86_harden_sls & harden_sls_return)) ++ fputs ("\tint3\n", asm_out_file); + } + + /* Output a funtion with a call and return thunk for indirect branch. +@@ -28876,6 +28878,8 @@ ix86_output_jmp_thunk_or_indirect (const char *thunk_name, + fprintf (asm_out_file, "\tjmp\t"); + assemble_name (asm_out_file, thunk_name); + putc ('\n', asm_out_file); ++ if ((ix86_harden_sls & harden_sls_indirect_branch)) ++ fputs ("\tint3\n", asm_out_file); + } + else + output_indirect_thunk (need_bnd_p, regno); +@@ -29119,10 +29123,10 @@ ix86_output_indirect_jmp (rtx call_op) + gcc_unreachable (); + + ix86_output_indirect_branch (call_op, "%0", true); +- return ""; + } + else +- return "%!jmp\t%A0"; ++ output_asm_insn ("%!jmp\t%A0", &call_op); ++ return (ix86_harden_sls & harden_sls_indirect_branch) ? "int3" : ""; + } + + /* Output function return. CALL_OP is the jump target. Add a REP +@@ -29163,9 +29167,10 @@ ix86_output_function_return (bool long_p) + } + + if (!long_p || ix86_bnd_prefixed_insn_p (current_output_insn)) +- return "%!ret"; +- +- return "rep%; ret"; ++ output_asm_insn ("%!ret", NULL); ++ else ++ output_asm_insn ("rep%; ret", NULL); ++ return (ix86_harden_sls & harden_sls_return) ? "int3" : ""; + } + + /* Output indirect function return. RET_OP is the function return +@@ -29302,7 +29307,12 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) + if (output_indirect_p && !direct_p) + ix86_output_indirect_branch (call_op, xasm, true); + else +- output_asm_insn (xasm, &call_op); ++ { ++ output_asm_insn (xasm, &call_op); ++ if (!direct_p ++ && (ix86_harden_sls & harden_sls_indirect_branch)) ++ return "int3"; ++ } + return ""; + } + +diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt +index b90da9f89ec..3b25627a24c 100644 +--- a/gcc/config/i386/i386.opt ++++ b/gcc/config/i386/i386.opt +@@ -955,3 +955,24 @@ Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern) + mindirect-branch-register + Target Report Var(ix86_indirect_branch_register) Init(0) + Force indirect call and jump via register. ++ ++mharden-sls= ++Target RejectNegative Joined Enum(harden_sls) Var(ix86_harden_sls) Init(harden_sls_none) ++Generate code to mitigate against straight line speculation. ++ ++Enum ++Name(harden_sls) Type(enum harden_sls) ++Known choices for mitigation against straight line speculation with -mharden-sls=: ++ ++EnumValue ++Enum(harden_sls) String(none) Value(harden_sls_none) ++ ++EnumValue ++Enum(harden_sls) String(return) Value(harden_sls_return) ++ ++EnumValue ++Enum(harden_sls) String(indirect-branch) Value(harden_sls_indirect_branch) ++ ++EnumValue ++Enum(harden_sls) String(all) Value(harden_sls_all) ++ +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 8f279e454b0..b3fe672faea 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1212,7 +1212,7 @@ See RS/6000 and PowerPC Options. + -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol + -mmitigate-rop -mgeneral-regs-only @gol + -mindirect-branch=@var{choice} -mfunction-return=@var{choice} @gol +--mindirect-branch-register} ++-mindirect-branch-register -mharden-sls=@var{choice} } + + @emph{x86 Windows Options} + @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol +@@ -25743,6 +25743,14 @@ not be reachable in large code model. + @opindex -mindirect-branch-register + Force indirect call and jump via register. + ++@item -mharden-sls=@var{choice} ++@opindex mharden-sls ++Generate code to mitigate against straight line speculation (SLS) with ++@var{choice}. The default is @samp{none} which disables all SLS ++hardening. @samp{return} enables SLS hardening for function return. ++@samp{indirect-branch} enables SLS hardening for indirect branch. ++@samp{all} enables all SLS hardening. ++ + @end table + + These @samp{-m} switches are supported in addition to the above +diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-1.c b/gcc/testsuite/gcc.target/i386/harden-sls-1.c +new file mode 100644 +index 00000000000..6f70dc94a23 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/harden-sls-1.c +@@ -0,0 +1,14 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O2 -mindirect-branch=thunk-extern -mharden-sls=all" } */ ++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ ++ ++extern void foo (void); ++ ++void ++bar (void) ++{ ++ foo (); ++} ++ ++/* { dg-final { scan-assembler "jmp\[ \t\]+_?foo" } } */ ++/* { dg-final { scan-assembler-not {int3} } } */ +diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-2.c b/gcc/testsuite/gcc.target/i386/harden-sls-2.c +new file mode 100644 +index 00000000000..a7c59078d03 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/harden-sls-2.c +@@ -0,0 +1,14 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O2 -mindirect-branch=thunk-extern -mharden-sls=all" } */ ++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ ++ ++extern void (*fptr) (void); ++ ++void ++foo (void) ++{ ++ fptr (); ++} ++ ++/* { dg-final { scan-assembler "jmp\[ \t\]+_?__x86_indirect_thunk_(r|e)ax" } } */ ++/* { dg-final { scan-assembler-times "int3" 1 } } */ +diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-3.c b/gcc/testsuite/gcc.target/i386/harden-sls-3.c +new file mode 100644 +index 00000000000..1a6056b6d7b +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/harden-sls-3.c +@@ -0,0 +1,14 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O2 -mindirect-branch=thunk -mharden-sls=all" } */ ++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ ++ ++extern void (*fptr) (void); ++ ++void ++foo (void) ++{ ++ fptr (); ++} ++ ++/* { dg-final { scan-assembler "jmp\[ \t\]+_?__x86_indirect_thunk_(r|e)ax" } } */ ++/* { dg-final { scan-assembler-times "int3" 2 } } */ +diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-4.c b/gcc/testsuite/gcc.target/i386/harden-sls-4.c +new file mode 100644 +index 00000000000..f70dd1379d3 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/harden-sls-4.c +@@ -0,0 +1,16 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O2 -mindirect-branch=keep -mharden-sls=all" } */ ++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ ++ ++extern void (*fptr) (void); ++ ++void ++foo (void) ++{ ++ fptr (); ++} ++ ++/* { dg-final { scan-assembler "jmp\[ \t\]+\\*_?fptr" { target { ! x32 } } } } */ ++/* { dg-final { scan-assembler "movl\[ \t\]+fptr\\(%rip\\), %eax" { target x32 } } } */ ++/* { dg-final { scan-assembler "jmp\[ \t\]+\\*%rax" { target x32 } } } */ ++/* { dg-final { scan-assembler-times "int3" 1 } } */ +diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-5.c b/gcc/testsuite/gcc.target/i386/harden-sls-5.c +new file mode 100644 +index 00000000000..613c44c6f82 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/harden-sls-5.c +@@ -0,0 +1,17 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -mharden-sls=return" } */ ++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ ++ ++typedef void (*dispatch_t)(long offset); ++ ++dispatch_t dispatch; ++ ++int ++male_indirect_jump (long offset) ++{ ++ dispatch(offset); ++ return 0; ++} ++ ++/* { dg-final { scan-assembler-times "ret" 1 } } */ ++/* { dg-final { scan-assembler-times "int3" 1 } } */ +-- +2.34.1 + diff --git a/gcc7-x86-Add-mindirect-branch-cs-prefix.patch b/gcc7-x86-Add-mindirect-branch-cs-prefix.patch new file mode 100644 index 0000000..cebabc2 --- /dev/null +++ b/gcc7-x86-Add-mindirect-branch-cs-prefix.patch @@ -0,0 +1,148 @@ +From 0d8051b52f6c235df9e7eb5f1fabfd8ef3624ec6 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 27 Oct 2021 06:27:15 -0700 +Subject: [PATCH 2/4] x86: Add -mindirect-branch-cs-prefix +To: gcc-patches@gcc.gnu.org + +Add -mindirect-branch-cs-prefix to add CS prefix to call and jmp to +indirect thunk with branch target in r8-r15 registers so that the call +and jmp instruction length is 6 bytes to allow them to be replaced with +"lfence; call *%r8-r15" or "lfence; jmp *%r8-r15" at run-time. + +gcc/ + + PR target/102952 + * config/i386/i386.c (ix86_output_jmp_thunk_or_indirect): Emit + CS prefix for -mindirect-branch-cs-prefix. + (ix86_output_indirect_branch_via_reg): Likewise. + * config/i386/i386.opt: Add -mindirect-branch-cs-prefix. + * doc/invoke.texi: Document -mindirect-branch-cs-prefix. + +gcc/testsuite/ + + PR target/102952 + * gcc.target/i386/indirect-thunk-cs-prefix-1.c: New test. + * gcc.target/i386/indirect-thunk-cs-prefix-2.c: Likewise. + +(cherry picked from commit 2196a681d7810ad8b227bf983f38ba716620545e) +--- + gcc/config/i386/i386.c | 6 ++++++ + gcc/config/i386/i386.opt | 4 ++++ + gcc/doc/invoke.texi | 10 +++++++++- + .../gcc.target/i386/indirect-thunk-cs-prefix-1.c | 14 ++++++++++++++ + .../gcc.target/i386/indirect-thunk-cs-prefix-2.c | 15 +++++++++++++++ + 5 files changed, 48 insertions(+), 1 deletion(-) + create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c + create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c + +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index 7a4dfaa8ab5..10b6f710d5a 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -28872,6 +28872,9 @@ ix86_output_jmp_thunk_or_indirect (const char *thunk_name, + { + if (thunk_name != NULL) + { ++ if (REX_INT_REGNO_P (regno) ++ && ix86_indirect_branch_cs_prefix) ++ fprintf (asm_out_file, "\tcs\n"); + if (need_bnd_p) + fprintf (asm_out_file, "\tbnd jmp\t"); + else +@@ -28930,6 +28933,9 @@ ix86_output_indirect_branch_via_reg (rtx call_op, bool sibcall_p) + { + if (thunk_name != NULL) + { ++ if (REX_INT_REGNO_P (regno) ++ && ix86_indirect_branch_cs_prefix) ++ fprintf (asm_out_file, "\tcs\n"); + if (need_bnd_p) + fprintf (asm_out_file, "\tbnd call\t"); + else +diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt +index 3b25627a24c..16dea090995 100644 +--- a/gcc/config/i386/i386.opt ++++ b/gcc/config/i386/i386.opt +@@ -952,6 +952,10 @@ Enum(indirect_branch) String(thunk-inline) Value(indirect_branch_thunk_inline) + EnumValue + Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern) + ++mindirect-branch-cs-prefix ++Target Var(ix86_indirect_branch_cs_prefix) Init(0) ++Add CS prefix to call and jmp to indirect thunk with branch target in r8-r15 registers. ++ + mindirect-branch-register + Target Report Var(ix86_indirect_branch_register) Init(0) + Force indirect call and jump via register. +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index b3fe672faea..ca3dc7ee636 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -1212,7 +1212,8 @@ See RS/6000 and PowerPC Options. + -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol + -mmitigate-rop -mgeneral-regs-only @gol + -mindirect-branch=@var{choice} -mfunction-return=@var{choice} @gol +--mindirect-branch-register -mharden-sls=@var{choice} } ++-mindirect-branch-register -mharden-sls=@var{choice} @gol ++-mindirect-branch-cs-prefix} + + @emph{x86 Windows Options} + @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol +@@ -25751,6 +25752,13 @@ hardening. @samp{return} enables SLS hardening for function return. + @samp{indirect-branch} enables SLS hardening for indirect branch. + @samp{all} enables all SLS hardening. + ++@item -mindirect-branch-cs-prefix ++@opindex mindirect-branch-cs-prefix ++Add CS prefix to call and jmp to indirect thunk with branch target in ++r8-r15 registers so that the call and jmp instruction length is 6 bytes ++to allow them to be replaced with @samp{lfence; call *%r8-r15} or ++@samp{lfence; jmp *%r8-r15} at run-time. ++ + @end table + + These @samp{-m} switches are supported in addition to the above +diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c +new file mode 100644 +index 00000000000..db2f3416823 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c +@@ -0,0 +1,14 @@ ++/* { dg-do compile { target { ! ia32 } } } */ ++/* { dg-options "-O2 -ffixed-rax -ffixed-rbx -ffixed-rcx -ffixed-rdx -ffixed-rdi -ffixed-rsi -mindirect-branch-cs-prefix -mindirect-branch=thunk-extern" } */ ++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ ++ ++extern void (*fptr) (void); ++ ++void ++foo (void) ++{ ++ fptr (); ++} ++ ++/* { dg-final { scan-assembler-times "jmp\[ \t\]+_?__x86_indirect_thunk_r\[0-9\]+" 1 } } */ ++/* { dg-final { scan-assembler-times "\tcs" 1 } } */ +diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c +new file mode 100644 +index 00000000000..adfc39a49d4 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c +@@ -0,0 +1,15 @@ ++/* { dg-do compile { target { ! ia32 } } } */ ++/* { dg-options "-O2 -ffixed-rax -ffixed-rbx -ffixed-rcx -ffixed-rdx -ffixed-rdi -ffixed-rsi -mindirect-branch-cs-prefix -mindirect-branch=thunk-extern" } */ ++/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ ++ ++extern void (*bar) (void); ++ ++int ++foo (void) ++{ ++ bar (); ++ return 0; ++} ++ ++/* { dg-final { scan-assembler-times "call\[ \t\]+_?__x86_indirect_thunk_r\[0-9\]+" 1 } } */ ++/* { dg-final { scan-assembler-times "\tcs" 1 } } */ +-- +2.34.1 + diff --git a/gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch b/gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch new file mode 100644 index 0000000..fdf9645 --- /dev/null +++ b/gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch @@ -0,0 +1,54 @@ +Testcase elided because -fcf-protection is not supported in GCC 7. + +From 91862c217c17bb0167f9b89d4ff706fc6e49d852 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 5 Jan 2022 18:04:21 -0800 +Subject: [PATCH 4/4] x86: Generate INT3 for __builtin_eh_return +To: gcc-patches@gcc.gnu.org + +Generate INT3 after indirect jmp in exception return for -fcf-protection +with -mharden-sls=indirect-jmp. + +gcc/ + + PR target/103925 + * config/i386/i386.c (ix86_output_indirect_function_return): + Generate INT3 after indirect jmp for -mharden-sls=indirect-jmp. + +gcc/testsuite/ + + PR target/103925 + * gcc.target/i386/harden-sls-6.c: New test. + +(cherry picked from commit c2e5c4feed32c808591b5278f680bbabe63eb225) +--- + gcc/config/i386/i386.c | 9 ++++++--- + gcc/testsuite/gcc.target/i386/harden-sls-6.c | 18 ++++++++++++++++++ + 2 files changed, 24 insertions(+), 3 deletions(-) + create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-6.c + +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index 83d59941acf..6e7377d2b7f 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -29221,11 +29221,14 @@ ix86_output_indirect_function_return (rtx ret_op) + } + else + output_indirect_thunk (need_bnd_p, regno); +- +- return ""; + } + else +- return "%!jmp\t%A0"; ++ { ++ output_asm_insn ("%!jmp\t%A0", &ret_op); ++ if (ix86_harden_sls & harden_sls_indirect_jmp) ++ fputs ("\tint3\n", asm_out_file); ++ } ++ return ""; + } + + /* Split simple return with popping POPC bytes from stack to indirect +-- +2.34.1 + diff --git a/gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch b/gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch new file mode 100644 index 0000000..fc23b5e --- /dev/null +++ b/gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch @@ -0,0 +1,109 @@ +From 2a67bbb0597001e42e37e2ea6eac5721df703eb4 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 5 Jan 2022 16:33:16 -0800 +Subject: [PATCH 3/4] x86: Rename -harden-sls=indirect-branch to + -harden-sls=indirect-jmp +To: gcc-patches@gcc.gnu.org + +Indirect branch also includes indirect call instructions. Rename +-harden-sls=indirect-branch to -harden-sls=indirect-jmp to match its +intended behavior. + + PR target/102952 + * config/i386/i386-opts.h (harden_sls): Replace + harden_sls_indirect_branch with harden_sls_indirect_jmp. + * config/i386/i386.c (ix86_output_jmp_thunk_or_indirect): + Likewise. + (ix86_output_indirect_jmp): Likewise. + (ix86_output_call_insn): Likewise. + * config/i386/i386.opt: Replace indirect-branch with + indirect-jmp. Replace harden_sls_indirect_branch with + harden_sls_indirect_jmp. + * doc/invoke.texi (-harden-sls=): Replace indirect-branch with + indirect-jmp. + +(cherry picked from commit ed8060950c64f2e449aaf90e438aa26d0d9d0b31) +--- + gcc/config/i386/i386-opts.h | 4 ++-- + gcc/config/i386/i386.c | 6 +++--- + gcc/config/i386/i386.opt | 2 +- + gcc/doc/invoke.texi | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/gcc/config/i386/i386-opts.h b/gcc/config/i386/i386-opts.h +index fb2d6ccdd40..1daa73b190b 100644 +--- a/gcc/config/i386/i386-opts.h ++++ b/gcc/config/i386/i386-opts.h +@@ -121,8 +121,8 @@ enum instrument_return { + enum harden_sls { + harden_sls_none = 0, + harden_sls_return = 1 << 0, +- harden_sls_indirect_branch = 1 << 1, +- harden_sls_all = harden_sls_return | harden_sls_indirect_branch ++ harden_sls_indirect_jmp = 1 << 1, ++ harden_sls_all = harden_sls_return | harden_sls_indirect_jmp + }; + + #endif +diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c +index 10b6f710d5a..83d59941acf 100644 +--- a/gcc/config/i386/i386.c ++++ b/gcc/config/i386/i386.c +@@ -28881,7 +28881,7 @@ ix86_output_jmp_thunk_or_indirect (const char *thunk_name, + fprintf (asm_out_file, "\tjmp\t"); + assemble_name (asm_out_file, thunk_name); + putc ('\n', asm_out_file); +- if ((ix86_harden_sls & harden_sls_indirect_branch)) ++ if ((ix86_harden_sls & harden_sls_indirect_jmp)) + fputs ("\tint3\n", asm_out_file); + } + else +@@ -29132,7 +29132,7 @@ ix86_output_indirect_jmp (rtx call_op) + } + else + output_asm_insn ("%!jmp\t%A0", &call_op); +- return (ix86_harden_sls & harden_sls_indirect_branch) ? "int3" : ""; ++ return (ix86_harden_sls & harden_sls_indirect_jmp) ? "int3" : ""; + } + + /* Output function return. CALL_OP is the jump target. Add a REP +@@ -29316,7 +29316,7 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) + { + output_asm_insn (xasm, &call_op); + if (!direct_p +- && (ix86_harden_sls & harden_sls_indirect_branch)) ++ && (ix86_harden_sls & harden_sls_indirect_jmp)) + return "int3"; + } + return ""; +diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt +index 16dea090995..8093f0c0c7f 100644 +--- a/gcc/config/i386/i386.opt ++++ b/gcc/config/i386/i386.opt +@@ -975,7 +975,7 @@ EnumValue + Enum(harden_sls) String(return) Value(harden_sls_return) + + EnumValue +-Enum(harden_sls) String(indirect-branch) Value(harden_sls_indirect_branch) ++Enum(harden_sls) String(indirect-jmp) Value(harden_sls_indirect_jmp) + + EnumValue + Enum(harden_sls) String(all) Value(harden_sls_all) +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index ca3dc7ee636..7a9a7084884 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -25748,8 +25748,8 @@ Force indirect call and jump via register. + @opindex mharden-sls + Generate code to mitigate against straight line speculation (SLS) with + @var{choice}. The default is @samp{none} which disables all SLS +-hardening. @samp{return} enables SLS hardening for function return. +-@samp{indirect-branch} enables SLS hardening for indirect branch. ++hardening. @samp{return} enables SLS hardening for function returns. ++@samp{indirect-jmp} enables SLS hardening for indirect jumps. + @samp{all} enables all SLS hardening. + + @item -mindirect-branch-cs-prefix +-- +2.34.1 + diff --git a/gcc7.changes b/gcc7.changes index bdd8a60..2685cbc 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 8 10:45:36 UTC 2022 - Richard Biener + +- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, + gcc7-x86-Add-mindirect-branch-cs-prefix.patch, + gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and + gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to + backport -mharden-sls support. + ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/gcc7.spec b/gcc7.spec index e6c00da..9b3511d 100644 --- a/gcc7.spec +++ b/gcc7.spec @@ -352,6 +352,10 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch +Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch +Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch License: GPL-3.0-or-later Summary: The GNU C Compiler and Support Files @@ -1881,6 +1885,10 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 +%patch127 -p1 +%patch128 -p1 +%patch129 -p1 +%patch130 -p1 #test patching end From fc9515d201f6daee3757c68d4246686912ef7b3fbf7b58d8b8de5739a47ada67 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 11 Mar 2022 07:16:02 +0000 Subject: [PATCH 2/5] - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=228 --- cross-aarch64-gcc7.changes | 6 ++++ cross-aarch64-gcc7.spec | 2 ++ cross-arm-gcc7.changes | 6 ++++ cross-arm-gcc7.spec | 2 ++ cross-arm-none-gcc7-bootstrap.changes | 6 ++++ cross-arm-none-gcc7-bootstrap.spec | 2 ++ cross-arm-none-gcc7.changes | 6 ++++ cross-arm-none-gcc7.spec | 2 ++ cross-avr-gcc7-bootstrap.changes | 6 ++++ cross-avr-gcc7-bootstrap.spec | 2 ++ cross-avr-gcc7.changes | 6 ++++ cross-avr-gcc7.spec | 2 ++ cross-epiphany-gcc7-bootstrap.changes | 6 ++++ cross-epiphany-gcc7-bootstrap.spec | 2 ++ cross-epiphany-gcc7.changes | 6 ++++ cross-epiphany-gcc7.spec | 2 ++ cross-hppa-gcc7.changes | 6 ++++ cross-hppa-gcc7.spec | 2 ++ cross-i386-gcc7.changes | 6 ++++ cross-i386-gcc7.spec | 2 ++ cross-m68k-gcc7.changes | 6 ++++ cross-m68k-gcc7.spec | 2 ++ cross-mips-gcc7.changes | 6 ++++ cross-mips-gcc7.spec | 2 ++ cross-nvptx-gcc7.changes | 6 ++++ cross-nvptx-gcc7.spec | 2 ++ cross-ppc64-gcc7.changes | 6 ++++ cross-ppc64-gcc7.spec | 2 ++ cross-ppc64le-gcc7.changes | 6 ++++ cross-ppc64le-gcc7.spec | 2 ++ cross-rx-gcc7-bootstrap.changes | 6 ++++ cross-rx-gcc7-bootstrap.spec | 2 ++ cross-rx-gcc7.changes | 6 ++++ cross-rx-gcc7.spec | 2 ++ cross-s390x-gcc7.changes | 6 ++++ cross-s390x-gcc7.spec | 2 ++ cross-sparc-gcc7.changes | 6 ++++ cross-sparc-gcc7.spec | 2 ++ cross-sparc64-gcc7.changes | 6 ++++ cross-sparc64-gcc7.spec | 2 ++ cross-x86_64-gcc7.changes | 6 ++++ cross-x86_64-gcc7.spec | 2 ++ gcc.spec.in | 2 ++ gcc7-ada-Target_Name.patch | 44 +++++++++++++++++++++++++++ gcc7-testresults.changes | 6 ++++ gcc7-testresults.spec | 2 ++ gcc7.changes | 6 ++++ gcc7.spec | 2 ++ 48 files changed, 230 insertions(+) create mode 100644 gcc7-ada-Target_Name.patch diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index 2e6a980..13d6d72 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index 6eda047..e689bba 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-arm-none-gcc7-bootstrap.changes b/cross-arm-none-gcc7-bootstrap.changes index 2685cbc..237a5d4 100644 --- a/cross-arm-none-gcc7-bootstrap.changes +++ b/cross-arm-none-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-arm-none-gcc7-bootstrap.spec b/cross-arm-none-gcc7-bootstrap.spec index 0dca1d0..7ebaa8d 100644 --- a/cross-arm-none-gcc7-bootstrap.spec +++ b/cross-arm-none-gcc7-bootstrap.spec @@ -144,6 +144,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -336,6 +337,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-arm-none-gcc7.changes b/cross-arm-none-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-arm-none-gcc7.changes +++ b/cross-arm-none-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-arm-none-gcc7.spec b/cross-arm-none-gcc7.spec index 1ed9bf8..f721fbe 100644 --- a/cross-arm-none-gcc7.spec +++ b/cross-arm-none-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index 2685cbc..237a5d4 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index 778e0ab..3b439be 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index 255a47a..f9dcca3 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index 2685cbc..237a5d4 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index c6e3c4a..d7fd786 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -144,6 +144,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -336,6 +337,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index e6f72a1..1369363 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index 9ce346e..86d2662 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index d58e769..499d23d 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index 17459e1..0a03494 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index 38297f5..94758fc 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index f6954ff..b13f9d7 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index 1c79f00..5af1905 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index 0a0f324..ace0074 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index 2685cbc..237a5d4 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index dec4a20..8f5ed9c 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -144,6 +144,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -336,6 +337,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index f359739..57b4653 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index 0d28783..a3978f9 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index 23edf51..c3bbe5d 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index d939ba0..4ed7d9d 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index 2685cbc..237a5d4 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index f4f3278..19efd49 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -143,6 +143,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -335,6 +336,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/gcc.spec.in b/gcc.spec.in index 2b86b0a..191099b 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -326,6 +326,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1128,6 +1129,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/gcc7-ada-Target_Name.patch b/gcc7-ada-Target_Name.patch new file mode 100644 index 0000000..c764176 --- /dev/null +++ b/gcc7-ada-Target_Name.patch @@ -0,0 +1,44 @@ +From 9467e7331188705ec16c086b77e1809c5b0aab7d Mon Sep 17 00:00:00 2001 +From: Richard Biener +Date: Thu, 10 Mar 2022 13:35:46 +0100 +Subject: [PATCH] ada/104861 - use target_noncanonial for Target_Name +To: gcc-patches@gcc.gnu.org + +The following arranges for s-oscons.ads to record target_noncanonical +for Target_Name, matching the install directory layout and what +gcc -dumpmachine says. This fixes build issues with gprbuild. + +2022-03-10 Richard Biener + + PR ada/104861 +gcc/ada/ + * gcc-interface/Makefile.in (target_noncanonical): Substitute. + (OSCONS_CPP): Pass target_noncanonical as TARGET. +--- + gcc/ada/gcc-interface/Makefile.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in +index b8a24708280..1e9801a8b96 100644 +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -138,6 +138,7 @@ objdir = . + + target_alias=@target_alias@ + target=@target@ ++target_noncanonical=@target_noncanonical@ + target_cpu=@target_cpu@ + target_vendor=@target_vendor@ + target_os=@target_os@ +@@ -598,7 +599,7 @@ OSCONS_CC=$(subst ./xgcc,../../xgcc,$(subst -B./, -B../../,$(GCC_FOR_TARGET))) + # has a header). + + OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS_FOR_C) -E -C \ +- -DTARGET=\"$(target)\" -iquote $(fsrcpfx)ada $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i ++ -DTARGET=\"$(target_noncanonical)\" -iquote $(fsrcpfx)ada $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i + OSCONS_EXTRACT=$(OSCONS_CC) $(GNATLIBCFLAGS_FOR_C) -S s-oscons-tmplt.i + + # Note: if you need to build with a non-GNU compiler, you could adapt the +-- +2.34.1 + diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index 2685cbc..237a5d4 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec index d6360fa..2663c89 100644 --- a/gcc7-testresults.spec +++ b/gcc7-testresults.spec @@ -340,6 +340,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -517,6 +518,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 diff --git a/gcc7.changes b/gcc7.changes index 2685cbc..237a5d4 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 11 07:10:31 UTC 2022 - Richard Biener + +- Add gcc7-ada-Target_Name.patch to adjust gnats idea of the + target, fixing the build of gprbuild. [bsc#1196861] + ------------------------------------------------------------------- Tue Mar 8 10:45:36 UTC 2022 - Richard Biener diff --git a/gcc7.spec b/gcc7.spec index 9b3511d..452baf8 100644 --- a/gcc7.spec +++ b/gcc7.spec @@ -319,6 +319,7 @@ Patch32: gcc7-pr81942.patch Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch +Patch36: gcc7-ada-Target_Name.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1854,6 +1855,7 @@ ln -s nvptx-newlib/newlib . %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 %patch51 %patch60 %patch61 From 4f8ab98ab5588bb7e6db3a1ff5cc59222f913818b39dd9c17627e417af0b706a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 29 Apr 2022 12:36:32 +0000 Subject: [PATCH 3/5] Accepting request 973918 from home:alarrosa:branches:devel:gcc - Add patch from upstream to fix altivec.h redefining bool in C++ which makes bool unusable (boo#1195517): * gcc7-pr78263.patch - Add patch from upstream to fix altivec.h redefining bool in C++ which makes bool unusable (boo#1195517): * gcc7-pr78263.patch - Add patch from upstream to fix altivec.h redefining bool in C++ which makes bool unusable (boo#1195517): * gcc7-pr78263.patch - Add patch from upstream to fix altivec.h redefining bool in C++ which makes bool unusable (boo#1195517): * gcc7-pr78263.patch - Add patch from upstream to fix altivec.h redefining bool in C++ which makes bool unusable (boo#1195517): * gcc7-pr78263.patch - Add patch from upstream to fix altivec.h redefining bool in C++ which makes bool unusable (boo#1195517): * gcc7-pr78263.patch - Add patch from upstream to fix altivec.h redefining bool in C++ which makes bool unusable (boo#1195517): * gcc7-pr78263.patch - Add patch from upstream to fix altivec.h redefining bool in C++ which makes bool unusable (boo#1195517): OBS-URL: https://build.opensuse.org/request/show/973918 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=229 --- cross-aarch64-gcc7.changes | 7 ++ cross-aarch64-gcc7.spec | 2 + cross-arm-gcc7.changes | 7 ++ cross-arm-gcc7.spec | 2 + cross-arm-none-gcc7-bootstrap.changes | 7 ++ cross-arm-none-gcc7-bootstrap.spec | 2 + cross-arm-none-gcc7.changes | 7 ++ cross-arm-none-gcc7.spec | 2 + cross-avr-gcc7-bootstrap.changes | 7 ++ cross-avr-gcc7-bootstrap.spec | 2 + cross-avr-gcc7.changes | 7 ++ cross-avr-gcc7.spec | 2 + cross-epiphany-gcc7-bootstrap.changes | 7 ++ cross-epiphany-gcc7-bootstrap.spec | 2 + cross-epiphany-gcc7.changes | 7 ++ cross-epiphany-gcc7.spec | 2 + cross-hppa-gcc7.changes | 7 ++ cross-hppa-gcc7.spec | 2 + cross-i386-gcc7.changes | 7 ++ cross-i386-gcc7.spec | 2 + cross-m68k-gcc7.changes | 7 ++ cross-m68k-gcc7.spec | 2 + cross-mips-gcc7.changes | 7 ++ cross-mips-gcc7.spec | 2 + cross-nvptx-gcc7.changes | 7 ++ cross-nvptx-gcc7.spec | 2 + cross-ppc64-gcc7.changes | 7 ++ cross-ppc64-gcc7.spec | 2 + cross-ppc64le-gcc7.changes | 7 ++ cross-ppc64le-gcc7.spec | 2 + cross-rx-gcc7-bootstrap.changes | 7 ++ cross-rx-gcc7-bootstrap.spec | 2 + cross-rx-gcc7.changes | 7 ++ cross-rx-gcc7.spec | 2 + cross-s390x-gcc7.changes | 7 ++ cross-s390x-gcc7.spec | 2 + cross-sparc-gcc7.changes | 7 ++ cross-sparc-gcc7.spec | 2 + cross-sparc64-gcc7.changes | 7 ++ cross-sparc64-gcc7.spec | 2 + cross-x86_64-gcc7.changes | 7 ++ cross-x86_64-gcc7.spec | 2 + gcc.spec.in | 2 + gcc7-pr78263.patch | 155 ++++++++++++++++++++++++++ gcc7-testresults.changes | 7 ++ gcc7-testresults.spec | 2 + gcc7.changes | 7 ++ gcc7.spec | 2 + 48 files changed, 364 insertions(+) create mode 100644 gcc7-pr78263.patch diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index 13d6d72..602a545 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index e689bba..0d3fc59 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-arm-none-gcc7-bootstrap.changes b/cross-arm-none-gcc7-bootstrap.changes index 237a5d4..ba709f1 100644 --- a/cross-arm-none-gcc7-bootstrap.changes +++ b/cross-arm-none-gcc7-bootstrap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-arm-none-gcc7-bootstrap.spec b/cross-arm-none-gcc7-bootstrap.spec index 7ebaa8d..cb3fde8 100644 --- a/cross-arm-none-gcc7-bootstrap.spec +++ b/cross-arm-none-gcc7-bootstrap.spec @@ -145,6 +145,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -338,6 +339,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-arm-none-gcc7.changes b/cross-arm-none-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-arm-none-gcc7.changes +++ b/cross-arm-none-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-arm-none-gcc7.spec b/cross-arm-none-gcc7.spec index f721fbe..c98ed70 100644 --- a/cross-arm-none-gcc7.spec +++ b/cross-arm-none-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index 237a5d4..ba709f1 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index 3b439be..6759e75 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index f9dcca3..1fcd85d 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index 237a5d4..ba709f1 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index d7fd786..967a39f 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -145,6 +145,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -338,6 +339,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index 1369363..8e4e0d6 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index 86d2662..6e6744b 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index 499d23d..d83dfd4 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index 0a03494..fb70610 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index 94758fc..e7f8e36 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index b13f9d7..a379ed7 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index 5af1905..5c580ff 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index ace0074..2fad763 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index 237a5d4..ba709f1 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index 8f5ed9c..541d8f4 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -145,6 +145,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -338,6 +339,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index 57b4653..e87a570 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index a3978f9..1c8414b 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index c3bbe5d..96dc045 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index 4ed7d9d..5c7acd2 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index 237a5d4..ba709f1 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index 19efd49..a91926c 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -144,6 +144,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -337,6 +338,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/gcc.spec.in b/gcc.spec.in index 191099b..1575adb 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -327,6 +327,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1130,6 +1131,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/gcc7-pr78263.patch b/gcc7-pr78263.patch new file mode 100644 index 0000000..61e4f66 --- /dev/null +++ b/gcc7-pr78263.patch @@ -0,0 +1,155 @@ +From e756e900e911fdbc57cd76d6c12d20a9b1892e55 Mon Sep 17 00:00:00 2001 +From: Bill Schmidt +Date: Tue, 4 Jun 2019 21:52:32 +0000 +Subject: [PATCH] re PR target/78263 (Compile failure with AltiVec library on + PPC64le and -std=c++11 flag) + +[gcc] + +2019-06-04 Bill Schmidt + + PR target/78263 + * config/rs6000/altivec.h: Don't #define vector, pixel, bool for + C++ with strict ANSI requirements. + +[gcc/testsuite] + +2019-06-04 Bill Schmidt + + PR target/78263 + * g++.target/powerpc: New directory. + * g++.target/powerpc/powerpc.exp: New test driver. + * g++.target/powerpc/undef-bool-3.C: New. + +From-SVN: r271927 +--- + gcc/ChangeLog | 6 +++ + gcc/config/rs6000/altivec.h | 8 ++-- + gcc/testsuite/ChangeLog | 7 +++ + gcc/testsuite/g++.target/powerpc/powerpc.exp | 44 +++++++++++++++++++ + .../g++.target/powerpc/undef-bool-3.C | 13 ++++++ + 5 files changed, 75 insertions(+), 3 deletions(-) + create mode 100644 gcc/testsuite/g++.target/powerpc/powerpc.exp + create mode 100644 gcc/testsuite/g++.target/powerpc/undef-bool-3.C + +#diff --git a/gcc/ChangeLog b/gcc/ChangeLog +#index 30febc6fecc..8b3fe98771d 100644 +#--- a/gcc/ChangeLog +#+++ b/gcc/ChangeLog +#@@ -1,3 +1,9 @@ +#+2019-06-04 Bill Schmidt +#+ +#+ PR target/78263 +#+ * config/rs6000/altivec.h: Don't #define vector, pixel, bool for +#+ C++ with strict ANSI requirements. +#+ +# 2019-06-04 Marc Glisse +# +# * tree-ssa-loop-niter.c (number_of_iterations_ne): Skip +diff --git a/gcc/config/rs6000/altivec.h b/gcc/config/rs6000/altivec.h +index d66ae7ca2c7..dafc76aeafa 100644 +--- a/gcc/config/rs6000/altivec.h ++++ b/gcc/config/rs6000/altivec.h +@@ -37,10 +37,12 @@ + /* If __APPLE_ALTIVEC__ is defined, the compiler supports 'vector', + 'pixel' and 'bool' as context-sensitive AltiVec keywords (in + non-AltiVec contexts, they revert to their original meanings, +- if any), so we do not need to define them as macros. */ ++ if any), so we do not need to define them as macros. Also, ++ avoid defining them as macros for C++ with strict ANSI, as ++ this is not compatible. */ + +-#if !defined(__APPLE_ALTIVEC__) +-/* You are allowed to undef these for C++ compatibility. */ ++#if !defined(__APPLE_ALTIVEC__) \ ++ && (!defined(__STRICT_ANSI__) || !defined(__cplusplus)) + #define vector __vector + #define pixel __pixel + #define bool __bool +#diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog +#index 5978f7905f3..7bcc461327d 100644 +#--- a/gcc/testsuite/ChangeLog +#+++ b/gcc/testsuite/ChangeLog +#@@ -1,3 +1,10 @@ +#+2019-06-04 Bill Schmidt +#+ +#+ PR target/78263 +#+ * g++.target/powerpc: New directory. +#+ * g++.target/powerpc/powerpc.exp: New test driver. +#+ * g++.target/powerpc/undef-bool-3.C: New. +#+ +# 2019-06-04 Jakub Jelinek +# +# * c-c++-common/gomp/lastprivate-conditional-2.c (foo): Don't expect +diff --git a/gcc/testsuite/g++.target/powerpc/powerpc.exp b/gcc/testsuite/g++.target/powerpc/powerpc.exp +new file mode 100644 +index 00000000000..4e7ea3311e6 +--- /dev/null ++++ b/gcc/testsuite/g++.target/powerpc/powerpc.exp +@@ -0,0 +1,44 @@ ++# Specific regression driver for PowerPC. ++# Copyright (C) 2019 Free Software Foundation, Inc. ++# ++# This file is part of GCC. ++# ++# GCC is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3, or (at your option) ++# any later version. ++# ++# GCC is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GCC; see the file COPYING3. If not see ++# . */ ++ ++# GCC testsuite that uses the `dg.exp' driver. ++ ++# Exit immediately if this isn't a PowerPC target. ++if {![istarget powerpc*-*-*] } then { ++ return ++} ++ ++# Load support procs. ++load_lib g++-dg.exp ++ ++global DEFAULT_CXXFLAGS ++if ![info exists DEFAULT_CXXFLAGS] then { ++ set DEFAULT_CXXFLAGS " -pedantic-errors" ++} ++ ++# Initialize `dg'. ++dg-init ++ ++# Main loop. ++dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] \ ++ "" $DEFAULT_CXXFLAGS ++ ++# All done. ++dg-finish ++ +diff --git a/gcc/testsuite/g++.target/powerpc/undef-bool-3.C b/gcc/testsuite/g++.target/powerpc/undef-bool-3.C +new file mode 100644 +index 00000000000..27f3da58217 +--- /dev/null ++++ b/gcc/testsuite/g++.target/powerpc/undef-bool-3.C +@@ -0,0 +1,13 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O2 -std=c++11" } */ ++ ++/* Test to ensure that "bool" is not #define'd in altivec.h for C++ when ++ we require strict ANSI. We should compile without errors. */ ++ ++#include ++ ++bool foo (int x) ++{ ++ return x == 2; ++} ++ +-- +2.27.0 + diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index 237a5d4..ba709f1 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec index 2663c89..70380c5 100644 --- a/gcc7-testresults.spec +++ b/gcc7-testresults.spec @@ -341,6 +341,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -519,6 +520,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 diff --git a/gcc7.changes b/gcc7.changes index 237a5d4..ba709f1 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to fix altivec.h redefining bool in C++ + which makes bool unusable (boo#1195517): + * gcc7-pr78263.patch + ------------------------------------------------------------------- Fri Mar 11 07:10:31 UTC 2022 - Richard Biener diff --git a/gcc7.spec b/gcc7.spec index 452baf8..699464e 100644 --- a/gcc7.spec +++ b/gcc7.spec @@ -320,6 +320,7 @@ Patch33: gcc7-sanitizer-cyclades.patch Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch +Patch37: gcc7-pr78263.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1856,6 +1857,7 @@ ln -s nvptx-newlib/newlib . %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch51 %patch60 %patch61 From f2a885de2459acc1f40c8aa25438f6cf780e21a5f0e085acb7fd2cb8eb7aaac6 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 1 Sep 2022 11:20:53 +0000 Subject: [PATCH 4/5] Accepting request 1000658 from home:marxin:branches:devel:gcc - Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch in order to support glibc 2.36. - Enable format_spec_file otherwise one gets huge diff after running change_spec. - Remove fixed sys/mount.h. OBS-URL: https://build.opensuse.org/request/show/1000658 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=230 --- change_spec | 2 +- cross-aarch64-gcc7.changes | 10 +++++ cross-aarch64-gcc7.spec | 4 ++ cross-arm-gcc7.changes | 10 +++++ cross-arm-gcc7.spec | 4 ++ cross-arm-none-gcc7-bootstrap.changes | 10 +++++ cross-arm-none-gcc7-bootstrap.spec | 4 ++ cross-arm-none-gcc7.changes | 10 +++++ cross-arm-none-gcc7.spec | 4 ++ cross-avr-gcc7-bootstrap.changes | 10 +++++ cross-avr-gcc7-bootstrap.spec | 4 ++ cross-avr-gcc7.changes | 10 +++++ cross-avr-gcc7.spec | 4 ++ cross-epiphany-gcc7-bootstrap.changes | 10 +++++ cross-epiphany-gcc7-bootstrap.spec | 4 ++ cross-epiphany-gcc7.changes | 10 +++++ cross-epiphany-gcc7.spec | 4 ++ cross-hppa-gcc7.changes | 10 +++++ cross-hppa-gcc7.spec | 4 ++ cross-i386-gcc7.changes | 10 +++++ cross-i386-gcc7.spec | 4 ++ cross-m68k-gcc7.changes | 10 +++++ cross-m68k-gcc7.spec | 4 ++ cross-mips-gcc7.changes | 10 +++++ cross-mips-gcc7.spec | 4 ++ cross-nvptx-gcc7.changes | 10 +++++ cross-nvptx-gcc7.spec | 4 ++ cross-ppc64-gcc7.changes | 10 +++++ cross-ppc64-gcc7.spec | 4 ++ cross-ppc64le-gcc7.changes | 10 +++++ cross-ppc64le-gcc7.spec | 4 ++ cross-rx-gcc7-bootstrap.changes | 10 +++++ cross-rx-gcc7-bootstrap.spec | 4 ++ cross-rx-gcc7.changes | 10 +++++ cross-rx-gcc7.spec | 4 ++ cross-s390x-gcc7.changes | 10 +++++ cross-s390x-gcc7.spec | 4 ++ cross-sparc-gcc7.changes | 10 +++++ cross-sparc-gcc7.spec | 4 ++ cross-sparc64-gcc7.changes | 10 +++++ cross-sparc64-gcc7.spec | 4 ++ cross-x86_64-gcc7.changes | 10 +++++ cross-x86_64-gcc7.spec | 4 ++ gcc.spec.in | 5 +++ ...ude-linux-fs.h-when-building-gen-sys.patch | 35 +++++++++++++++++ ...rry-pick-9cf13067cb5088626ba7-from-u.patch | 39 +++++++++++++++++++ gcc7-testresults.changes | 10 +++++ gcc7-testresults.spec | 4 ++ gcc7.changes | 10 +++++ gcc7.spec | 5 +++ 50 files changed, 403 insertions(+), 1 deletion(-) create mode 100644 gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch create mode 100644 gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch diff --git a/change_spec b/change_spec index 47f8e58..72843ee 100644 --- a/change_spec +++ b/change_spec @@ -120,6 +120,6 @@ for f in *.spec; do sed -i -e '/^# .*-\(BEGIN\|END\)$/d' $f done -#osc service localrun format_spec_file +osc service localrun format_spec_file #exit 0 diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index 602a545..18d1fab 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index 0d3fc59..d669654 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-arm-none-gcc7-bootstrap.changes b/cross-arm-none-gcc7-bootstrap.changes index ba709f1..fd2c6cd 100644 --- a/cross-arm-none-gcc7-bootstrap.changes +++ b/cross-arm-none-gcc7-bootstrap.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-arm-none-gcc7-bootstrap.spec b/cross-arm-none-gcc7-bootstrap.spec index cb3fde8..6a29424 100644 --- a/cross-arm-none-gcc7-bootstrap.spec +++ b/cross-arm-none-gcc7-bootstrap.spec @@ -146,6 +146,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -340,6 +342,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-arm-none-gcc7.changes b/cross-arm-none-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-arm-none-gcc7.changes +++ b/cross-arm-none-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-arm-none-gcc7.spec b/cross-arm-none-gcc7.spec index c98ed70..fbfd5bb 100644 --- a/cross-arm-none-gcc7.spec +++ b/cross-arm-none-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index ba709f1..fd2c6cd 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index 6759e75..ddbd4c7 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index 1fcd85d..a8ff161 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index ba709f1..fd2c6cd 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index 967a39f..435fbe7 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -146,6 +146,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -340,6 +342,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index 8e4e0d6..5b543ae 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index 6e6744b..ce986f5 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index d83dfd4..9c3aa82 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index fb70610..50c7670 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index e7f8e36..74c1f1d 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index a379ed7..80ebb94 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index 5c580ff..44e9ab2 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index 2fad763..ec4cfc7 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index ba709f1..fd2c6cd 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index 541d8f4..d51e08a 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -146,6 +146,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -340,6 +342,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index e87a570..f908b59 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index 1c8414b..0df1a0b 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index 96dc045..14ececc 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index 5c7acd2..6fa8692 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index ba709f1..fd2c6cd 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index a91926c..5b3b930 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -145,6 +145,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -339,6 +341,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/gcc.spec.in b/gcc.spec.in index 1575adb..7a7333e 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -328,6 +328,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1132,6 +1134,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 @@ -1748,6 +1752,7 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/bits/statx.h rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/pthread.h rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/bits/unistd_ext.h rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys/rseq.h +rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys/mount.h %if !%{enable_plugins} # no plugins rm -rf $RPM_BUILD_ROOT%{libsubdir}/plugin diff --git a/gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch b/gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch new file mode 100644 index 0000000..e4c1ae7 --- /dev/null +++ b/gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch @@ -0,0 +1,35 @@ +From f35d65517a59565758107c5b1a51a5fa382f8d1a Mon Sep 17 00:00:00 2001 +From: Ian Lance Taylor +Date: Tue, 12 Jul 2022 19:42:43 -0700 +Subject: [PATCH] libgo: don't include when building + gen-sysinfo.go + +Removing this doesn't change anything at least with glibc 2.33. +The include was added in https://go.dev/cl/6100049 but it's not +clear why. + +Fixes PR go/106266 + +Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/417294 +--- + gcc/go/gofrontend/MERGE | 2 +- + libgo/sysinfo.c | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c +index a4259c02ded..fc0210992fa 100644 +--- a/libgo/sysinfo.c ++++ b/libgo/sysinfo.c +@@ -158,9 +158,6 @@ + #if defined(HAVE_LINUX_ETHER_H) + #include + #endif +-#if defined(HAVE_LINUX_FS_H) +-#include +-#endif + #if defined(HAVE_LINUX_REBOOT_H) + #include + #endif +-- +2.37.2 + diff --git a/gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch b/gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch new file mode 100644 index 0000000..8eb79ca --- /dev/null +++ b/gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch @@ -0,0 +1,39 @@ +From 2701442d0cf6292f6624443c15813d6d1a3562fe Mon Sep 17 00:00:00 2001 +From: Martin Liska +Date: Mon, 11 Jul 2022 22:03:14 +0200 +Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream + +9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 +--- + .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 97eae3f..dcedf75 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -62,7 +62,9 @@ + #include + #include + #include ++#if SANITIZER_ANDROID + #include ++#endif + #include + #include + #include +@@ -845,10 +847,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; + unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; + #endif +- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; +- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; +- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; +- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; ++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); ++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); ++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); ++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); + unsigned IOCTL_GIO_CMAP = GIO_CMAP; + unsigned IOCTL_GIO_FONT = GIO_FONT; + unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index ba709f1..fd2c6cd 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec index 70380c5..f544d71 100644 --- a/gcc7-testresults.spec +++ b/gcc7-testresults.spec @@ -342,6 +342,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -521,6 +523,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 diff --git a/gcc7.changes b/gcc7.changes index ba709f1..fd2c6cd 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 10:15:12 UTC 2022 - Martin Liška + +- Add gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch + and gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch + in order to support glibc 2.36. +- Enable format_spec_file otherwise one gets huge diff after + running change_spec. +- Remove fixed sys/mount.h. + ------------------------------------------------------------------- Fri Apr 29 04:47:58 UTC 2022 - Antonio Larrosa diff --git a/gcc7.spec b/gcc7.spec index 699464e..cd62847 100644 --- a/gcc7.spec +++ b/gcc7.spec @@ -321,6 +321,8 @@ Patch34: gcc7-ada-MINSTKSZ.patch Patch35: gcc7-pr55917.patch Patch36: gcc7-ada-Target_Name.patch Patch37: gcc7-pr78263.patch +Patch38: gcc7-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch +Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1858,6 +1860,8 @@ ln -s nvptx-newlib/newlib . %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch51 %patch60 %patch61 @@ -2469,6 +2473,7 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/bits/statx.h rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/pthread.h rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/bits/unistd_ext.h rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys/rseq.h +rm -f $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys/mount.h %if !%{enable_plugins} # no plugins rm -rf $RPM_BUILD_ROOT%{libsubdir}/plugin From 33e69357c75c5d4f01f322a69b2835ee555abb84b6d19a930ef54ec7b115d358 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 1 Sep 2022 13:47:56 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=231 --- cross-aarch64-gcc7.changes | 9 - cross-aarch64-gcc7.spec | 8 - cross-arm-gcc7.changes | 9 - cross-arm-gcc7.spec | 8 - cross-arm-none-gcc7-bootstrap.changes | 9 - cross-arm-none-gcc7-bootstrap.spec | 8 - cross-arm-none-gcc7.changes | 9 - cross-arm-none-gcc7.spec | 8 - cross-avr-gcc7-bootstrap.changes | 9 - cross-avr-gcc7-bootstrap.spec | 8 - cross-avr-gcc7.changes | 9 - cross-avr-gcc7.spec | 8 - cross-epiphany-gcc7-bootstrap.changes | 9 - cross-epiphany-gcc7-bootstrap.spec | 8 - cross-epiphany-gcc7.changes | 9 - cross-epiphany-gcc7.spec | 8 - cross-hppa-gcc7.changes | 9 - cross-hppa-gcc7.spec | 8 - cross-i386-gcc7.changes | 9 - cross-i386-gcc7.spec | 8 - cross-m68k-gcc7.changes | 9 - cross-m68k-gcc7.spec | 8 - cross-mips-gcc7.changes | 9 - cross-mips-gcc7.spec | 8 - cross-nvptx-gcc7.changes | 9 - cross-nvptx-gcc7.spec | 8 - cross-ppc64-gcc7.changes | 9 - cross-ppc64-gcc7.spec | 8 - cross-ppc64le-gcc7.changes | 9 - cross-ppc64le-gcc7.spec | 8 - cross-rx-gcc7-bootstrap.changes | 9 - cross-rx-gcc7-bootstrap.spec | 8 - cross-rx-gcc7.changes | 9 - cross-rx-gcc7.spec | 8 - cross-s390x-gcc7.changes | 9 - cross-s390x-gcc7.spec | 8 - cross-sparc-gcc7.changes | 9 - cross-sparc-gcc7.spec | 8 - cross-sparc64-gcc7.changes | 9 - cross-sparc64-gcc7.spec | 8 - cross-x86_64-gcc7.changes | 9 - cross-x86_64-gcc7.spec | 8 - gcc.spec.in | 8 - gcc7-testresults.changes | 9 - gcc7-testresults.spec | 8 - ...-sls-none-all-return-indirect-branch.patch | 301 ------------------ gcc7-x86-Add-mindirect-branch-cs-prefix.patch | 148 --------- ...enerate-INT3-for-__builtin_eh_return.patch | 54 ---- ...n-sls-indirect-branch-to-harden-sls-.patch | 109 ------- gcc7.changes | 9 - gcc7.spec | 8 - 51 files changed, 1011 deletions(-) delete mode 100644 gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch delete mode 100644 gcc7-x86-Add-mindirect-branch-cs-prefix.patch delete mode 100644 gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch delete mode 100644 gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index 18d1fab..3e5f16f 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index d669654..073ad6f 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-arm-none-gcc7-bootstrap.changes b/cross-arm-none-gcc7-bootstrap.changes index fd2c6cd..dc6f610 100644 --- a/cross-arm-none-gcc7-bootstrap.changes +++ b/cross-arm-none-gcc7-bootstrap.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-arm-none-gcc7-bootstrap.spec b/cross-arm-none-gcc7-bootstrap.spec index 6a29424..915093c 100644 --- a/cross-arm-none-gcc7-bootstrap.spec +++ b/cross-arm-none-gcc7-bootstrap.spec @@ -181,10 +181,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -375,10 +371,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-arm-none-gcc7.changes b/cross-arm-none-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-arm-none-gcc7.changes +++ b/cross-arm-none-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-arm-none-gcc7.spec b/cross-arm-none-gcc7.spec index fbfd5bb..9ce9ddb 100644 --- a/cross-arm-none-gcc7.spec +++ b/cross-arm-none-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index fd2c6cd..dc6f610 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index ddbd4c7..4239072 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index a8ff161..44a2afb 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index fd2c6cd..dc6f610 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index 435fbe7..0a8f952 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -181,10 +181,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -375,10 +371,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index 5b543ae..0694257 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index ce986f5..b438044 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index 9c3aa82..bf9d4c3 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index 50c7670..88752dc 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index 74c1f1d..9071649 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index 80ebb94..c24311d 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index 44e9ab2..fdde955 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index ec4cfc7..bc4c055 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index fd2c6cd..dc6f610 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index d51e08a..a59ff88 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -181,10 +181,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -375,10 +371,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index f908b59..8b1fa0c 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index 0df1a0b..d1f7d2b 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index 14ececc..ea0b097 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index 6fa8692..5f6dd44 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index fd2c6cd..dc6f610 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index 5b3b930..e013a39 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -180,10 +180,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # Define the canonical target and host architecture # %%gcc_target_arch is supposed to be the full target triple @@ -374,10 +370,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/gcc.spec.in b/gcc.spec.in index 7a7333e..c30531b 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -363,10 +363,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch # GCC-TESTSUITE-DELETE-BEGIN # SRC-COMMON-END @@ -1167,10 +1163,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index fd2c6cd..dc6f610 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec index f544d71..374acb0 100644 --- a/gcc7-testresults.spec +++ b/gcc7-testresults.spec @@ -377,10 +377,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch Summary: Testsuite results License: SUSE-Public-Domain @@ -556,10 +552,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end diff --git a/gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch b/gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch deleted file mode 100644 index c8839fe..0000000 --- a/gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch +++ /dev/null @@ -1,301 +0,0 @@ -From bceb67fd35ac486e889d325c40f1cee1dc188b3e Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Wed, 27 Oct 2021 07:48:54 -0700 -Subject: [PATCH 1/4] x86: Add -mharden-sls=[none|all|return|indirect-branch] -To: gcc-patches@gcc.gnu.org - -Add -mharden-sls= to mitigate against straight line speculation (SLS) -for function return and indirect branch by adding an INT3 instruction -after function return and indirect branch. - -gcc/ - - PR target/102952 - * config/i386/i386-opts.h (harden_sls): New enum. - * config/i386/i386.c (output_indirect_thunk): Mitigate against - SLS for function return. - (ix86_output_function_return): Likewise. - (ix86_output_jmp_thunk_or_indirect): Mitigate against indirect - branch. - (ix86_output_indirect_jmp): Likewise. - (ix86_output_call_insn): Likewise. - * config/i386/i386.opt: Add -mharden-sls=. - * doc/invoke.texi: Document -mharden-sls=. - -gcc/testsuite/ - - PR target/102952 - * gcc.target/i386/harden-sls-1.c: New test. - * gcc.target/i386/harden-sls-2.c: Likewise. - * gcc.target/i386/harden-sls-3.c: Likewise. - * gcc.target/i386/harden-sls-4.c: Likewise. - * gcc.target/i386/harden-sls-5.c: Likewise. - -(cherry picked from commit 53a643f8568067d7700a9f2facc8ba39974973d3) ---- - gcc/config/i386/i386-opts.h | 13 ++++++++++++ - gcc/config/i386/i386.c | 22 ++++++++++++++------ - gcc/config/i386/i386.opt | 21 +++++++++++++++++++ - gcc/doc/invoke.texi | 10 ++++++++- - gcc/testsuite/gcc.target/i386/harden-sls-1.c | 14 +++++++++++++ - gcc/testsuite/gcc.target/i386/harden-sls-2.c | 14 +++++++++++++ - gcc/testsuite/gcc.target/i386/harden-sls-3.c | 14 +++++++++++++ - gcc/testsuite/gcc.target/i386/harden-sls-4.c | 16 ++++++++++++++ - gcc/testsuite/gcc.target/i386/harden-sls-5.c | 17 +++++++++++++++ - 9 files changed, 134 insertions(+), 7 deletions(-) - create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-1.c - create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-2.c - create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-3.c - create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-4.c - create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-5.c - -diff --git a/gcc/config/i386/i386-opts.h b/gcc/config/i386/i386-opts.h -index efcdc3b1a14..fb2d6ccdd40 100644 ---- a/gcc/config/i386/i386-opts.h -+++ b/gcc/config/i386/i386-opts.h -@@ -112,4 +112,17 @@ enum indirect_branch { - indirect_branch_thunk_extern - }; - -+enum instrument_return { -+ instrument_return_none = 0, -+ instrument_return_call, -+ instrument_return_nop5 -+}; -+ -+enum harden_sls { -+ harden_sls_none = 0, -+ harden_sls_return = 1 << 0, -+ harden_sls_indirect_branch = 1 << 1, -+ harden_sls_all = harden_sls_return | harden_sls_indirect_branch -+}; -+ - #endif -diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index de71f56be6b..7a4dfaa8ab5 100644 ---- a/gcc/config/i386/i386.c -+++ b/gcc/config/i386/i386.c -@@ -12208,6 +12208,8 @@ output_indirect_thunk (bool need_bnd_p, unsigned int regno) - fputs ("\tbnd ret\n", asm_out_file); - else - fputs ("\tret\n", asm_out_file); -+ if ((ix86_harden_sls & harden_sls_return)) -+ fputs ("\tint3\n", asm_out_file); - } - - /* Output a funtion with a call and return thunk for indirect branch. -@@ -28876,6 +28878,8 @@ ix86_output_jmp_thunk_or_indirect (const char *thunk_name, - fprintf (asm_out_file, "\tjmp\t"); - assemble_name (asm_out_file, thunk_name); - putc ('\n', asm_out_file); -+ if ((ix86_harden_sls & harden_sls_indirect_branch)) -+ fputs ("\tint3\n", asm_out_file); - } - else - output_indirect_thunk (need_bnd_p, regno); -@@ -29119,10 +29123,10 @@ ix86_output_indirect_jmp (rtx call_op) - gcc_unreachable (); - - ix86_output_indirect_branch (call_op, "%0", true); -- return ""; - } - else -- return "%!jmp\t%A0"; -+ output_asm_insn ("%!jmp\t%A0", &call_op); -+ return (ix86_harden_sls & harden_sls_indirect_branch) ? "int3" : ""; - } - - /* Output function return. CALL_OP is the jump target. Add a REP -@@ -29163,9 +29167,10 @@ ix86_output_function_return (bool long_p) - } - - if (!long_p || ix86_bnd_prefixed_insn_p (current_output_insn)) -- return "%!ret"; -- -- return "rep%; ret"; -+ output_asm_insn ("%!ret", NULL); -+ else -+ output_asm_insn ("rep%; ret", NULL); -+ return (ix86_harden_sls & harden_sls_return) ? "int3" : ""; - } - - /* Output indirect function return. RET_OP is the function return -@@ -29302,7 +29307,12 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) - if (output_indirect_p && !direct_p) - ix86_output_indirect_branch (call_op, xasm, true); - else -- output_asm_insn (xasm, &call_op); -+ { -+ output_asm_insn (xasm, &call_op); -+ if (!direct_p -+ && (ix86_harden_sls & harden_sls_indirect_branch)) -+ return "int3"; -+ } - return ""; - } - -diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt -index b90da9f89ec..3b25627a24c 100644 ---- a/gcc/config/i386/i386.opt -+++ b/gcc/config/i386/i386.opt -@@ -955,3 +955,24 @@ Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern) - mindirect-branch-register - Target Report Var(ix86_indirect_branch_register) Init(0) - Force indirect call and jump via register. -+ -+mharden-sls= -+Target RejectNegative Joined Enum(harden_sls) Var(ix86_harden_sls) Init(harden_sls_none) -+Generate code to mitigate against straight line speculation. -+ -+Enum -+Name(harden_sls) Type(enum harden_sls) -+Known choices for mitigation against straight line speculation with -mharden-sls=: -+ -+EnumValue -+Enum(harden_sls) String(none) Value(harden_sls_none) -+ -+EnumValue -+Enum(harden_sls) String(return) Value(harden_sls_return) -+ -+EnumValue -+Enum(harden_sls) String(indirect-branch) Value(harden_sls_indirect_branch) -+ -+EnumValue -+Enum(harden_sls) String(all) Value(harden_sls_all) -+ -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 8f279e454b0..b3fe672faea 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -1212,7 +1212,7 @@ See RS/6000 and PowerPC Options. - -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol - -mmitigate-rop -mgeneral-regs-only @gol - -mindirect-branch=@var{choice} -mfunction-return=@var{choice} @gol ---mindirect-branch-register} -+-mindirect-branch-register -mharden-sls=@var{choice} } - - @emph{x86 Windows Options} - @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol -@@ -25743,6 +25743,14 @@ not be reachable in large code model. - @opindex -mindirect-branch-register - Force indirect call and jump via register. - -+@item -mharden-sls=@var{choice} -+@opindex mharden-sls -+Generate code to mitigate against straight line speculation (SLS) with -+@var{choice}. The default is @samp{none} which disables all SLS -+hardening. @samp{return} enables SLS hardening for function return. -+@samp{indirect-branch} enables SLS hardening for indirect branch. -+@samp{all} enables all SLS hardening. -+ - @end table - - These @samp{-m} switches are supported in addition to the above -diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-1.c b/gcc/testsuite/gcc.target/i386/harden-sls-1.c -new file mode 100644 -index 00000000000..6f70dc94a23 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/i386/harden-sls-1.c -@@ -0,0 +1,14 @@ -+/* { dg-do compile } */ -+/* { dg-options "-O2 -mindirect-branch=thunk-extern -mharden-sls=all" } */ -+/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ -+ -+extern void foo (void); -+ -+void -+bar (void) -+{ -+ foo (); -+} -+ -+/* { dg-final { scan-assembler "jmp\[ \t\]+_?foo" } } */ -+/* { dg-final { scan-assembler-not {int3} } } */ -diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-2.c b/gcc/testsuite/gcc.target/i386/harden-sls-2.c -new file mode 100644 -index 00000000000..a7c59078d03 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/i386/harden-sls-2.c -@@ -0,0 +1,14 @@ -+/* { dg-do compile } */ -+/* { dg-options "-O2 -mindirect-branch=thunk-extern -mharden-sls=all" } */ -+/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ -+ -+extern void (*fptr) (void); -+ -+void -+foo (void) -+{ -+ fptr (); -+} -+ -+/* { dg-final { scan-assembler "jmp\[ \t\]+_?__x86_indirect_thunk_(r|e)ax" } } */ -+/* { dg-final { scan-assembler-times "int3" 1 } } */ -diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-3.c b/gcc/testsuite/gcc.target/i386/harden-sls-3.c -new file mode 100644 -index 00000000000..1a6056b6d7b ---- /dev/null -+++ b/gcc/testsuite/gcc.target/i386/harden-sls-3.c -@@ -0,0 +1,14 @@ -+/* { dg-do compile } */ -+/* { dg-options "-O2 -mindirect-branch=thunk -mharden-sls=all" } */ -+/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ -+ -+extern void (*fptr) (void); -+ -+void -+foo (void) -+{ -+ fptr (); -+} -+ -+/* { dg-final { scan-assembler "jmp\[ \t\]+_?__x86_indirect_thunk_(r|e)ax" } } */ -+/* { dg-final { scan-assembler-times "int3" 2 } } */ -diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-4.c b/gcc/testsuite/gcc.target/i386/harden-sls-4.c -new file mode 100644 -index 00000000000..f70dd1379d3 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/i386/harden-sls-4.c -@@ -0,0 +1,16 @@ -+/* { dg-do compile } */ -+/* { dg-options "-O2 -mindirect-branch=keep -mharden-sls=all" } */ -+/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ -+ -+extern void (*fptr) (void); -+ -+void -+foo (void) -+{ -+ fptr (); -+} -+ -+/* { dg-final { scan-assembler "jmp\[ \t\]+\\*_?fptr" { target { ! x32 } } } } */ -+/* { dg-final { scan-assembler "movl\[ \t\]+fptr\\(%rip\\), %eax" { target x32 } } } */ -+/* { dg-final { scan-assembler "jmp\[ \t\]+\\*%rax" { target x32 } } } */ -+/* { dg-final { scan-assembler-times "int3" 1 } } */ -diff --git a/gcc/testsuite/gcc.target/i386/harden-sls-5.c b/gcc/testsuite/gcc.target/i386/harden-sls-5.c -new file mode 100644 -index 00000000000..613c44c6f82 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/i386/harden-sls-5.c -@@ -0,0 +1,17 @@ -+/* { dg-do compile } */ -+/* { dg-options "-O2 -mno-indirect-branch-register -mfunction-return=keep -mindirect-branch=thunk-extern -mharden-sls=return" } */ -+/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ -+ -+typedef void (*dispatch_t)(long offset); -+ -+dispatch_t dispatch; -+ -+int -+male_indirect_jump (long offset) -+{ -+ dispatch(offset); -+ return 0; -+} -+ -+/* { dg-final { scan-assembler-times "ret" 1 } } */ -+/* { dg-final { scan-assembler-times "int3" 1 } } */ --- -2.34.1 - diff --git a/gcc7-x86-Add-mindirect-branch-cs-prefix.patch b/gcc7-x86-Add-mindirect-branch-cs-prefix.patch deleted file mode 100644 index cebabc2..0000000 --- a/gcc7-x86-Add-mindirect-branch-cs-prefix.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 0d8051b52f6c235df9e7eb5f1fabfd8ef3624ec6 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Wed, 27 Oct 2021 06:27:15 -0700 -Subject: [PATCH 2/4] x86: Add -mindirect-branch-cs-prefix -To: gcc-patches@gcc.gnu.org - -Add -mindirect-branch-cs-prefix to add CS prefix to call and jmp to -indirect thunk with branch target in r8-r15 registers so that the call -and jmp instruction length is 6 bytes to allow them to be replaced with -"lfence; call *%r8-r15" or "lfence; jmp *%r8-r15" at run-time. - -gcc/ - - PR target/102952 - * config/i386/i386.c (ix86_output_jmp_thunk_or_indirect): Emit - CS prefix for -mindirect-branch-cs-prefix. - (ix86_output_indirect_branch_via_reg): Likewise. - * config/i386/i386.opt: Add -mindirect-branch-cs-prefix. - * doc/invoke.texi: Document -mindirect-branch-cs-prefix. - -gcc/testsuite/ - - PR target/102952 - * gcc.target/i386/indirect-thunk-cs-prefix-1.c: New test. - * gcc.target/i386/indirect-thunk-cs-prefix-2.c: Likewise. - -(cherry picked from commit 2196a681d7810ad8b227bf983f38ba716620545e) ---- - gcc/config/i386/i386.c | 6 ++++++ - gcc/config/i386/i386.opt | 4 ++++ - gcc/doc/invoke.texi | 10 +++++++++- - .../gcc.target/i386/indirect-thunk-cs-prefix-1.c | 14 ++++++++++++++ - .../gcc.target/i386/indirect-thunk-cs-prefix-2.c | 15 +++++++++++++++ - 5 files changed, 48 insertions(+), 1 deletion(-) - create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c - create mode 100644 gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c - -diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index 7a4dfaa8ab5..10b6f710d5a 100644 ---- a/gcc/config/i386/i386.c -+++ b/gcc/config/i386/i386.c -@@ -28872,6 +28872,9 @@ ix86_output_jmp_thunk_or_indirect (const char *thunk_name, - { - if (thunk_name != NULL) - { -+ if (REX_INT_REGNO_P (regno) -+ && ix86_indirect_branch_cs_prefix) -+ fprintf (asm_out_file, "\tcs\n"); - if (need_bnd_p) - fprintf (asm_out_file, "\tbnd jmp\t"); - else -@@ -28930,6 +28933,9 @@ ix86_output_indirect_branch_via_reg (rtx call_op, bool sibcall_p) - { - if (thunk_name != NULL) - { -+ if (REX_INT_REGNO_P (regno) -+ && ix86_indirect_branch_cs_prefix) -+ fprintf (asm_out_file, "\tcs\n"); - if (need_bnd_p) - fprintf (asm_out_file, "\tbnd call\t"); - else -diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt -index 3b25627a24c..16dea090995 100644 ---- a/gcc/config/i386/i386.opt -+++ b/gcc/config/i386/i386.opt -@@ -952,6 +952,10 @@ Enum(indirect_branch) String(thunk-inline) Value(indirect_branch_thunk_inline) - EnumValue - Enum(indirect_branch) String(thunk-extern) Value(indirect_branch_thunk_extern) - -+mindirect-branch-cs-prefix -+Target Var(ix86_indirect_branch_cs_prefix) Init(0) -+Add CS prefix to call and jmp to indirect thunk with branch target in r8-r15 registers. -+ - mindirect-branch-register - Target Report Var(ix86_indirect_branch_register) Init(0) - Force indirect call and jump via register. -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index b3fe672faea..ca3dc7ee636 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -1212,7 +1212,8 @@ See RS/6000 and PowerPC Options. - -malign-data=@var{type} -mstack-protector-guard=@var{guard} @gol - -mmitigate-rop -mgeneral-regs-only @gol - -mindirect-branch=@var{choice} -mfunction-return=@var{choice} @gol ---mindirect-branch-register -mharden-sls=@var{choice} } -+-mindirect-branch-register -mharden-sls=@var{choice} @gol -+-mindirect-branch-cs-prefix} - - @emph{x86 Windows Options} - @gccoptlist{-mconsole -mcygwin -mno-cygwin -mdll @gol -@@ -25751,6 +25752,13 @@ hardening. @samp{return} enables SLS hardening for function return. - @samp{indirect-branch} enables SLS hardening for indirect branch. - @samp{all} enables all SLS hardening. - -+@item -mindirect-branch-cs-prefix -+@opindex mindirect-branch-cs-prefix -+Add CS prefix to call and jmp to indirect thunk with branch target in -+r8-r15 registers so that the call and jmp instruction length is 6 bytes -+to allow them to be replaced with @samp{lfence; call *%r8-r15} or -+@samp{lfence; jmp *%r8-r15} at run-time. -+ - @end table - - These @samp{-m} switches are supported in addition to the above -diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c -new file mode 100644 -index 00000000000..db2f3416823 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-1.c -@@ -0,0 +1,14 @@ -+/* { dg-do compile { target { ! ia32 } } } */ -+/* { dg-options "-O2 -ffixed-rax -ffixed-rbx -ffixed-rcx -ffixed-rdx -ffixed-rdi -ffixed-rsi -mindirect-branch-cs-prefix -mindirect-branch=thunk-extern" } */ -+/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ -+ -+extern void (*fptr) (void); -+ -+void -+foo (void) -+{ -+ fptr (); -+} -+ -+/* { dg-final { scan-assembler-times "jmp\[ \t\]+_?__x86_indirect_thunk_r\[0-9\]+" 1 } } */ -+/* { dg-final { scan-assembler-times "\tcs" 1 } } */ -diff --git a/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c -new file mode 100644 -index 00000000000..adfc39a49d4 ---- /dev/null -+++ b/gcc/testsuite/gcc.target/i386/indirect-thunk-cs-prefix-2.c -@@ -0,0 +1,15 @@ -+/* { dg-do compile { target { ! ia32 } } } */ -+/* { dg-options "-O2 -ffixed-rax -ffixed-rbx -ffixed-rcx -ffixed-rdx -ffixed-rdi -ffixed-rsi -mindirect-branch-cs-prefix -mindirect-branch=thunk-extern" } */ -+/* { dg-additional-options "-fno-pic" { target { ! *-*-darwin* } } } */ -+ -+extern void (*bar) (void); -+ -+int -+foo (void) -+{ -+ bar (); -+ return 0; -+} -+ -+/* { dg-final { scan-assembler-times "call\[ \t\]+_?__x86_indirect_thunk_r\[0-9\]+" 1 } } */ -+/* { dg-final { scan-assembler-times "\tcs" 1 } } */ --- -2.34.1 - diff --git a/gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch b/gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch deleted file mode 100644 index fdf9645..0000000 --- a/gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch +++ /dev/null @@ -1,54 +0,0 @@ -Testcase elided because -fcf-protection is not supported in GCC 7. - -From 91862c217c17bb0167f9b89d4ff706fc6e49d852 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Wed, 5 Jan 2022 18:04:21 -0800 -Subject: [PATCH 4/4] x86: Generate INT3 for __builtin_eh_return -To: gcc-patches@gcc.gnu.org - -Generate INT3 after indirect jmp in exception return for -fcf-protection -with -mharden-sls=indirect-jmp. - -gcc/ - - PR target/103925 - * config/i386/i386.c (ix86_output_indirect_function_return): - Generate INT3 after indirect jmp for -mharden-sls=indirect-jmp. - -gcc/testsuite/ - - PR target/103925 - * gcc.target/i386/harden-sls-6.c: New test. - -(cherry picked from commit c2e5c4feed32c808591b5278f680bbabe63eb225) ---- - gcc/config/i386/i386.c | 9 ++++++--- - gcc/testsuite/gcc.target/i386/harden-sls-6.c | 18 ++++++++++++++++++ - 2 files changed, 24 insertions(+), 3 deletions(-) - create mode 100644 gcc/testsuite/gcc.target/i386/harden-sls-6.c - -diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index 83d59941acf..6e7377d2b7f 100644 ---- a/gcc/config/i386/i386.c -+++ b/gcc/config/i386/i386.c -@@ -29221,11 +29221,14 @@ ix86_output_indirect_function_return (rtx ret_op) - } - else - output_indirect_thunk (need_bnd_p, regno); -- -- return ""; - } - else -- return "%!jmp\t%A0"; -+ { -+ output_asm_insn ("%!jmp\t%A0", &ret_op); -+ if (ix86_harden_sls & harden_sls_indirect_jmp) -+ fputs ("\tint3\n", asm_out_file); -+ } -+ return ""; - } - - /* Split simple return with popping POPC bytes from stack to indirect --- -2.34.1 - diff --git a/gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch b/gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch deleted file mode 100644 index fc23b5e..0000000 --- a/gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 2a67bbb0597001e42e37e2ea6eac5721df703eb4 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Wed, 5 Jan 2022 16:33:16 -0800 -Subject: [PATCH 3/4] x86: Rename -harden-sls=indirect-branch to - -harden-sls=indirect-jmp -To: gcc-patches@gcc.gnu.org - -Indirect branch also includes indirect call instructions. Rename --harden-sls=indirect-branch to -harden-sls=indirect-jmp to match its -intended behavior. - - PR target/102952 - * config/i386/i386-opts.h (harden_sls): Replace - harden_sls_indirect_branch with harden_sls_indirect_jmp. - * config/i386/i386.c (ix86_output_jmp_thunk_or_indirect): - Likewise. - (ix86_output_indirect_jmp): Likewise. - (ix86_output_call_insn): Likewise. - * config/i386/i386.opt: Replace indirect-branch with - indirect-jmp. Replace harden_sls_indirect_branch with - harden_sls_indirect_jmp. - * doc/invoke.texi (-harden-sls=): Replace indirect-branch with - indirect-jmp. - -(cherry picked from commit ed8060950c64f2e449aaf90e438aa26d0d9d0b31) ---- - gcc/config/i386/i386-opts.h | 4 ++-- - gcc/config/i386/i386.c | 6 +++--- - gcc/config/i386/i386.opt | 2 +- - gcc/doc/invoke.texi | 4 ++-- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/gcc/config/i386/i386-opts.h b/gcc/config/i386/i386-opts.h -index fb2d6ccdd40..1daa73b190b 100644 ---- a/gcc/config/i386/i386-opts.h -+++ b/gcc/config/i386/i386-opts.h -@@ -121,8 +121,8 @@ enum instrument_return { - enum harden_sls { - harden_sls_none = 0, - harden_sls_return = 1 << 0, -- harden_sls_indirect_branch = 1 << 1, -- harden_sls_all = harden_sls_return | harden_sls_indirect_branch -+ harden_sls_indirect_jmp = 1 << 1, -+ harden_sls_all = harden_sls_return | harden_sls_indirect_jmp - }; - - #endif -diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index 10b6f710d5a..83d59941acf 100644 ---- a/gcc/config/i386/i386.c -+++ b/gcc/config/i386/i386.c -@@ -28881,7 +28881,7 @@ ix86_output_jmp_thunk_or_indirect (const char *thunk_name, - fprintf (asm_out_file, "\tjmp\t"); - assemble_name (asm_out_file, thunk_name); - putc ('\n', asm_out_file); -- if ((ix86_harden_sls & harden_sls_indirect_branch)) -+ if ((ix86_harden_sls & harden_sls_indirect_jmp)) - fputs ("\tint3\n", asm_out_file); - } - else -@@ -29132,7 +29132,7 @@ ix86_output_indirect_jmp (rtx call_op) - } - else - output_asm_insn ("%!jmp\t%A0", &call_op); -- return (ix86_harden_sls & harden_sls_indirect_branch) ? "int3" : ""; -+ return (ix86_harden_sls & harden_sls_indirect_jmp) ? "int3" : ""; - } - - /* Output function return. CALL_OP is the jump target. Add a REP -@@ -29316,7 +29316,7 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op) - { - output_asm_insn (xasm, &call_op); - if (!direct_p -- && (ix86_harden_sls & harden_sls_indirect_branch)) -+ && (ix86_harden_sls & harden_sls_indirect_jmp)) - return "int3"; - } - return ""; -diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt -index 16dea090995..8093f0c0c7f 100644 ---- a/gcc/config/i386/i386.opt -+++ b/gcc/config/i386/i386.opt -@@ -975,7 +975,7 @@ EnumValue - Enum(harden_sls) String(return) Value(harden_sls_return) - - EnumValue --Enum(harden_sls) String(indirect-branch) Value(harden_sls_indirect_branch) -+Enum(harden_sls) String(indirect-jmp) Value(harden_sls_indirect_jmp) - - EnumValue - Enum(harden_sls) String(all) Value(harden_sls_all) -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index ca3dc7ee636..7a9a7084884 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -25748,8 +25748,8 @@ Force indirect call and jump via register. - @opindex mharden-sls - Generate code to mitigate against straight line speculation (SLS) with - @var{choice}. The default is @samp{none} which disables all SLS --hardening. @samp{return} enables SLS hardening for function return. --@samp{indirect-branch} enables SLS hardening for indirect branch. -+hardening. @samp{return} enables SLS hardening for function returns. -+@samp{indirect-jmp} enables SLS hardening for indirect jumps. - @samp{all} enables all SLS hardening. - - @item -mindirect-branch-cs-prefix --- -2.34.1 - diff --git a/gcc7.changes b/gcc7.changes index fd2c6cd..dc6f610 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -21,15 +21,6 @@ Fri Mar 11 07:10:31 UTC 2022 - Richard Biener - Add gcc7-ada-Target_Name.patch to adjust gnats idea of the target, fixing the build of gprbuild. [bsc#1196861] -------------------------------------------------------------------- -Tue Mar 8 10:45:36 UTC 2022 - Richard Biener - -- Add gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch, - gcc7-x86-Add-mindirect-branch-cs-prefix.patch, - gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch and - gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch to - backport -mharden-sls support. - ------------------------------------------------------------------- Mon Feb 28 07:21:45 UTC 2022 - Richard Biener diff --git a/gcc7.spec b/gcc7.spec index cd62847..43e5803 100644 --- a/gcc7.spec +++ b/gcc7.spec @@ -356,10 +356,6 @@ Patch123: gcc7-pfe-0019-Backport-Use-the-section-flag-o-for-__patchable_fu Patch124: gcc7-pfe-0020-Backport-varasm-Fix-up-__patchable_function_entries-.patch Patch125: gcc7-pfe-0021-Backport-rs6000-Avoid-fpatchable-function-entry-regr.patch Patch126: gcc7-pfe-0022-Fix-unwinding-issues-when-pfe-is-enabled.patch -Patch127: gcc7-x86-Add-mharden-sls-none-all-return-indirect-branch.patch -Patch128: gcc7-x86-Add-mindirect-branch-cs-prefix.patch -Patch129: gcc7-x86-Rename-harden-sls-indirect-branch-to-harden-sls-.patch -Patch130: gcc7-x86-Generate-INT3-for-__builtin_eh_return.patch License: GPL-3.0-or-later Summary: The GNU C Compiler and Support Files @@ -1893,10 +1889,6 @@ ln -s nvptx-newlib/newlib . %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -%patch130 -p1 #test patching end