summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-05-17 15:09:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-18 23:52:54 +0100
commit9b0221fd8bc310e5b29f46450fcb9e8526ed837d (patch)
treef1f557d9e3c8d8a3d3f7f9638e762d3cb31ee7ff /meta
parent87635fa01c45b06126e20d463e9a393bf80ecfaa (diff)
downloadpoky-9b0221fd8bc310e5b29f46450fcb9e8526ed837d.tar.gz
gcc: Refresh patch to fix patch fuzz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch10
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
index edca9e3ca4..9c616d24d0 100644
--- a/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
+++ b/meta/recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
@@ -22,12 +22,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 gcc/config/rs6000/linux64.h | 10 ++++++++++ 22 gcc/config/rs6000/linux64.h | 10 ++++++++++
23 3 files changed, 27 insertions(+) 23 3 files changed, 27 insertions(+)
24 24
25diff --git a/gcc/config/linux.h b/gcc/config/linux.h
26index 87efc5f69fe..3c7b7c538b9 100644
27--- a/gcc/config/linux.h 25--- a/gcc/config/linux.h
28+++ b/gcc/config/linux.h 26+++ b/gcc/config/linux.h
29@@ -195,6 +195,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see 27@@ -203,6 +203,13 @@ see the files COPYING3 and COPYING.RUNTI
30 { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ 28 { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 }, \
31 { 0, 0, 0, 0, 0, 0 } \ 29 { 0, 0, 0, 0, 0, 0 } \
32 } 30 }
33+#ifdef TARGET_LIBC_PROVIDES_SSP 31+#ifdef TARGET_LIBC_PROVIDES_SSP
@@ -40,8 +38,6 @@ index 87efc5f69fe..3c7b7c538b9 100644
40 #endif 38 #endif
41 39
42 #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ 40 #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
43diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
44index 47c9d9ac0b6..d065f88b377 100644
45--- a/gcc/config/rs6000/linux.h 41--- a/gcc/config/rs6000/linux.h
46+++ b/gcc/config/rs6000/linux.h 42+++ b/gcc/config/rs6000/linux.h
47@@ -94,6 +94,16 @@ 43@@ -94,6 +94,16 @@
@@ -61,8 +57,6 @@ index 47c9d9ac0b6..d065f88b377 100644
61 #undef LINK_OS_LINUX_SPEC 57 #undef LINK_OS_LINUX_SPEC
62 #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ 58 #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \
63 %{!static-pie: \ 59 %{!static-pie: \
64diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
65index a11e01faa3d..ce464f3626b 100644
66--- a/gcc/config/rs6000/linux64.h 60--- a/gcc/config/rs6000/linux64.h
67+++ b/gcc/config/rs6000/linux64.h 61+++ b/gcc/config/rs6000/linux64.h
68@@ -369,6 +369,16 @@ extern int dot_symbols; 62@@ -369,6 +369,16 @@ extern int dot_symbols;