rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 886638 from home:michael-chang:branches:Base:System

Browse Source 
- Fix build error on armv6/armv7 (bsc#1184712)
  * 0001-emu-fix-executable-stack-marking.patch

OBS-URL: https://build.opensuse.org/request/show/886638
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=381
This commit is contained in:
Michael Chang 2021-04-21 09:28:04 +00:00 committed by Git OBS Bridge
parent fde9285bc1
commit f58f445591
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0001-emu-fix-executable-stack-marking.patch
View File

@ -40,34 +40,31 @@ Signed-off-by: Michael Chang <mchang@suse.com>
grub-core/lib/setjmp.S | 4 ++++ grub-core/lib/setjmp.S | 4 ++++
2 files changed, 9 insertions(+) 2 files changed, 9 insertions(+)
diff --git a/grub-core/kern/emu/cache_s.S b/grub-core/kern/emu/cache_s.S Index: grub-2.04/grub-core/kern/emu/cache_s.S
index 7bb1e1441..fca85c69e 100644 ===================================================================
--- a/grub-core/kern/emu/cache_s.S --- grub-2.04.orig/grub-core/kern/emu/cache_s.S
+++ b/grub-core/kern/emu/cache_s.S +++ grub-2.04/grub-core/kern/emu/cache_s.S
@@ -2,6 +2,11 @@ @@ -2,6 +2,11 @@
#error "This source is only meant for grub-emu platform" #error "This source is only meant for grub-emu platform"
#endif #endif
+/* An executable stack is not required for these functions */ +/* An executable stack is not required for these functions */
+#if defined (__linux__) && defined (__ELF__) +#if defined (__linux__) && defined (__ELF__)
+.section .note.GNU-stack,"",@progbits +.section .note.GNU-stack,"",%progbits
+#endif +#endif
+ +
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
/* Nothing is necessary. */ /* Nothing is necessary. */
#elif defined(__sparc__) #elif defined(__sparc__)
diff --git a/grub-core/lib/setjmp.S b/grub-core/lib/setjmp.S Index: grub-2.04/grub-core/lib/setjmp.S
index a37467760..16f676368 100644 ===================================================================
--- a/grub-core/lib/setjmp.S --- grub-2.04.orig/grub-core/lib/setjmp.S
+++ b/grub-core/lib/setjmp.S +++ grub-2.04/grub-core/lib/setjmp.S
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+/* An executable stack is not required for these functions */ +/* An executable stack is not required for these functions */
+#if defined (__linux__) && defined (__ELF__) +#if defined (__linux__) && defined (__ELF__)
+.section .note.GNU-stack,"",@progbits +.section .note.GNU-stack,"",%progbits
+#endif +#endif
#if defined(__i386__) #if defined(__i386__)
#include "./i386/setjmp.S" #include "./i386/setjmp.S"
#elif defined(__x86_64__) #elif defined(__x86_64__)
--
2.30.0

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 19 09:53:43 UTC 2021 - Michael Chang <mchang@suse.com>
- Fix build error on armv6/armv7 (bsc#1184712)
* 0001-emu-fix-executable-stack-marking.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 8 12:32:52 UTC 2021 - Michael Chang <mchang@suse.com> Thu Apr 8 12:32:52 UTC 2021 - Michael Chang <mchang@suse.com>