From ce35b7a68a5eb8d8f04416abafd5596a15805ab8 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Wed, 25 Jul 2012 15:00:50 +0100 Subject: [PATCH] Fixed broken build for x86. --- src/system/kernel/arch/x86/asm_offsets.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/arch/x86/asm_offsets.cpp b/src/system/kernel/arch/x86/asm_offsets.cpp index e200c69c8a..65339ce38d 100644 --- a/src/system/kernel/arch/x86/asm_offsets.cpp +++ b/src/system/kernel/arch/x86/asm_offsets.cpp @@ -58,14 +58,15 @@ dummy() DEFINE_OFFSET_MACRO(IFRAME, iframe, dx); DEFINE_OFFSET_MACRO(IFRAME, iframe, di); DEFINE_OFFSET_MACRO(IFRAME, iframe, si); - DEFINE_OFFSET_MACRO(IFRAME, iframe, r8); - DEFINE_OFFSET_MACRO(IFRAME, iframe, r9); - DEFINE_OFFSET_MACRO(IFRAME, iframe, r10); DEFINE_OFFSET_MACRO(IFRAME, iframe, vector); DEFINE_OFFSET_MACRO(IFRAME, iframe, ip); DEFINE_OFFSET_MACRO(IFRAME, iframe, flags); DEFINE_OFFSET_MACRO(IFRAME, iframe, user_sp); -#ifdef __INTEL__ +#ifdef __x86_64__ + DEFINE_OFFSET_MACRO(IFRAME, iframe, r8); + DEFINE_OFFSET_MACRO(IFRAME, iframe, r9); + DEFINE_OFFSET_MACRO(IFRAME, iframe, r10); +#else DEFINE_OFFSET_MACRO(IFRAME, iframe, orig_eax); // struct vm86_iframe