vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* include/grub/symbol.h (END) [__arm__]: New macros. Replace all .end

Browse source 
occurencies with END.
This commit is contained in:
Vladimir Serbinenko 2013-11-13 05:19:30 +01:00
parent d0d1e3dacb
commit ea57de18f8
5 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-11-13 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/symbol.h (END) [__arm__]: New macros. Replace all .end
occurencies with END.
2013-11-13 Colin Watson <cjwatson@ubuntu.com> 2013-11-13 Colin Watson <cjwatson@ubuntu.com>
* util/grub-editenv.c (help_filter, argp): Document how to delete * util/grub-editenv.c (help_filter, argp): Document how to delete

2
grub-core/kern/arm/efi/startup.S
View file

@ -33,4 +33,4 @@ FUNCTION(_start)
str r1, [ip] str r1, [ip]
ldr ip, =EXT_C(grub_main) ldr ip, =EXT_C(grub_main)
bx ip bx ip
.end END

2
grub-core/kern/arm/misc.S
View file

@ -58,4 +58,4 @@ FUNCTION(raise)
mov r0, #0 mov r0, #0
bx lr bx lr
.end END

2
grub-core/kern/arm/uboot/startup.S
View file

@ -166,4 +166,4 @@ transition_space:
VARIABLE(grub_uboot_syscall_ptr) VARIABLE(grub_uboot_syscall_ptr)
.long 0 @ .long 0 @
.end END

8
include/grub/symbol.h
View file

@ -37,6 +37,14 @@
# define EXT_C(sym) sym # define EXT_C(sym) sym
#endif #endif
#ifdef __arm__
#ifdef __clang__
#define END
#else
#define END .end
#endif
#endif
#if defined (__APPLE__) #if defined (__APPLE__)
#define FUNCTION(x) .globl EXT_C(x) ; EXT_C(x): #define FUNCTION(x) .globl EXT_C(x) ; EXT_C(x):
#define VARIABLE(x) .globl EXT_C(x) ; EXT_C(x): #define VARIABLE(x) .globl EXT_C(x) ; EXT_C(x):