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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2012-05-28 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/efiemu/runtime/efiemu.c: Replace APPLE_CC with __APPLE__.
* grub-core/kern/misc.c: Likewise.
* grub-core/loader/i386/xnu.c: Likewise.
* include/grub/i386/tsc.h: Likewise.
* include/grub/symbol.h: Likewise.
2012-05-28 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/list.h (grub_bad_type_cast_real): Remove return.

2
grub-core/efiemu/runtime/efiemu.c
View file

@ -46,7 +46,7 @@ grub_efi_status_t
efiemu_set_wakeup_time (grub_efi_boolean_t enabled,
grub_efi_time_t *time);
#ifdef APPLE_CC
#ifdef __APPLE__
#define PHYSICAL_ATTRIBUTE __attribute__ ((section("_text-physical, _text-physical")));
#else
#define PHYSICAL_ATTRIBUTE __attribute__ ((section(".text-physical")));

6
grub-core/kern/misc.c
View file

@ -137,7 +137,7 @@ grub_puts_ (const char *s)
return grub_puts (_(s));
}
#if defined (APPLE_CC) && ! defined (GRUB_UTIL)
#if defined (__APPLE__) && ! defined (GRUB_UTIL)
int
grub_err_printf (const char *fmt, ...)
{
@ -152,7 +152,7 @@ grub_err_printf (const char *fmt, ...)
}
#endif
#if ! defined (APPLE_CC) && ! defined (GRUB_UTIL)
#if ! defined (__APPLE__) && ! defined (GRUB_UTIL)
int grub_err_printf (const char *fmt, ...)
__attribute__ ((alias("grub_printf")));
#endif
@ -1112,7 +1112,7 @@ grub_abort (void)
grub_exit ();
}
#if ! defined (APPLE_CC) && !defined (GRUB_UTIL)
#if ! defined (__APPLE__) && !defined (GRUB_UTIL)
/* GCC emits references to abort(). */
void abort (void) __attribute__ ((alias ("grub_abort")));
#endif

4
grub-core/loader/i386/xnu.c
View file

@ -132,7 +132,7 @@ guessfsb (void)
if (! grub_cpu_is_cpuid_supported ())
return sane_value;
#ifdef APPLE_CC
#ifdef __APPLE__
asm volatile ("movl $0, %%eax\n"
#ifdef __x86_64__
"push %%rbx\n"
@ -167,7 +167,7 @@ guessfsb (void)
if (max_cpuid < 1)
return sane_value;
#ifdef APPLE_CC
#ifdef __APPLE__
asm volatile ("movl $1, %%eax\n"
#ifdef __x86_64__
"push %%rbx\n"

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__)