From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1IiyCn-0006U1-Sb for mharc-grub-devel@gnu.org; Fri, 19 Oct 2007 16:12:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IiyCm-0006Te-CH for grub-devel@gnu.org; Fri, 19 Oct 2007 16:12:24 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IiyCj-0006Sv-DR for grub-devel@gnu.org; Fri, 19 Oct 2007 16:12:23 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IiyCj-0006Ss-AP for grub-devel@gnu.org; Fri, 19 Oct 2007 16:12:21 -0400 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1IiyCi-0000Im-TF for grub-devel@gnu.org; Fri, 19 Oct 2007 16:12:21 -0400 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1IiyCg-0006LI-Ad for grub-devel@gnu.org; Fri, 19 Oct 2007 22:12:20 +0200 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1IiyCC-0003Cj-V9 for grub-devel@gnu.org; Fri, 19 Oct 2007 22:11:48 +0200 Date: Fri, 19 Oct 2007 22:11:48 +0200 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20071019201148.GA12298@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="EeQfGwPcQSOJBaQU" Content-Disposition: inline Organization: free as in freedom X-Message-Flag: Microsoft discourages use of Outlook. X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH] ASM_FILE X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Oct 2007 20:12:24 -0000 --EeQfGwPcQSOJBaQU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This fixes a build problem when standalone assembly files are used in modules rather than in kernel. I'll commit if there are no objections. -- Robert Millan I know my rights; I want my phone call! What use is a phone call, if you are unable to speak? (as seen on /.) --EeQfGwPcQSOJBaQU Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="asm.diff" 2007-10-19 Robert Millan * genmk.rb (Image): Copy `extra_flags' from here ... (PModule): ... to here. Use it in `#{obj}: #{src}' rule. diff -ur -x '*.mk' grub2/genmk.rb grub2.biosdisk/genmk.rb --- grub2/genmk.rb 2007-09-03 00:50:43.000000000 +0200 +++ grub2.biosdisk/genmk.rb 2007-10-19 21:35:10.000000000 +0200 @@ -143,10 +143,11 @@ fs = 'fs-' + obj.suffix('lst') dep = deps[i] flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end + extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end dir = File.dirname(src) "#{obj}: #{src} - $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $< + $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $< -include #{dep} CLEANFILES += #{command} #{fs} --EeQfGwPcQSOJBaQU Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="asm.diff" 2007-10-19 Robert Millan * genmk.rb (Image): Copy `extra_flags' from here ... (PModule): ... to here. Use it in `#{obj}: #{src}' rule. diff -ur -x '*.mk' grub2/genmk.rb grub2.biosdisk/genmk.rb --- grub2/genmk.rb 2007-09-03 00:50:43.000000000 +0200 +++ grub2.biosdisk/genmk.rb 2007-10-19 21:35:10.000000000 +0200 @@ -143,10 +143,11 @@ fs = 'fs-' + obj.suffix('lst') dep = deps[i] flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end + extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end dir = File.dirname(src) "#{obj}: #{src} - $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $< + $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $< -include #{dep} CLEANFILES += #{command} #{fs} --EeQfGwPcQSOJBaQU--