From: bean Date: Sat, 16 May 2009 12:46:24 +0000 (+0000) Subject: 2009-05-16 Bean X-Git-Tag: 1.98~905 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d87a1ba369502b53cd46eea0df0678a141d5bb3;p=thirdparty%2Fgrub.git 2009-05-16 Bean * conf/common.rmk (pkglib_MODULES): Add lua.mod. (lua_mod_SOURCES): New variable. (lua_mod_CFLAGS): Likewise. (lua_mod_LDFLAGS): Likewise. * conf/i386.rmk (pkglib_MODULES): Add setjmp.mod. (setjmp_mod_SOURCES): New variable. (setjmp_mod_CFLAGS): Likewise. (setjmp_LDFLAGS): Likewise. * conf/x86_64-efi.rmk (pkglib_MODULES): Add setjmp.mod. (setjmp_mod_SOURCES): New variable. (setjmp_mod_CFLAGS): Likewise. (setjmp_LDFLAGS): Likewise. * conf/powerpc-ieee1275.rmk (pkglib_MODULES): Add setjmp.mod. (setjmp_mod_SOURCES): New variable. (setjmp_mod_CFLAGS): Likewise. (setjmp_LDFLAGS): Likewise. * conf/sparc64-ieee1275.rmk (pkglib_MODULES): Add setjmp.mod. (setjmp_mod_SOURCES): New variable. (setjmp_mod_CFLAGS): Likewise. (setjmp_LDFLAGS): Likewise. * normal/i386/setjmp.S: Moved from here ... * lib/i386/setjmp.S: ... Moved here * normal/x86_64/setjmp.S: Moved from here ... * lib/x86_64/setjmp.S: ... Moved here * normal/powerpc/setjmp.S: Moved from here ... * lib/powerpc/setjmp.S: ... Moved here * normal/sparc64/setjmp.S: Moved from here ... * lib/sparc64/setjmp.S: ... Moved here * include/grub/i386/setjmp.h (grub_setjmp): Don't use attribute returns_twice in mingw. * script/lua/grub_lib.c: New file. * script/lua/grub_lib.h: Likewise. * script/lua/grub_lua.h: Likewise. * script/lua/grub_main.c: Likewise. * script/lua/lapi.c: Likewise. * script/lua/lapi.h: Likewise. * script/lua/lauxlib.c: Likewise. * script/lua/lauxlib.h: Likewise. * script/lua/lbaselib.c: Likewise. * script/lua/lcode.c: Likewise. * script/lua/lcode.h: Likewise. * script/lua/ldblib.c: Likewise. * script/lua/ldebug.c: Likewise. * script/lua/ldebug.h: Likewise. * script/lua/ldo.c: Likewise. * script/lua/ldo.h: Likewise. * script/lua/ldump.c: Likewise. * script/lua/lfunc.c: Likewise. * script/lua/lfunc.h: Likewise. * script/lua/lgc.c: Likewise. * script/lua/lgc.h: Likewise. * script/lua/linit.c: Likewise. * script/lua/liolib.c: Likewise. * script/lua/llex.c: Likewise. * script/lua/llex.h: Likewise. * script/lua/llimits.h: Likewise. * script/lua/lmathlib.c: Likewise. * script/lua/lmem.c: Likewise. * script/lua/lmem.h: Likewise. * script/lua/loadlib.c: Likewise. * script/lua/lobject.c: Likewise. * script/lua/lobject.h: Likewise. * script/lua/lopcodes.c: Likewise. * script/lua/lopcodes.h: Likewise. * script/lua/loslib.c: Likewise. * script/lua/lparser.c: Likewise. * script/lua/lparser.h: Likewise. * script/lua/lstate.c: Likewise. * script/lua/lstate.h: Likewise. * script/lua/lstring.c: Likewise. * script/lua/lstring.h: Likewise. * script/lua/lstrlib.c: Likewise. * script/lua/ltable.c: Likewise. * script/lua/ltable.h: Likewise. * script/lua/ltablib.c: Likewise. * script/lua/ltm.c: Likewise. * script/lua/ltm.h: Likewise. * script/lua/lua.h: Likewise. * script/lua/luaconf.h: Likewise. * script/lua/lualib.h: Likewise. * script/lua/lundump.c: Likewise. * script/lua/lundump.h: Likewise. * script/lua/lvm.c: Likewise. * script/lua/lvm.h: Likewise. * script/lua/lzio.c: Likewise. * script/lua/lzio.h: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 3ee54e586..c9495020a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,99 @@ +2009-05-16 Bean + + * conf/common.rmk (pkglib_MODULES): Add lua.mod. + (lua_mod_SOURCES): New variable. + (lua_mod_CFLAGS): Likewise. + (lua_mod_LDFLAGS): Likewise. + + * conf/i386.rmk (pkglib_MODULES): Add setjmp.mod. + (setjmp_mod_SOURCES): New variable. + (setjmp_mod_CFLAGS): Likewise. + (setjmp_LDFLAGS): Likewise. + + * conf/x86_64-efi.rmk (pkglib_MODULES): Add setjmp.mod. + (setjmp_mod_SOURCES): New variable. + (setjmp_mod_CFLAGS): Likewise. + (setjmp_LDFLAGS): Likewise. + + * conf/powerpc-ieee1275.rmk (pkglib_MODULES): Add setjmp.mod. + (setjmp_mod_SOURCES): New variable. + (setjmp_mod_CFLAGS): Likewise. + (setjmp_LDFLAGS): Likewise. + + * conf/sparc64-ieee1275.rmk (pkglib_MODULES): Add setjmp.mod. + (setjmp_mod_SOURCES): New variable. + (setjmp_mod_CFLAGS): Likewise. + (setjmp_LDFLAGS): Likewise. + + * normal/i386/setjmp.S: Moved from here ... + * lib/i386/setjmp.S: ... Moved here + * normal/x86_64/setjmp.S: Moved from here ... + * lib/x86_64/setjmp.S: ... Moved here + * normal/powerpc/setjmp.S: Moved from here ... + * lib/powerpc/setjmp.S: ... Moved here + * normal/sparc64/setjmp.S: Moved from here ... + * lib/sparc64/setjmp.S: ... Moved here + + * include/grub/i386/setjmp.h (grub_setjmp): Don't use attribute + returns_twice in mingw. + + * script/lua/grub_lib.c: New file. + * script/lua/grub_lib.h: Likewise. + * script/lua/grub_lua.h: Likewise. + * script/lua/grub_main.c: Likewise. + * script/lua/lapi.c: Likewise. + * script/lua/lapi.h: Likewise. + * script/lua/lauxlib.c: Likewise. + * script/lua/lauxlib.h: Likewise. + * script/lua/lbaselib.c: Likewise. + * script/lua/lcode.c: Likewise. + * script/lua/lcode.h: Likewise. + * script/lua/ldblib.c: Likewise. + * script/lua/ldebug.c: Likewise. + * script/lua/ldebug.h: Likewise. + * script/lua/ldo.c: Likewise. + * script/lua/ldo.h: Likewise. + * script/lua/ldump.c: Likewise. + * script/lua/lfunc.c: Likewise. + * script/lua/lfunc.h: Likewise. + * script/lua/lgc.c: Likewise. + * script/lua/lgc.h: Likewise. + * script/lua/linit.c: Likewise. + * script/lua/liolib.c: Likewise. + * script/lua/llex.c: Likewise. + * script/lua/llex.h: Likewise. + * script/lua/llimits.h: Likewise. + * script/lua/lmathlib.c: Likewise. + * script/lua/lmem.c: Likewise. + * script/lua/lmem.h: Likewise. + * script/lua/loadlib.c: Likewise. + * script/lua/lobject.c: Likewise. + * script/lua/lobject.h: Likewise. + * script/lua/lopcodes.c: Likewise. + * script/lua/lopcodes.h: Likewise. + * script/lua/loslib.c: Likewise. + * script/lua/lparser.c: Likewise. + * script/lua/lparser.h: Likewise. + * script/lua/lstate.c: Likewise. + * script/lua/lstate.h: Likewise. + * script/lua/lstring.c: Likewise. + * script/lua/lstring.h: Likewise. + * script/lua/lstrlib.c: Likewise. + * script/lua/ltable.c: Likewise. + * script/lua/ltable.h: Likewise. + * script/lua/ltablib.c: Likewise. + * script/lua/ltm.c: Likewise. + * script/lua/ltm.h: Likewise. + * script/lua/lua.h: Likewise. + * script/lua/luaconf.h: Likewise. + * script/lua/lualib.h: Likewise. + * script/lua/lundump.c: Likewise. + * script/lua/lundump.h: Likewise. + * script/lua/lvm.c: Likewise. + * script/lua/lvm.h: Likewise. + * script/lua/lzio.c: Likewise. + * script/lua/lzio.h: Likewise. + 2009-05-16 Bean * include/grub/kernel.h (grub_module_header_types): Add type diff --git a/conf/common.rmk b/conf/common.rmk index bca7f7806..1b9a6cdb4 100644 --- a/conf/common.rmk +++ b/conf/common.rmk @@ -343,7 +343,8 @@ pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod \ loopback.mod fs_uuid.mod configfile.mod echo.mod \ terminfo.mod test.mod blocklist.mod hexdump.mod \ read.mod sleep.mod loadenv.mod crc.mod parttool.mod \ - pcpart.mod memrw.mod boot.mod normal.mod sh.mod gptsync.mod + pcpart.mod memrw.mod boot.mod normal.mod sh.mod lua.mod \ + gptsync.mod # For gptsync.mod. gptsync_mod_SOURCES = commands/gptsync.c @@ -490,6 +491,24 @@ sh_mod_SOURCES = script/sh/main.c script/sh/script.c script/sh/execute.c \ sh_mod_CFLAGS = $(COMMON_CFLAGS) sh_mod_LDFLAGS = $(COMMON_LDFLAGS) +# For lua.mod. +lua_mod_SOURCES = script/lua/lapi.c script/lua/lcode.c script/lua/ldebug.c \ + script/lua/ldo.c script/lua/ldump.c script/lua/lfunc.c \ + script/lua/lgc.c script/lua/llex.c script/lua/lmem.c \ + script/lua/lobject.c script/lua/lopcodes.c script/lua/lparser.c \ + script/lua/lstate.c script/lua/lstring.c script/lua/ltable.c \ + script/lua/ltm.c script/lua/lundump.c script/lua/lvm.c \ + script/lua/lzio.c script/lua/lauxlib.c script/lua/lbaselib.c \ + script/lua/linit.c script/lua/ltablib.c \ + script/lua/grub_main.c script/lua/grub_lib.c +lua_mod_CFLAGS = $(COMMON_CFLAGS) +lua_mod_LDFLAGS = $(COMMON_LDFLAGS) + +# Extra libraries for lua +# script/lua/lmathlib.c script/lua/loslib.c script/lua/liolib.c +# script/lua/lstrlib.c script/lua/ldblib.c script/lua/ltablib.c +# script/lua/loadlib.c + # Common Video Subsystem specific modules. pkglib_MODULES += video.mod videotest.mod bitmap.mod tga.mod jpeg.mod \ png.mod font.mod gfxterm.mod diff --git a/conf/i386.rmk b/conf/i386.rmk index 93f84ce39..e8e2857cb 100644 --- a/conf/i386.rmk +++ b/conf/i386.rmk @@ -14,3 +14,9 @@ pkglib_MODULES += vga_text.mod vga_text_mod_SOURCES = term/i386/pc/vga_text.c term/i386/vga_common.c vga_text_mod_CFLAGS = $(COMMON_CFLAGS) vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS) + +# For setjmp.mod +pkglib_MODULES += setjmp.mod +setjmp_mod_SOURCES = lib/i386/setjmp.S +setjmp_mod_CFLAGS = $(COMMON_CFLAGS) +setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS) diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk index 204d54a83..bf0dd49bb 100644 --- a/conf/powerpc-ieee1275.rmk +++ b/conf/powerpc-ieee1275.rmk @@ -156,5 +156,10 @@ lsmmap_mod_SOURCES = commands/lsmmap.c lsmmap_mod_CFLAGS = $(COMMON_CFLAGS) lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS) -include $(srcdir)/conf/common.mk +# For setjmp.mod +pkglib_MODULES += setjmp.mod +setjmp_mod_SOURCES = lib/powerpc/setjmp.S +setjmp_mod_CFLAGS = $(COMMON_CFLAGS) +setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS) +include $(srcdir)/conf/common.mk diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk index c94b342af..234f80122 100644 --- a/conf/sparc64-ieee1275.rmk +++ b/conf/sparc64-ieee1275.rmk @@ -174,4 +174,10 @@ lsmmap_mod_SOURCES = commands/lsmmap.c lsmmap_mod_CFLAGS = $(COMMON_CFLAGS) lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS) +# For setjmp.mod +pkglib_MODULES += setjmp.mod +setjmp_mod_SOURCES = lib/sparc64/setjmp.S +setjmp_mod_CFLAGS = $(COMMON_CFLAGS) +setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS) + include $(srcdir)/conf/common.mk diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk index 92ad9f7d4..d25b03a4c 100644 --- a/conf/x86_64-efi.rmk +++ b/conf/x86_64-efi.rmk @@ -193,4 +193,10 @@ xnu_mod_CFLAGS = $(COMMON_CFLAGS) -Werror -Wall xnu_mod_LDFLAGS = $(COMMON_LDFLAGS) xnu_mod_ASFLAGS = $(COMMON_ASFLAGS) +# For setjmp.mod +pkglib_MODULES += setjmp.mod +setjmp_mod_SOURCES = lib/x86_64/setjmp.S +setjmp_mod_CFLAGS = $(COMMON_CFLAGS) +setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS) + include $(srcdir)/conf/common.mk diff --git a/include/grub/i386/setjmp.h b/include/grub/i386/setjmp.h index c5f94b406..6b6b6fd15 100644 --- a/include/grub/i386/setjmp.h +++ b/include/grub/i386/setjmp.h @@ -21,8 +21,12 @@ typedef unsigned long grub_jmp_buf[6]; +#ifdef __MINGW32__ +int grub_setjmp (grub_jmp_buf env) __attribute__ ((cdecl, regparm (3))); +#else int grub_setjmp (grub_jmp_buf env) __attribute__ ((returns_twice, cdecl, regparm (3))); +#endif void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn, cdecl, regparm (3))); diff --git a/normal/i386/setjmp.S b/lib/i386/setjmp.S similarity index 100% rename from normal/i386/setjmp.S rename to lib/i386/setjmp.S diff --git a/normal/powerpc/setjmp.S b/lib/powerpc/setjmp.S similarity index 100% rename from normal/powerpc/setjmp.S rename to lib/powerpc/setjmp.S diff --git a/normal/sparc64/setjmp.S b/lib/sparc64/setjmp.S similarity index 100% rename from normal/sparc64/setjmp.S rename to lib/sparc64/setjmp.S diff --git a/normal/x86_64/setjmp.S b/lib/x86_64/setjmp.S similarity index 100% rename from normal/x86_64/setjmp.S rename to lib/x86_64/setjmp.S