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

* grub-core/efiemu/runtime/efiemu.c: Replace APPLE_CC with __APPLE__.

Browse source 
* grub-core/kern/misc.c: Likewise.
	* grub-core/loader/i386/xnu.c: Likewise.
	* include/grub/i386/tsc.h: Likewise.
	* include/grub/symbol.h: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-28 17:49:18 +02:00
parent 4a5a3c4abc
commit e6ad0555e4
6 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/grub/i386/tsc.h
View file

@ -29,7 +29,7 @@ grub_get_tsc (void)
/* The CPUID instruction is a 'serializing' instruction, and
avoids out-of-order execution of the RDTSC instruction. */
#ifdef APPLE_CC
#ifdef __APPLE__
__asm__ __volatile__ ("xorl %%eax, %%eax\n\t"
#ifdef __x86_64__
"push %%rbx\n"
@ -109,7 +109,7 @@ grub_cpu_is_tsc_supported (void)
return 0;
grub_uint32_t features;
#ifdef APPLE_CC
#ifdef __APPLE__
__asm__ ("movl $1, %%eax\n\t"
#ifdef __x86_64__
"push %%rbx\n"

2
include/grub/symbol.h
View file

@ -37,7 +37,7 @@
# define EXT_C(sym) sym
#endif
#if defined (APPLE_CC)
#if defined (__APPLE__)
#define FUNCTION(x) .globl EXT_C(x) ; EXT_C(x):
#define VARIABLE(x) .globl EXT_C(x) ; EXT_C(x):
#elif ! defined (__CYGWIN__) && ! defined (__MINGW32__)