merge mainline into newreloc

diff --cc conf/i386-pc.rmk
index 234d181932da1fc2c62969a3d98d51c6e5aca60f,4215f0a342f76b5da93b14a04d47fe42f1a2aaa9..1978c7caac79c074f5941cd24696350477a06802
--- 1/conf/i386-pc.rmk
--- 2/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -201,17 -201,20 +201,21 @@@ serial_mod_SOURCES = term/i386/pc/seria
  serial_mod_CFLAGS = $(COMMON_CFLAGS)
  serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
 -pkglib_MODULES += multiboot.mod
 +# For multiboot.mod.
 +#pkglib_MODULES += multiboot.mod
  multiboot_mod_SOURCES = loader/i386/multiboot.c \
-                       loader/i386/multiboot_helper.S \
-                         loader/i386/pc/multiboot2.c \
-                         loader/multiboot2.c \
                          loader/multiboot_loader.c
  multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
  multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
  multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
  
 -pkglib_MODULES += multiboot2.mod
++#pkglib_MODULES += multiboot2.mod
+ multiboot2_mod_SOURCES = loader/i386/multiboot.c \
+                         loader/multiboot_loader.c
+ multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
+ multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
+ 
  # For vbe.mod.
  vbe_mod_SOURCES = video/i386/pc/vbe.c
  vbe_mod_CFLAGS = $(COMMON_CFLAGS)

diff --cc include/grub/misc.h
Simple merge