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

	* genmk.rb (Image): Copy `extra_flags' from here ...
	(PModule): ... to here.  Use it in `#{obj}: #{src}' rule.

	* commands/i386/cpuid.c (grub_cmd_cpuid): Add __attribute__ ((unused))
	to `argc' and `args' arguments.

diff --git a/ChangeLog b/ChangeLog
index 51f7add8522df95d995377eeb722dffa87c0434e..66cbf5fdbd28441630651233d70c2ab62b061288 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-20  Robert Millan  <rmh@aybabtu.com>
+
+       * genmk.rb (Image): Copy `extra_flags' from here ...
+       (PModule): ... to here.  Use it in `#{obj}: #{src}' rule.
+
+       * commands/i386/cpuid.c (grub_cmd_cpuid): Add __attribute__ ((unused))
+       to `argc' and `args' arguments.
+
 2007-10-17  Robert Millan  <rmh@aybabtu.com>
 
        * kern/i386/loader.S: New file.

diff --git a/commands/i386/cpuid.c b/commands/i386/cpuid.c
index bc1b1a74619823ce4f88b8b94e05a692be7b021e..62cf7f43bb6b4b4ee2b8f624f5976d0ea4c3a96f 100644 (file)
--- a/commands/i386/cpuid.c
+++ b/commands/i386/cpuid.c
@@ -41,9 +41,9 @@ static const struct grub_arg_option options[] =
   };
 
 static grub_err_t
-grub_cmd_cpuid (struct grub_arg_list *state __attribute__ ((unused)), int argc,
-              char **args)
-
+grub_cmd_cpuid (struct grub_arg_list *state __attribute__ ((unused)),
+              int argc __attribute__ ((unused)),
+              char **args __attribute__ ((unused)))
 {
   return !has_longmode;
 }

diff --git a/genmk.rb b/genmk.rb
index a30e5fccd3ad50ec97af393283121939afcd2db6..25deddbd0266804c69b8705c9725eb6d4a426f18 100644 (file)
--- a/genmk.rb
+++ b/genmk.rb
@@ -143,10 +143,11 @@ endif
       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}