ident

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index ef36057ffb0f75f5cc0428f7994925a5627ee329..175f8cca492d934cac528e6f0587a2bf127beed6 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -139,6 +139,7 @@ appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
 # For linux.mod.
 linux_mod_SOURCES = loader/i386/efi/linux.c loader/i386/linux_trampoline.S
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For halt.mod.

diff --git a/loader/i386/linux_trampoline.S b/loader/i386/linux_trampoline.S
index 39821e1d3bb44229bf3a23b389c2683c29aecb75..eddaaf28f0dcb324516ab7833fcdbdbdfed36288 100644 (file)
--- a/loader/i386/linux_trampoline.S
+++ b/loader/i386/linux_trampoline.S
@@ -31,19 +31,19 @@ VARIABLE(grub_linux_trampoline_start)
 base:  
        pop %rsi
        
-       lea (cont1-base)(%rsi, 1), %rax
-       mov %eax, (jump_vector-base)(%rsi,1)
+       lea (cont1 - base) (%rsi, 1), %rax
+       mov %eax, (jump_vector - base) (%rsi, 1)
 
-       lea (gdt-base)(%rsi, 1), %rax
-       mov %rax, (gdtaddr-base)(%rsi,1)
+       lea (gdt - base) (%rsi, 1), %rax
+       mov %rax, (gdtaddr - base) (%rsi, 1)
        
        /* Switch to compatibility mode. */
 
-       lidt (idtdesc-base)(%rsi,1)
-       lgdt (gdtdesc-base)(%rsi,1)
+       lidt (idtdesc - base) (%rsi, 1)
+       lgdt (gdtdesc - base) (%rsi, 1)
        
        /* Update %cs. Thanks to David Miller for pointing this mistake out. */
-       ljmp *(jump_vector-base)(%rsi,1)
+       ljmp *(jump_vector - base) (%rsi, 1)
 cont1:
        .code32
 

diff --git a/loader/i386/xnu_helper.S b/loader/i386/xnu_helper.S
index 77b0a66134638df2de152a9ea3ddbf3200911b54..ad9c8f63152627d9bc7199fb15908880c4bfc3ab 100644 (file)
--- a/loader/i386/xnu_helper.S
+++ b/loader/i386/xnu_helper.S
@@ -99,18 +99,18 @@ VARIABLE(grub_xnu_heap_size)
 
 cont0: 
 
-       lea (cont1-base)(%rsi, 1), %rax
-       mov %eax, (jump_vector-base)(%rsi,1)
+       lea (cont1 - base) (%rsi, 1), %rax
+       mov %eax, (jump_vector - base) (%rsi, 1)
 
-       lea (gdt-base)(%rsi, 1), %rax
-       mov %rax, (gdt_addr-base)(%rsi,1)
+       lea (gdt - base) (%rsi, 1), %rax
+       mov %rax, (gdt_addr - base) (%rsi, 1)
        
        /* Switch to compatibility mode. */
 
-       lgdt (gdtdesc-base)(%rsi,1)
+       lgdt (gdtdesc - base) (%rsi, 1)
        
        /* Update %cs. Thanks to David Miller for pointing this mistake out. */
-       ljmp *(jump_vector-base)(%rsi,1)
+       ljmp *(jump_vector - base) (%rsi, 1)
 cont1:
        .code32