mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

gcc: Refresh patch to fix patch fuzz

Browse Source 
This is due to previous patches editing common files from this patch

Fixes
ERROR: gcc-source-11.1.0-11.1.0-r0 do_patch: Fuzz detected:

Applying patch 0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
patching file gcc/config/linux.h
Hunk #1 succeeded at 203 with fuzz 1 (offset 8 lines).
patching file gcc/config/rs6000/linux.h
patching file gcc/config/rs6000/linux64.h

(From OE-Core rev: d8c3f3a1872a41cc4788ff3d9f42c13debedabd2)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2021-05-17 15:09:15 -07:00
committed by Richard Purdie
parent 87635fa01c
commit 9b0221fd8b
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
View File

@@ -22,12 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
gcc/config/rs6000/linux64.h | 10 ++++++++++ gcc/config/rs6000/linux64.h | 10 ++++++++++
3 files changed, 27 insertions(+) 3 files changed, 27 insertions(+)
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
index 87efc5f69fe..3c7b7c538b9 100644
--- a/gcc/config/linux.h --- a/gcc/config/linux.h
+++ b/gcc/config/linux.h +++ b/gcc/config/linux.h
@@ -195,6 +195,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -203,6 +203,13 @@ see the files COPYING3 and COPYING.RUNTI
{ GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 }, \
{ 0, 0, 0, 0, 0, 0 } \ { 0, 0, 0, 0, 0, 0 } \
} }
+#ifdef TARGET_LIBC_PROVIDES_SSP +#ifdef TARGET_LIBC_PROVIDES_SSP
@@ -40,8 +38,6 @@ index 87efc5f69fe..3c7b7c538b9 100644
#endif #endif
#if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
index 47c9d9ac0b6..d065f88b377 100644
--- a/gcc/config/rs6000/linux.h --- a/gcc/config/rs6000/linux.h
+++ b/gcc/config/rs6000/linux.h +++ b/gcc/config/rs6000/linux.h
@@ -94,6 +94,16 @@ @@ -94,6 +94,16 @@
@@ -61,8 +57,6 @@ index 47c9d9ac0b6..d065f88b377 100644
#undef LINK_OS_LINUX_SPEC #undef LINK_OS_LINUX_SPEC
#define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \
%{!static-pie: \ %{!static-pie: \
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
index a11e01faa3d..ce464f3626b 100644
--- a/gcc/config/rs6000/linux64.h --- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h
@@ -369,6 +369,16 @@ extern int dot_symbols; @@ -369,6 +369,16 @@ extern int dot_symbols;