Merge mainline into cleanbuild

diff --cc Makefile.in
index c4059e58ecf4b35da11088b9807a3c7e211f664d,47584cdde5590e16969522a54c11b0ddd2821c75..07fe6219a2ef3638b16e8696b61ebef641ed1c1d
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -89,13 -89,11 +89,11 @@@ TARGET_ASFLAGS = -nostdinc -fno-builti
  TARGET_MODULE_FORMAT = @TARGET_MODULE_FORMAT@
  TARGET_APPLE_CC = @TARGET_APPLE_CC@
  OBJCONV = @OBJCONV@
- TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include -Wall -W
- ifneq ($(platform), emu)
- TARGET_CPPFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
- endif
+ TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
+       -Wall -W
 -TARGET_LDFLAGS = @TARGET_LDFLAGS@
 +TARGET_LDFLAGS = -nostdlib @TARGET_LDFLAGS@
  TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
 -TARGET_IMG_LDFLAGS = @TARGET_IMG_LDFLAGS@
 +TARGET_IMG_LDFLAGS = -nostdlib @TARGET_IMG_LDFLAGS@
  TARGET_IMG_CFLAGS = @TARGET_IMG_CFLAGS@
  TARGET_OBJ2ELF = @TARGET_OBJ2ELF@
  EXEEXT = @EXEEXT@

diff --cc conf/common.rmk
Simple merge

diff --cc conf/mips-yeeloong.rmk
index 0d57a2884a14afb987732b1125e0be26c1f3a0b4,9977f78815b6c529cd77bda8be5d44df4ba6f9ff..35cd01b4b87c0aeb1631a2b9b903e505a521a33f
--- 1/conf/mips-yeeloong.rmk
--- 2/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@@ -4,7 -4,8 +4,8 @@@ target_machine=yeeloon
  COMMON_CFLAGS += -march=mips3
  COMMON_ASFLAGS += -march=mips3
  
- kernel_img_HEADERS += pci.h
 -kernel_img_HEADERS += bitmap.h video.h gfxterm.h font.h bitmap_scale.h bufio.h
++kernel_img_HEADERS += pci.h bitmap.h video.h gfxterm.h font.h bitmap_scale.h bufio.h
+ 
  include $(srcdir)/conf/mips.mk
  
  pkglib_IMAGES = kernel.img
@@@ -63,5 -64,24 +64,11 @@@ datetime_mod_SOURCES = lib/cmos_datetim
  datetime_mod_CFLAGS = $(COMMON_CFLAGS)
  datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
 -# For date.mod
 -pkglib_MODULES += date.mod
 -date_mod_SOURCES = commands/date.c
 -date_mod_CFLAGS = $(COMMON_CFLAGS)
 -date_mod_LDFLAGS = $(COMMON_LDFLAGS)
 -
 -# For datehook.mod
 -pkglib_MODULES += datehook.mod
 -datehook_mod_SOURCES = hook/datehook.c
 -datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 -datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 -
+ pkglib_MODULES += linux.mod
+ linux_mod_SOURCES = loader/$(target_cpu)/linux.c
+ linux_mod_CFLAGS = $(COMMON_CFLAGS)
+ linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
+ linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
  sbin_SCRIPTS += grub-install
  grub_install_SOURCES = util/grub-install.in
 -

diff --cc conf/mips.rmk
Simple merge

diff --cc conf/sparc64-ieee1275.rmk
index 507a05ab9f18836634d8bc0bbf0753657b612723,712b2a988e9ee953b540e1c0bcd5a588b9ef805b..c29f15d1417ceedfba1b80f3ed4a742a85d5a90d
--- 1/conf/sparc64-ieee1275.rmk
--- 2/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@@ -36,9 -48,15 +36,9 @@@ kernel_img_SOURCES = kern/sparc64/ieee1
        symlist.c kern/$(target_cpu)/cache.S
  kernel_img_CFLAGS = $(COMMON_CFLAGS)
  kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
- kernel_img_LDFLAGS = -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc -static-libgcc -lgcc
+ kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x4400,-Bstatic,-melf64_sparc -static-libgcc -lgcc
  kernel_img_FORMAT = binary
  
 -symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 -      /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 -
 -kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
 -      /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 -
  # Utilities.
  bin_UTILITIES = grub-mkimage
  sbin_UTILITIES = grub-setup grub-ofpathname
@@@ -95,10 -123,31 +95,27 @@@ halt_mod_SOURCES = commands/halt.
  halt_mod_CFLAGS = $(COMMON_CFLAGS)
  halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
 -# For memdisk.mod.
 -memdisk_mod_SOURCES = disk/memdisk.c
 -memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
 -memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
 -
 -# For lsmmap.mod
 -lsmmap_mod_SOURCES = commands/lsmmap.c
 -lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
 -lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 +# For datetime.mod
 +pkglib_MODULES += datetime.mod
 +datetime_mod_SOURCES = lib/ieee1275/datetime.c
 +datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 +datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
+ pkglib_MODULES += datetime.mod date.mod datehook.mod
+ 
+ # For datetime.mod
+ datetime_mod_SOURCES = lib/ieee1275/datetime.c
+ datetime_mod_CFLAGS = $(COMMON_CFLAGS)
+ datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For date.mod
+ date_mod_SOURCES = commands/date.c
+ date_mod_CFLAGS = $(COMMON_CFLAGS)
+ date_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
+ # For datehook.mod
+ datehook_mod_SOURCES = hook/datehook.c
+ datehook_mod_CFLAGS = $(COMMON_CFLAGS)
+ datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ 
  include $(srcdir)/conf/common.mk

diff --cc configure.ac
index 462fca2258c14d6a407ee23289667521795b6fcc,e06b0a55cb8474fd11c7bf864c275b8f2455d1fe..5417fe9074a9545e40c4b83d4273f293ba03ca2c
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -519,6 -522,19 +525,21 @@@ enable_efiemu=n
  fi
  AC_SUBST([enable_efiemu])
  
++if test "$platform" != emu; then
+ AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
+   SAVED_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+ int va_arg_func (int fixed, va_list args);]], [[]])],
+       [grub_cv_cc_isystem=yes],
+       [grub_cv_cc_isystem=no])
+   CPPFLAGS="$SAVED_CPPFLAGS"
+ ])
++endif
+ 
+ if test x"$grub_cv_cc_isystem" = xyes ; then
+   TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+ fi
  
  # Restore the flags.
  CC="$tmp_CC"

diff --cc genmk.rb
Simple merge

diff --cc gensymlist.sh.in
Simple merge

diff --cc kern/mips/yeeloong/init.c
Simple merge

diff --cc video/ieee1275.c
Simple merge