vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cygwin fixes

Browse source
This commit is contained in:
BVK Chaitanya 2010-06-07 17:23:54 +05:30
parent 83fb6e1d48
commit 2d465fb052
7 changed files with 54 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/Makefile.kernel
View file

@ -176,8 +176,8 @@ BUILT_SOURCES += symlist.c
noinst_DATA += kernel_syms.lst
kernel_syms.lst: $(KERNEL_HEADER_FILES) config.h
if grep "^#define HAVE_ASM_USCORE" config.h; then u="_"; else u=""; fi
$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
if grep "^#define HAVE_ASM_USCORE" config.h; then u="_"; else u=""; fi; \
cat kernel_syms.input | grep -v '^#' | sed -n \
-e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
-e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \

3
grub-core/configure.ac
View file

@ -45,6 +45,9 @@ AC_CONFIG_HEADER([config.h])
grub_coredir='.'
AC_SUBST(grub_coredir)
grub_utildir='..'
AC_SUBST(grub_utildir)
m4_include([configure.common])
CC=$TARGET_CC

41
grub-core/modules.def
View file

@ -5,10 +5,15 @@ kernel = {
emu_ldflags = '-Wl,-r';
x86_efi_ldflags = '-Wl,-r';
i386_pc_ldflags = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
i386_qemu_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
i386_coreboot_ldflags = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
i386_multiboot_ldflags = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
i386_qemu_ldflags = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
i386_ieee1275_ldflags = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
mips_yeeloong_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
powerpc_ieee1275_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
@ -258,10 +263,13 @@ module = {
image = {
name = boot;
i386_pc = boot/i386/pc/boot.S;
i386_pc_ldflags = "-Wl,-Ttext=0x7C00";
i386_qemu = boot/i386/qemu/boot.S;
i386_qemu_ldflags = '-Wl,-Ttext,$(GRUB_BOOT_MACHINE_LINK_ADDR)';
i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
i386_qemu_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_BOOT_MACHINE_LINK_ADDR)';
i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
@ -271,24 +279,25 @@ image = {
image = {
name = cdboot;
source = boot/i386/pc/cdboot.S;
ldflags = "-Wl,-Ttext=0x7C00";
i386_pc;
i386_pc = boot/i386/pc/cdboot.S;
i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
};
image = {
name = pxeboot;
source = boot/i386/pc/pxeboot.S;
ldflags = '-Wl,-Ttext=0x7C00';
i386_pc = boot/i386/pc/pxeboot.S;
i386_pc;
i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
};
image = {
name = diskboot;
i386_pc = boot/i386/pc/diskboot.S;
i386_pc_ldflags = '-Wl,-Ttext=0x8000';
i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x8000';
sparc64_ieee1275 = boot/sparc64/ieee1275/diskboot.S;
sparc64_ieee1275_ldflags = '-Wl,-Ttext=0x4200';
@ -296,10 +305,10 @@ image = {
image = {
name = lnxboot;
source = boot/i386/pc/lnxboot.S;
ldflags = '-Wl,-Ttext=0x6000';
i386_pc = boot/i386/pc/lnxboot.S;
i386_pc;
i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x6000';
};
module = {