Merge mainline into emu-modload

diff --cc Makefile.in
Simple merge

diff --cc conf/any-emu.rmk
index 42bc8df5bc00be54a14295592e9e30bf7786df59,758a8d7204428190156a4fbde29e19f7c8a51cff..e27a6978bfd5fa95105c604423578937d0ac8f4b
--- 1/conf/any-emu.rmk
--- 2/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@@ -1,35 -1,25 +1,34 @@@
  # -*- makefile -*-
  
 -COMMON_LDFLAGS += -nostdlib
 -COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -fno-builtin
 +COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
  
 -util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
  kernel_img_RELOCATABLE = yes
  pkglib_PROGRAMS = kernel.img
- kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c  \
-       kern/err.c kern/list.c kern/handler.c                           \
-       kern/command.c kern/corecmd.c kern/file.c                       \
-       kern/fs.c kern/main.c kern/misc.c kern/parser.c                 \
-       kern/partition.c kern/term.c                                    \
+ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c   \
+       kern/err.c kern/list.c kern/handler.c kern/command.c            \
+       kern/corecmd.c kern/file.c kern/fs.c kern/main.c kern/misc.c    \
+       kern/parser.c kern/partition.c kern/term.c                      \
        kern/rescue_reader.c kern/rescue_parser.c                       \
 -                                                                      \
 -      util/console.c util/grub-emu.c util/misc.c util/hostdisk.c      \
 -      util/getroot.c util/time.c                                      \
 -                                                                      \
 -      grub_emu_init.c gnulib/progname.c util/hostfs.c disk/host.c
 -kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/gnulib
 +      \
 +      util/console.c  util/grub-emu.c util/misc.c                     \
 +      util/hostdisk.c util/getroot.c util/mm.c util/time.c            \
 +      \
 +      gnulib/progname.c util/hostfs.c disk/host.c
 +kernel_img_HEADERS += datetime.h
 +kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS) -Wno-undef
  kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
  TARGET_NO_STRIP = yes
 -TARGET_NO_DYNAMIC_MODULES = yes
 +
 +ifneq ($(TARGET_NO_MODULES), yes)
 +kernel_img_SOURCES += symlist.c kern/$(target_cpu)/dl.c
 +ifneq ($(target_cpu), i386)
 +ifneq ($(target_cpu), x86_64)
 +kernel_img_SOURCES += kern/$(target_cpu)/cache.S
 +endif
 +endif
 +else
 +kernel_img_SOURCES += grub_emu_init.c
 +endif
  
  # For halt.mod.
  pkglib_MODULES += halt.mod

diff --cc conf/common.rmk
index 9817d506d96a96f348755d5bd4e3beb08d064d02,87ae1e2025123a54fd9a350a878a575c13c5db7b..9987011a18f3d69d65f8c11d6a0620b5bd9f9efe
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -25,9 -25,9 +25,9 @@@ util/elf/grub-mkimage.c_DEPENDENCIES = 
  sbin_UTILITIES += grub-probe
  util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
  grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c      \
 -      util/hostdisk.c util/misc.c util/getroot.c              \
 +      util/hostdisk.c util/misc.c util/getroot.c util/mm.c    \
        kern/device.c kern/disk.c kern/err.c kern/misc.c        \
-       kern/parser.c kern/partition.c kern/file.c              \
+       kern/parser.c kern/partition.c kern/file.c kern/list.c  \
        \
        fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c         \
        fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c  \
@@@ -98,11 -104,12 +104,12 @@@ DISTCLEANFILES += grub_script.yy.c grub
  bin_UTILITIES += grub-script-check
  util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
  grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
 -      util/grub-script-check.c util/misc.c \
 +      util/grub-script-check.c util/misc.c util/mm.c \
        script/main.c script/script.c script/function.c script/lexer.c \
        kern/handler.c kern/err.c kern/parser.c kern/list.c \
-       kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c
- 
+       kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c \
+       grub_script.yy.c
+ grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
  MOSTLYCLEANFILES += symlist.c kernel_syms.lst
  DEFSYMFILES += kernel_syms.lst
  

diff --cc conf/i386-pc.rmk
index 2bd0a35491adf1f6866c3fce59e8ee47ca8d86ab,18febc879f3975ab6a491df7b260dc15414c1251..c52f6fa459ff838d05382da713ca7ca8f06d7d6c
--- 1/conf/i386-pc.rmk
--- 2/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -77,18 -77,20 +77,20 @@@ grub_setup_SOURCES = gnulib/progname.c 
        util/i386/pc/grub-setup.c util/hostdisk.c       \
        util/misc.c util/getroot.c kern/device.c kern/disk.c    \
        kern/err.c kern/misc.c kern/parser.c kern/partition.c   \
-       kern/file.c kern/fs.c kern/env.c fs/fshelp.c            \
+       kern/file.c kern/fs.c kern/env.c kern/list.c            \
+       fs/fshelp.c                                             \
        \
-       fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c         \
-       fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c  \
-       fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c          \
-       fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c        \
+       fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c          \
+       fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c   \
+       fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c           \
+       fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c         \
        fs/befs.c fs/befs_be.c fs/tar.c                 \
        \
-       partmap/msdos.c partmap/gpt.c                           \
+       partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c      \
+       partmap/gpt.c           \
        \
        disk/raid.c disk/mdraid_linux.c disk/lvm.c              \
 -      util/raid.c util/lvm.c                  \
 +      util/raid.c util/lvm.c util/mm.c                        \
        grub_setup_init.c
  
  sbin_SCRIPTS += grub-install

diff --cc conf/sparc64-ieee1275.rmk
index c5096ec330936d559d541c03d67f6fda411af4a6,78e511e3194b2b6fa1678a07ab655f1dad8024ee..a387b8a9623a0a58c5a4cd88a530980d8d0b6037
--- 1/conf/sparc64-ieee1275.rmk
--- 2/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@@ -60,11 -61,11 +61,11 @@@ grub_setup_SOURCES = util/sparc64/ieee1
        fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c        \
        fs/befs.c fs/befs_be.c fs/tar.c                 \
        \
-       partmap/amiga.c partmap/apple.c partmap/msdos.c         \
-       partmap/sun.c partmap/acorn.c                           \
+       partmap/amiga.c partmap/apple.c partmap/msdos.c         \
+       partmap/bsdlabel.c partmap/sun.c partmap/acorn.c        \
        \
        disk/raid.c disk/mdraid_linux.c disk/lvm.c              \
 -      util/raid.c util/lvm.c gnulib/progname.c        \
 +      util/raid.c util/lvm.c util/mm.c gnulib/progname.c      \
        grub_setup_init.c
  
  # For grub-ofpathname.

diff --cc configure.ac
Simple merge

diff --cc genmk.rb
Simple merge

diff --cc util/hostdisk.c
Simple merge

diff --cc util/misc.c
Simple merge