[2228] ident

[Vladimir Serbinenko]

Revision: 2228
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2228
Author:   phcoder
Date:     2009-05-19 15:24:48 +0000 (Tue, 19 May 2009)
Log Message:
-----------
ident

Modified Paths:
--------------
    trunk/grub2/conf/x86_64-efi.rmk
    trunk/grub2/loader/i386/linux_trampoline.S
    trunk/grub2/loader/i386/xnu_helper.S

Modified: trunk/grub2/conf/x86_64-efi.rmk
===================================================================
--- trunk/grub2/conf/x86_64-efi.rmk     2009-05-18 21:53:09 UTC (rev 2227)
+++ trunk/grub2/conf/x86_64-efi.rmk     2009-05-19 15:24:48 UTC (rev 2228)
@@ -139,6 +139,7 @@
 # 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.

Modified: trunk/grub2/loader/i386/linux_trampoline.S
===================================================================
--- trunk/grub2/loader/i386/linux_trampoline.S  2009-05-18 21:53:09 UTC (rev 
2227)
+++ trunk/grub2/loader/i386/linux_trampoline.S  2009-05-19 15:24:48 UTC (rev 
2228)
@@ -31,19 +31,19 @@
 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
 

Modified: trunk/grub2/loader/i386/xnu_helper.S
===================================================================
--- trunk/grub2/loader/i386/xnu_helper.S        2009-05-18 21:53:09 UTC (rev 
2227)
+++ trunk/grub2/loader/i386/xnu_helper.S        2009-05-19 15:24:48 UTC (rev 
2228)
@@ -99,18 +99,18 @@
 
 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