File grub2-ppc64le-19-Use-FUNC_START-FUNC_END-for-powerpc-function-definit.patch of Package grub2.2174
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
