diff options
Diffstat (limited to 'src/arch/x86/exit_car.S')
| -rw-r--r-- | src/arch/x86/exit_car.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/x86/exit_car.S b/src/arch/x86/exit_car.S index d1b1a537fe..527a3cb13a 100644 --- a/src/arch/x86/exit_car.S +++ b/src/arch/x86/exit_car.S @@ -11,7 +11,7 @@ post_car_stack_top: .long 0 .long 0 -#if defined(__x86_64__) +#if ENV_X86_64 .code64 .macro pop_eax_edx pop %rax @@ -42,13 +42,13 @@ _start: is expected to be implemented in assembly. */ /* Migrate GDT to this text segment */ -#if defined(__x86_64__) +#if ENV_X86_64 call gdt_init64 #else call gdt_init #endif -#ifdef __x86_64__ +#if ENV_X86_64 mov %rdi, %rax movabs %rax, _cbmem_top_ptr #else @@ -61,7 +61,7 @@ _start: cpuid btl $CPUID_FEATURE_CLFLUSH_BIT, %edx jnc skip_clflush -#ifdef __x86_64__ +#if ENV_X86_64 movabs _cbmem_top_ptr, %rax clflush (%rax) #else @@ -73,7 +73,7 @@ skip_clflush: call chipset_teardown_car /* Enable caching if not already enabled. */ -#ifdef __x86_64__ +#if ENV_X86_64 mov %cr0, %rax and $(~(CR0_CD | CR0_NW)), %eax mov %rax, %cr0 @@ -115,7 +115,7 @@ skip_clflush: /* Need to align stack to 16 bytes at the call instruction. Therefore account for the 1 push. */ andl $0xfffffff0, %esp -#if defined(__x86_64__) +#if ENV_X86_64 mov %rbp, %rdi #else sub $12, %esp |