[PATCH] ASM_FILE

[PATCH] ASM_FILE

[Robert Millan]

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]


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

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call, if you are unable to speak?
(as seen on /.)

[-- Attachment #2: asm.diff --]
[-- Type: text/x-diff, Size: 908 bytes --]

2007-10-19  Robert Millan  <rmh@aybabtu.com>

	* 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}

[-- Attachment #3: asm.diff --]
[-- Type: text/x-diff, Size: 908 bytes --]

2007-10-19  Robert Millan  <rmh@aybabtu.com>

	* 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}

Re: [PATCH] ASM_FILE

[Robert Millan]

Committed.

On Fri, Oct 19, 2007 at 10:11:48PM +0200, Robert Millan wrote:
> 
> 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
> 
> <GPLv2> I know my rights; I want my phone call!
> <DRM> What use is a phone call, if you are unable to speak?
> (as seen on /.)

> 2007-10-19  Robert Millan  <rmh@aybabtu.com>
> 
> 	* 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}

> 2007-10-19  Robert Millan  <rmh@aybabtu.com>
> 
> 	* 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}

> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel


-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call, if you are unable to speak?
(as seen on /.)