Fix x86_64-efi compilation.

diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 5cb472168526ec96125eaa198e9a6f4cd862fa2f..b97accac669daf0c12652e803981a6ef4862b819 100644 (file)
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -16,8 +16,7 @@ grub_install_SOURCES = util/i386/efi/grub-install.in
 
 # Modules.
 pkglib_PROGRAMS = kernel.img
-pkglib_MODULES = chain.mod appleldr.mod \
-       linux.mod halt.mod  \
+pkglib_MODULES = chain.mod appleldr.mod halt.mod  \
        datetime.mod loadbios.mod \
        fixvideo.mod mmap.mod acpi.mod
 
@@ -63,15 +62,6 @@ appleldr_mod_SOURCES = loader/efi/appleloader.c
 appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
 appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/efi/linux.c
-ifeq ($(target_cpu), x86_64)
-linux_mod_SOURCES += loader/i386/linux_trampoline.S
-endif
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -103,7 +93,7 @@ efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
 efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c \
+xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
        loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
 xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)

diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index a4038d75f40257ae7db494f064d6d4f04ea02341..4eaa66890083f2e6f12fa9e5e64fc2d727f6cbb8 100644 (file)
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -253,7 +253,6 @@ grub_relocator64_boot (struct grub_relocator *rel,
     return err;
 
   asm volatile ("cli");
-  grub_printf ("%x\n", relst);
   ((void (*) (void)) relst) ();
 
   /* Not reached.  */

diff --git a/lib/relocator.c b/lib/relocator.c
index b3a7801c503c8dea219aa821afb0f398f33143af..79a98e85190705deb04e48ee39eb240c6ade3d9f 100644 (file)
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -219,14 +219,12 @@ malloc_in_range (struct grub_relocator *rel,
   grub_addr_t target = 0;
 
   grub_dprintf ("relocator",
-               "trying to allocate in %x-%x aligned %x size %x\n",
-               start, end, align, size);
+               "trying to allocate in 0x%lx-0x%lx aligned 0x%lx size 0x%lx\n",
+               (unsigned long) start, (unsigned long) end,
+               (unsigned long) align, (unsigned long) size);
 
   start = ALIGN_UP (start, align);
   end = ALIGN_DOWN (end - size, align) + size;
-  grub_dprintf ("relocator",
-               "trying to allocate in %x-%x aligned %x size %x\n",
-               start, end, align, size);
 
   if (end < start + size)
     return 0;
@@ -643,8 +641,9 @@ malloc_in_range (struct grub_relocator *rel,
            alloc_end = min (events[j].pos, target + size);
            if (alloc_end > alloc_start)
              {
-               grub_dprintf ("relocator", "subchunk 0x%x-0x%x, %d\n",
-                             alloc_start, alloc_end, typepre);
+               grub_dprintf ("relocator", "subchunk 0x%lx-0x%lx, %d\n",
+                             (unsigned long) alloc_start,
+                             (unsigned long) alloc_end, typepre);
                res->subchunks[cural].type = typepre;
                if (typepre == CHUNK_TYPE_REGION_START)
                  {
@@ -715,7 +714,8 @@ malloc_in_range (struct grub_relocator *rel,
 
   res->src = target;
   res->size = size;
-  grub_dprintf ("relocator", "allocated: %x %x\n", target, size);
+  grub_dprintf ("relocator", "allocated: 0x%lx+0x%lx\n", (unsigned long) target,
+               (unsigned long) size);
   return 1;
 }