Merge mainline into emu-mod

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
index f3fcd8c48354b8e5b8f0a99bf4902f0a3ef387f0,e06b0a55cb8474fd11c7bf864c275b8f2455d1fe..813ce94492c7d2eb4af3d7035363b723decfb204
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -517,6 -522,19 +523,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"
+ ])
+ 
+ if test x"$grub_cv_cc_isystem" = xyes ; then
+   TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+ fi
++fi
  
  # Restore the flags.
  CC="$tmp_CC"

diff --cc genmk.rb
Simple merge

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