From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 23:25:46 +0000 (+0200)
Subject: Merge mainline into emu-modload
X-Git-Tag: 1.99~963^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a29e9021328c201fac421e9b119cf60819ac135b;p=thirdparty%2Fgrub.git

Merge mainline into emu-modload
---

a29e9021328c201fac421e9b119cf60819ac135b
diff --cc conf/any-emu.rmk
index 42bc8df5b,758a8d720..e27a6978b
--- a/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 9817d506d,87ae1e202..9987011a1
--- a/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 2bd0a3549,18febc879..c52f6fa45
--- a/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 c5096ec33,78e511e31..a387b8a96
--- a/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.