diff options
Diffstat (limited to 'meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch')
-rw-r--r-- | meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch b/meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch index 535f864a..ecbf1f79 100644 --- a/meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch +++ b/meta-microblaze/recipes-core/systemd/files/microblaze-disable-stack-protector.patch | |||
@@ -5,20 +5,20 @@ Microblaze does not support stack-protector: | |||
5 | 5 | ||
6 | Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> | 6 | Signed-off-by: Mark Hatle <mark.hatle@xilinx.com> |
7 | 7 | ||
8 | diff --git a/meson.build b/meson.build | 8 | Index: git/meson.build |
9 | index 738879eb21..06ea3e389a 100644 | 9 | =================================================================== |
10 | --- a/meson.build | 10 | --- git.orig/meson.build |
11 | +++ b/meson.build | 11 | +++ git/meson.build |
12 | @@ -371,7 +371,6 @@ endif | 12 | @@ -403,7 +403,6 @@ possible_link_flags = [ |
13 | possible_link_flags = [ | 13 | '-Wl,--fatal-warnings', |
14 | '-Wl,-z,relro', | ||
15 | '-Wl,-z,now', | 14 | '-Wl,-z,now', |
15 | '-Wl,-z,relro', | ||
16 | - '-fstack-protector', | 16 | - '-fstack-protector', |
17 | ] | 17 | ] |
18 | 18 | ||
19 | if cc.get_id() == 'clang' | 19 | if get_option('b_sanitize') == 'none' |
20 | @@ -388,8 +387,6 @@ possible_cc_flags = possible_common_cc_flags + [ | 20 | @@ -423,8 +422,6 @@ possible_cc_flags = possible_common_cc_f |
21 | '-ffast-math', | 21 | '-fdiagnostics-show-option', |
22 | '-fno-common', | 22 | '-fno-common', |
23 | '-fno-strict-aliasing', | 23 | '-fno-strict-aliasing', |
24 | - '-fstack-protector', | 24 | - '-fstack-protector', |