From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1O3u9S-0000HI-Bo for mharc-grub-devel@gnu.org; Mon, 19 Apr 2010 12:48:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O3u9R-0000G7-2m for grub-devel@gnu.org; Mon, 19 Apr 2010 12:48:49 -0400 Received: from [140.186.70.92] (port=46945 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O3u9P-0000EH-La for grub-devel@gnu.org; Mon, 19 Apr 2010 12:48:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O3u9O-0004nn-0p for grub-devel@gnu.org; Mon, 19 Apr 2010 12:48:47 -0400 Received: from mailout05.t-online.de ([194.25.134.82]:58142) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O3u9N-0004nY-Mw for grub-devel@gnu.org; Mon, 19 Apr 2010 12:48:45 -0400 Received: from fwd11.aul.t-online.de (fwd11.aul.t-online.de ) by mailout05.t-online.de with smtp id 1O3u9M-0001Bb-IN; Mon, 19 Apr 2010 18:48:44 +0200 Received: from [192.168.2.100] (EfXSfyZUYhKTXOj9u0xDr3T0ZODmiMjlI3mWI4Ax2b9BhaZ1P8tLqsJLEBrXshvZdu@[217.235.248.52]) by fwd11.aul.t-online.de with esmtp id 1O3u9C-0m08K80; Mon, 19 Apr 2010 18:48:34 +0200 Message-ID: <4BCC8962.4020000@t-online.de> Date: Mon, 19 Apr 2010 18:48:34 +0200 From: Christian Franke User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.9) Gecko/20100317 SeaMonkey/2.0.4 MIME-Version: 1.0 To: grub-devel@gnu.org Content-Type: multipart/mixed; boundary="------------040903010205060209010608" X-ID: EfXSfyZUYhKTXOj9u0xDr3T0ZODmiMjlI3mWI4Ax2b9BhaZ1P8tLqsJLEBrXshvZdu X-TOI-MSGID: f7c3da81-ed4e-4252-ac01-d3b767ee4877 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] Fix grub-emu on Cygwin X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 16:48:49 -0000 This is a multi-part message in MIME format. --------------040903010205060209010608 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit This fixes build of grub-emu on Cygwin, works also for --enable-grub-emu-modules. -- Regards, Christian Franke --------------040903010205060209010608 Content-Type: text/x-patch; name="grub2-cygwin-emu-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="grub2-cygwin-emu-fix.patch" === modified file 'ChangeLog' --- ChangeLog 2010-04-19 10:34:56 +0000 +++ ChangeLog 2010-04-19 15:31:52 +0000 @@ -1,3 +1,10 @@ +2010-04-19 Christian Franke + + * configure.ac: Do not CHECK_BSS_START_SYMBOL + and CHECK_END_SYMBOL if grub-emu is built. + Unset TARGET_OBJ2ELF if grub-emu is built + without module support. + 2010-04-19 BVK Chaitanya Fix emu build with grub-emu-pci and grub-emu-modules. === modified file 'configure.ac' --- configure.ac 2010-04-18 17:57:50 +0000 +++ configure.ac 2010-04-19 15:40:52 +0000 @@ -513,11 +513,11 @@ fi grub_PROG_LD_BUILD_ID_NONE if test "x$target_cpu" = xi386; then - if test ! -z "$TARGET_IMG_LDSCRIPT"; then - # Check symbols provided by linker script. - CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000,--defsym,___main=0x8100" - fi - if test "x$TARGET_APPLE_CC" != x1 ; then + if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then + if test ! -z "$TARGET_IMG_LDSCRIPT"; then + # Check symbols provided by linker script. + CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000,--defsym,___main=0x8100" + fi grub_CHECK_BSS_START_SYMBOL grub_CHECK_END_SYMBOL fi @@ -637,6 +637,12 @@ fi AC_SUBST(TARGET_NO_MODULES) +if test "$TARGET_NO_MODULES" = yes ; then + # Do not convert modules, otherwise linkage may fail (Cygwin only). + # FIXME: Should be checked above before TARGET_OBJ2ELF is set first. + TARGET_OBJ2ELF= +fi + if test x"$enable_grub_emu_usb" = xno ; then grub_emu_usb_excuse="explicitly disabled" fi --------------040903010205060209010608--