vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

pull-in emu-fixes branch

Browse source
This commit is contained in:
BVK Chaitanya 2010-05-26 09:58:23 +05:30
commit 066e9dd87e
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2010-05-23 Vladimir Serbinenko <phcoder@gmail.com>
* commands/usbtest.c (grub_usb_get_string): Properly support UTF-16. * commands/usbtest.c (grub_usb_get_string): Properly support UTF-16.

1
INSTALL
View file

@ -16,6 +16,7 @@ configuring the GRUB.
* GNU Bison 2.3 or later * GNU Bison 2.3 or later
* GNU gettext 0.17 or later * GNU gettext 0.17 or later
* GNU binutils 2.9.1.0.23 or later * GNU binutils 2.9.1.0.23 or later
* Flex 2.5.35 or later
* Other standard GNU/Unix tools * Other standard GNU/Unix tools
If you use a development snapshot or want to hack on GRUB you may If you use a development snapshot or want to hack on GRUB you may

7
conf/any-emu.rmk
View file

@ -1,6 +1,8 @@
# -*- makefile -*- # -*- 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 kernel_img_RELOCATABLE = yes
pkglib_PROGRAMS = kernel.img pkglib_PROGRAMS = kernel.img
@ -42,6 +44,9 @@ cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
endif endif
grub_emu_LDFLAGS = $(LIBCURSES) grub_emu_LDFLAGS = $(LIBCURSES)
ifeq ($(target_cpu), sparc64)
grub_emu_LDFLAGS += -m64 -mno-relax
endif
ifeq ($(enable_grub_emu_usb), yes) ifeq ($(enable_grub_emu_usb), yes)
kernel_img_HEADERS += libusb.h kernel_img_HEADERS += libusb.h

3
include/grub/cache.h
View file

@ -23,7 +23,8 @@
#include <grub/symbol.h> #include <grub/symbol.h>
#include <grub/types.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 static inline void
grub_arch_sync_caches (void *address __attribute__ ((unused)), grub_arch_sync_caches (void *address __attribute__ ((unused)),
grub_size_t len __attribute__ ((unused))) grub_size_t len __attribute__ ((unused)))

1
include/grub/emu/misc.h
View file

@ -47,5 +47,6 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
#endif #endif
char * EXPORT_FUNC(xasprintf) (const char *fmt, ...); char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
char * canonicalize_file_name (const char *path);
#endif /* GRUB_EMU_MISC_H */ #endif /* GRUB_EMU_MISC_H */

8
util/misc.c
View file

@ -212,14 +212,6 @@ grub_millisleep (grub_uint32_t ms)
#endif #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__ #ifdef __MINGW32__
void sync (void) void sync (void)