Fix grub-emu issues on NetBSD, with gcc 4.1.3.

	* conf/any-emu.rmk: Remove unnecessary COMMON_CFLAGS.
	* include/grub/emu/misc.h (canonicalize_file_name): New Prototype.
	* kern/misc.c (__enable_execute_stack): Disable on
	GRUB_MACHINE_EMU.

diff --git a/ChangeLog b/ChangeLog
index 9658486698b41a3da75e1f4c57fc26e70a7d5224..e3fb344aaed828df7beab57ccf8c400cdb795d57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-28  BVK Chaitanya  <bvk.groups@gmail.com>
+
+       Fix grub-emu issues on NetBSD, with gcc 4.1.3.
+
+       * conf/any-emu.rmk: Remove unnecessary COMMON_CFLAGS.
+       * include/grub/emu/misc.h (canonicalize_file_name): New Prototype.
+       * kern/misc.c (__enable_execute_stack): Disable on
+       GRUB_MACHINE_EMU.
+
 2010-05-28  Colin Watson  <cjwatson@ubuntu.com>
 
        Make grub-probe work with symbolic links under /dev/mapper as well

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 3f0df06aa1706dad6444388e12f2ae732936cf27..000996172c5156c8b02da4bb3eb96a755bcd0987 100644 (file)
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,7 +1,5 @@
 # -*- makefile -*-
 
-COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
-
 kernel_img_RELOCATABLE = yes
 pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c    \

diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index e037e6be73508e4e642ede3dc606ef17b88e2d67..0e6ace0e8551ad2f63c3c8fb281644ec5ac1d338 100644 (file)
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -46,5 +46,6 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
 #endif
 
 char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
+extern char * canonicalize_file_name (const char *path);
 
 #endif /* GRUB_EMU_MISC_H */

diff --git a/kern/misc.c b/kern/misc.c
index ccc01d43f3690af50492460503e8c978ff1b43ba..2ba34f2355fc816639e4e1a6bcc7ab990fd7c1bd 100644 (file)
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -1058,7 +1058,7 @@ grub_abort (void)
 void abort (void) __attribute__ ((alias ("grub_abort")));
 #endif
 
-#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL)
+#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL) && !defined(GRUB_MACHINE_EMU)
 /* Some gcc versions generate a call to this function
    in trampolines for nested functions.  */
 void __enable_execute_stack (void *addr __attribute__ ((unused)))
@@ -1075,3 +1075,4 @@ void __deregister_frame_info (void)
 {
 }
 #endif
+