forked from pool/grub2
34d48ebe82
- Build GRUB2 for ppc64le as LittleEndian and 64bit - Fix timeout issue on ppc64le (bnc#869166) - Add powerpc-utils requires to grub2-powerpc-ieee1275 - added patches: * grub2-ppc64-build-ppc64-32bit.patch * grub2-ppc64-qemu.patch * grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch * grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch * grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch * grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch * grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch * grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch * grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch * grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch * grub2-ppc64le-09-Add-powerpc64-types.patch * grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch * grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch * grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch * grub2-ppc64le-13-Fix-powerpc-setjmp-longjmp-64bit-issues.patch * grub2-ppc64le-14-Add-powerpc64-ieee1275-trampoline.patch * grub2-ppc64le-15-Add-64bit-support-to-powerpc-startup-code.patch * grub2-ppc64le-16-Add-grub_dl_find_section_addr.patch * grub2-ppc64le-17-Add-ppc64-relocations.patch * grub2-ppc64le-18-ppc64-doesn-t-need-libgcc-routines.patch * grub2-ppc64le-19-Use-FUNC_START-FUNC_END-for-powerpc-function-definit.patch * grub2-ppc64le-20-.TOC.-symbol-is-special-in-ppc64le-.-It-maps-to-the-.patch * grub2-ppc64le-21-the-.toc-section-in-powerpc64le-modules-are-sometime.patch * grub2-ppc64le-22-all-parameter-to-firmware-calls-should-to-be-BigEndi.patch * grub2-ppc64le-23-grub-segfaults-if-initrd-is-specified-before-specify.patch * grub2-ppc64le-timeout.patch (forwarded request 229655 from k0da) OBS-URL: https://build.opensuse.org/request/show/229673 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=89
77 lines
1.8 KiB
Diff
77 lines
1.8 KiB
Diff
From d63aa12f89bfd5e0cc11983601323694e9a24be7 Mon Sep 17 00:00:00 2001
|
|
From: Anton Blanchard <anton@samba.org>
|
|
Date: Wed, 29 Jan 2014 10:52:28 +1100
|
|
Subject: [PATCH 19/23] Use FUNC_START/FUNC_END
|
|
|
|
Use FUNC_START/FUNC_END for powerpc function definitions
|
|
|
|
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
|
|
From: Anton Blanchard <anton@samba.org>
|
|
---
|
|
grub-core/kern/powerpc/cache.S | 6 ++++--
|
|
grub-core/lib/powerpc/setjmp.S | 8 +++++---
|
|
2 files changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/powerpc/cache.S b/grub-core/kern/powerpc/cache.S
|
|
index d85e68d..82f10f8 100644
|
|
--- a/grub-core/kern/powerpc/cache.S
|
|
+++ b/grub-core/kern/powerpc/cache.S
|
|
@@ -17,10 +17,12 @@
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
+#include <ppc-asm.h>
|
|
+
|
|
.text
|
|
|
|
.align 2
|
|
- .globl grub_arch_sync_caches
|
|
-grub_arch_sync_caches:
|
|
+FUNC_START(grub_arch_sync_caches)
|
|
#include "cache_flush.S"
|
|
blr
|
|
+FUNC_END(grub_arch_sync_caches)
|
|
diff --git a/grub-core/lib/powerpc/setjmp.S b/grub-core/lib/powerpc/setjmp.S
|
|
index 51fcae9..6fdd60e 100644
|
|
--- a/grub-core/lib/powerpc/setjmp.S
|
|
+++ b/grub-core/lib/powerpc/setjmp.S
|
|
@@ -18,6 +18,7 @@
|
|
|
|
#include <grub/symbol.h>
|
|
#include <grub/dl.h>
|
|
+#include <ppc-asm.h>
|
|
|
|
.file "setjmp.S"
|
|
|
|
@@ -38,7 +39,7 @@ GRUB_MOD_LICENSE "GPLv3+"
|
|
/*
|
|
* int grub_setjmp (grub_jmp_buf env)
|
|
*/
|
|
-FUNCTION(grub_setjmp)
|
|
+FUNC_START(grub_setjmp)
|
|
STORE 1, 0(3)
|
|
STORE 14, 1*SZ_LONG(3)
|
|
STORE 15, 2*SZ_LONG(3)
|
|
@@ -64,11 +65,12 @@ FUNCTION(grub_setjmp)
|
|
STORE 4, 20*SZ_LONG(3)
|
|
li 3, 0
|
|
blr
|
|
+FUNC_END(grub_setjmp)
|
|
|
|
/*
|
|
* int grub_longjmp (grub_jmp_buf env, int val)
|
|
*/
|
|
-FUNCTION(grub_longjmp)
|
|
+FUNC_START(grub_longjmp)
|
|
LOAD 1, 0(3)
|
|
LOAD 14, 1*SZ_LONG(3)
|
|
LOAD 15, 2*SZ_LONG(3)
|
|
@@ -96,4 +98,4 @@ FUNCTION(grub_longjmp)
|
|
bne 1f
|
|
li 3, 1
|
|
1: blr
|
|
-
|
|
+FUNC_END(grub_longjmp)
|
|
--
|
|
1.8.3.1
|