emu build fixes for sparc64 and freebsd

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 3f0df06aa1706dad6444388e12f2ae732936cf27..17abc8911b1ef1dc09a940cadb779e15311cd82b 100644 (file)
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,6 +1,8 @@
 # -*- makefile -*-
 
-COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
+ifeq ($(target_cpu), sparc64)
+COMMON_LDFLAGS += -mno-relax
+endif
 
 kernel_img_RELOCATABLE = yes
 pkglib_PROGRAMS = kernel.img
@@ -45,6 +47,9 @@ cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
 endif
 
 grub_emu_LDFLAGS = $(LIBCURSES)
+ifeq ($(target_cpu), sparc64)
+grub_emu_LDFLAGS += -m64 -mno-relax
+endif
 
 ifeq ($(enable_grub_emu_usb), yes)
 kernel_img_HEADERS += libusb.h

diff --git a/include/grub/cache.h b/include/grub/cache.h
index 27e44f0a2d7b1fb6f4c66b4ecbac294d3be5843d..a54bc00f8c32790f1856171c98cfc82941df0cab 100644 (file)
--- a/include/grub/cache.h
+++ b/include/grub/cache.h
@@ -23,7 +23,8 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
-#if defined (__i386__) || defined (__x86_64__)
+#if defined (__i386__) || defined (__x86_64__) || \
+  (defined (GRUB_MACHINE_EMU) && GRUB_MACHINE_EMU)
 static inline void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
                       grub_size_t len __attribute__ ((unused)))

diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index e037e6be73508e4e642ede3dc606ef17b88e2d67..1492e757a67797eeaad811e031c17488764765d2 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, ...);
+char * canonicalize_file_name (const char *path);
 
 #endif /* GRUB_EMU_MISC_H */

diff --git a/util/misc.c b/util/misc.c
index 91bc25a554ec98769837d83f7ebb4f799ead083f..dd0077d72bf2c848206211972310b92d7d1ae79b 100644 (file)
--- a/util/misc.c
+++ b/util/misc.c
@@ -214,14 +214,6 @@ grub_millisleep (grub_uint32_t ms)
 
 #endif
 
-#if !(defined (__i386__) || defined (__x86_64__)) && GRUB_NO_MODULES
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-                      grub_size_t len __attribute__ ((unused)))
-{
-}
-#endif
-
 #ifdef __MINGW32__
 
 void sync (void)