diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-10-14 08:48:57 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-14 07:55:54 -0700 |
commit | 49b2fafe0af19d41d5ab9bb1e8a8194258e3e92d (patch) | |
tree | be8ae458684a2e3a72bed089d129bd5d679a9613 /meta/recipes-devtools/gcc/gcc-6.4/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch | |
parent | db0b3dbc3db1ebdc181cabb758958e501eef2367 (diff) | |
download | poky-49b2fafe0af19d41d5ab9bb1e8a8194258e3e92d.tar.gz |
gcc6: Upgrade to 6.4
(From OE-Core rev: 02d2a14333b3cbc8e6acf74245f3db6b6b94c91b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 7874fa86cb583fe6a178b95ead09430486197197)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-6.4/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-6.4/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-6.4/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-6.4/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch new file mode 100644 index 0000000000..29b7ce72d2 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-6.4/0041-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch | |||
@@ -0,0 +1,87 @@ | |||
1 | From 210f6b3b82084cc756e02b8bc12f909a43b14ee8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 27 Jun 2017 18:10:54 -0700 | ||
4 | Subject: [PATCH 40/49] Add ssp_nonshared to link commandline for musl targets | ||
5 | |||
6 | when -fstack-protector options are enabled we need to | ||
7 | link with ssp_shared on musl since it does not provide | ||
8 | the __stack_chk_fail_local() so essentially it provides | ||
9 | libssp but not libssp_nonshared something like | ||
10 | TARGET_LIBC_PROVIDES_SSP_BUT_NOT_SSP_NONSHARED | ||
11 | where-as for glibc the needed symbols | ||
12 | are already present in libc_nonshared library therefore | ||
13 | we do not need any library helper on glibc based systems | ||
14 | but musl needs the libssp_noshared from gcc | ||
15 | |||
16 | Upstream-Status: Pending | ||
17 | |||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | --- | ||
20 | gcc/config/linux.h | 7 +++++++ | ||
21 | gcc/config/rs6000/linux.h | 10 ++++++++++ | ||
22 | gcc/config/rs6000/linux64.h | 10 ++++++++++ | ||
23 | 3 files changed, 27 insertions(+) | ||
24 | |||
25 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | ||
26 | index 2e683d0c430..1b4df798671 100644 | ||
27 | --- a/gcc/config/linux.h | ||
28 | +++ b/gcc/config/linux.h | ||
29 | @@ -182,6 +182,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | ||
30 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ | ||
31 | { 0, 0, 0, 0, 0, 0 } \ | ||
32 | } | ||
33 | +#ifdef TARGET_LIBC_PROVIDES_SSP | ||
34 | +#undef LINK_SSP_SPEC | ||
35 | +#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ | ||
36 | + "|fstack-protector-strong|fstack-protector-explicit" \ | ||
37 | + ":-lssp_nonshared}" | ||
38 | +#endif | ||
39 | + | ||
40 | #endif | ||
41 | |||
42 | #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ | ||
43 | diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h | ||
44 | index 684afd6c190..22cfa391b89 100644 | ||
45 | --- a/gcc/config/rs6000/linux.h | ||
46 | +++ b/gcc/config/rs6000/linux.h | ||
47 | @@ -91,6 +91,16 @@ | ||
48 | " -m elf32ppclinux") | ||
49 | #endif | ||
50 | |||
51 | +/* link libssp_nonshared.a with musl */ | ||
52 | +#if DEFAULT_LIBC == LIBC_MUSL | ||
53 | +#ifdef TARGET_LIBC_PROVIDES_SSP | ||
54 | +#undef LINK_SSP_SPEC | ||
55 | +#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ | ||
56 | + "|fstack-protector-strong|fstack-protector-explicit" \ | ||
57 | + ":-lssp_nonshared}" | ||
58 | +#endif | ||
59 | +#endif | ||
60 | + | ||
61 | #undef LINK_OS_LINUX_SPEC | ||
62 | #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ | ||
63 | %{rdynamic:-export-dynamic} \ | ||
64 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h | ||
65 | index 3b00ec0fcf0..8371f8d7b6b 100644 | ||
66 | --- a/gcc/config/rs6000/linux64.h | ||
67 | +++ b/gcc/config/rs6000/linux64.h | ||
68 | @@ -465,6 +465,16 @@ extern int dot_symbols; | ||
69 | " -m elf64ppc") | ||
70 | #endif | ||
71 | |||
72 | +/* link libssp_nonshared.a with musl */ | ||
73 | +#if DEFAULT_LIBC == LIBC_MUSL | ||
74 | +#ifdef TARGET_LIBC_PROVIDES_SSP | ||
75 | +#undef LINK_SSP_SPEC | ||
76 | +#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ | ||
77 | + "|fstack-protector-strong|fstack-protector-explicit" \ | ||
78 | + ":-lssp_nonshared}" | ||
79 | +#endif | ||
80 | +#endif | ||
81 | + | ||
82 | #define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \ | ||
83 | %{rdynamic:-export-dynamic} \ | ||
84 | -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}} \ | ||
85 | -- | ||
86 | 2.13.2 | ||
87 | |||