Hi,
Attached patch fixes mainline build failures for emu platform on
sparc64-linux-gnu and freebsd platforms. On freebsd GCC still reports
some warnings, which can be suppressed using TARGET_CFLAGS=-Wno-error
for now. I will handle them later.
--
bvk.chaitanya
=== modified file 'conf/any-emu.rmk'
--- conf/any-emu.rmk 2010-05-06 03:15:39 +0000
+++ conf/any-emu.rmk 2010-05-26 04:16:29 +0000
@@ -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 @@
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
=== modified file 'include/grub/cache.h'
--- include/grub/cache.h 2010-02-06 23:52:31 +0000
+++ include/grub/cache.h 2010-05-26 03:55:35 +0000
@@ -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)))
=== modified file 'include/grub/emu/misc.h'
--- include/grub/emu/misc.h 2010-05-06 03:15:39 +0000
+++ include/grub/emu/misc.h 2010-05-26 03:39:15 +0000
@@ -46,5 +46,6 @@
#endif
char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
+char * canonicalize_file_name (const char *path);
#endif /* GRUB_EMU_MISC_H */
=== modified file 'util/misc.c'
--- util/misc.c 2010-05-20 22:16:10 +0000
+++ util/misc.c 2010-05-26 03:18:12 +0000
@@ -214,14 +214,6 @@
#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)
_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel
