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

more cygwin fixes

Browse source
This commit is contained in:
BVK Chaitanya 2010-06-07 21:28:37 +05:30
parent 2d465fb052
commit e235a2289d
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gentpl.py
View file

@ -154,7 +154,7 @@ def platform_format(platform): return each_group(platform, "_format", lamb
def module(platform): def module(platform):
r = gvar_add("noinst_PROGRAMS", "[+ name +].module") r = gvar_add("noinst_PROGRAMS", "[+ name +].module")
r += gvar_add("MODULE_FILES", "[+ name +].module") r += gvar_add("MODULE_FILES", "[+ name +].module$(EXEEXT)")
r += var_set(canonical_module() + "_SOURCES", platform_sources(platform) + "## platform sources") r += var_set(canonical_module() + "_SOURCES", platform_sources(platform) + "## platform sources")
r += var_add(canonical_module() + "_SOURCES", shared_sources() + "## shared sources") r += var_add(canonical_module() + "_SOURCES", shared_sources() + "## shared sources")
@ -192,23 +192,23 @@ def module(platform):
[+ name +].pp: $(""" + canonical_module() + """_SOURCES) $(nodist_""" + canonical_module() + """_SOURCES) [+ name +].pp: $(""" + canonical_module() + """_SOURCES) $(nodist_""" + canonical_module() + """_SOURCES)
$(TARGET_CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + canonical_module() + """_CPPFLAGS) $(CPPFLAGS) $^ > $@ || (rm -f $@; exit 1) $(TARGET_CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + canonical_module() + """_CPPFLAGS) $(CPPFLAGS) $^ > $@ || (rm -f $@; exit 1)
def-[+ name +].lst: [+ name +].module def-[+ name +].lst: [+ name +].module$(EXEEXT)
if test x$(USE_APPLE_CC_FIXES) = xyes; then \ if test x$(USE_APPLE_CC_FIXES) = xyes; then \
$(NM) -g -P -p $< | grep -E '^[a-zA-Z0-9_]* [TDS]' | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \ $(NM) -g -P -p $< | grep -E '^[a-zA-Z0-9_]* [TDS]' | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \
else \ else \
$(NM) -g --defined-only -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \ $(NM) -g --defined-only -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \
fi fi
und-[+ name +].lst: [+ name +].module und-[+ name +].lst: [+ name +].module$(EXEEXT)
$(NM) -u -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@ $(NM) -u -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@
mod-[+ name +].c: [+ name +].module $(top_builddir)/moddep.lst $(top_srcdir)/genmodsrc.sh mod-[+ name +].c: [+ name +].module$(EXEEXT) $(top_builddir)/moddep.lst $(top_srcdir)/genmodsrc.sh
sh $(top_srcdir)/genmodsrc.sh [+ name +] $(top_builddir)/moddep.lst > $@ || (rm -f $@; exit 1) sh $(top_srcdir)/genmodsrc.sh [+ name +] $(top_builddir)/moddep.lst > $@ || (rm -f $@; exit 1)
mod-[+ name +].o: mod-[+ name +].c mod-[+ name +].o: mod-[+ name +].c
$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS_MODULE) $(CPPFLAGS) $(CFLAGS_MODULE) $(CFLAGS) -c -o $@ $< $(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS_MODULE) $(CPPFLAGS) $(CFLAGS_MODULE) $(CFLAGS) -c -o $@ $<
[+ name +].mod: [+ name +].module mod-[+ name +].o [+ name +].mod: [+ name +].module$(EXEEXT) mod-[+ name +].o
if test x$(USE_APPLE_CC_FIXES) = xyes; then \ if test x$(USE_APPLE_CC_FIXES) = xyes; then \
$(CCLD) $(LDFLAGS_MODULE) $(LDFLAGS) -o $@.bin $^; \ $(CCLD) $(LDFLAGS_MODULE) $(LDFLAGS) -o $@.bin $^; \
$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@; \ $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@; \
@ -303,7 +303,7 @@ def image(platform):
r += gvar_add("platform_DATA", "[+ name +].img") r += gvar_add("platform_DATA", "[+ name +].img")
r += gvar_add("CLEANFILES", "[+ name +].img") r += gvar_add("CLEANFILES", "[+ name +].img")
r += rule("[+ name +].img", "[+ name +].image", """ r += rule("[+ name +].img", "[+ name +].image$(EXEEXT)", """
if test x$(USE_APPLE_CC_FIXES) = xyes; then \ if test x$(USE_APPLE_CC_FIXES) = xyes; then \
$(MACHO2IMG) $< $@; \ $(MACHO2IMG) $< $@; \
else \ else \

18
grub-core/modules.def
View file

@ -233,7 +233,7 @@ program = {
source = kern/emu/full.c; source = kern/emu/full.c;
nodist = grub_emu_init.c; nodist = grub_emu_init.c;
ldadd = kernel.img; ldadd = 'kernel.img$(EXEEXT)';
ldadd = '$(MODULE_FILES)'; ldadd = '$(MODULE_FILES)';
ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)'; ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
@ -247,19 +247,12 @@ program = {
source = kern/emu/cache.S; source = kern/emu/cache.S;
nodist = symlist.c; nodist = symlist.c;
ldadd = kernel.img; ldadd = 'kernel.img$(EXEEXT)';
ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)'; ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
emu; emu;
}; };
module = {
name = trig;
nodist = trigtables.c;
extra_dist = gentrigtables.c;
common;
};
image = { image = {
name = boot; name = boot;
i386_pc = boot/i386/pc/boot.S; i386_pc = boot/i386/pc/boot.S;
@ -311,6 +304,13 @@ image = {
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x6000'; i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x6000';
}; };
module = {
name = trig;
nodist = trigtables.c;
extra_dist = gentrigtables.c;
common;
};
module = { module = {
name = libusb; name = libusb;
source = bus/usb/emu/usb.c; source = bus/usb/emu/usb.c;