diff --git a/ChangeLog b/ChangeLog
index 01d2dbf7c..b8e66c7a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-25  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* INSTALL: Added flex >= 2.5.35 requirement.
+
 2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/usbtest.c (grub_usb_get_string): Properly support UTF-16.
diff --git a/INSTALL b/INSTALL
index 0dd408bcc..7186d20db 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,6 +16,7 @@ configuring the GRUB.
 * GNU Bison 2.3 or later
 * GNU gettext 0.17 or later
 * GNU binutils 2.9.1.0.23 or later
+* Flex 2.5.35 or later
 * Other standard GNU/Unix tools
 
 If you use a development snapshot or want to hack on GRUB you may
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index d4292fa0c..7560c8aba 100644
--- 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
@@ -42,6 +44,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 27e44f0a2..a54bc00f8 100644
--- 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 49e916fdb..82b4c9124 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -47,5 +47,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 2b15135bc..adb013c01 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -212,14 +212,6 @@ grub_millisleep (grub_uint32_t ms)
 
 #endif
 
-#if !(defined (__i386__) || defined (__x86_64__)) && GRUB_MACHINE_EMU
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-		       grub_size_t len __attribute__ ((unused)))
-{
-}
-#endif
-
 #ifdef __MINGW32__
 
 void sync (void)