mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-22 07:12:39 +00:00
* 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.
This commit is contained in:
1 parent
4a5a3c4abc
commit
e6ad0555e4
6 files changed
+17
-9
No files matched your search
@@ -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")));
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user