From: Jonathan Chambers <joncham@gmail.com>
Date: Thu, 30 Aug 2012 23:49:03 +0000 (-0400)
Subject: Check for TARGET_ macros in addition to GCC arch defines.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=5397d93d55f20f3fc3f40705fd517eeae9909259;p=mono.git

Check for TARGET_ macros in addition to GCC arch defines.
---

diff --git a/mono/metadata/sgen-archdep.h b/mono/metadata/sgen-archdep.h
index 28168e537f1..616b5831ad4 100644
--- a/mono/metadata/sgen-archdep.h
+++ b/mono/metadata/sgen-archdep.h
@@ -28,7 +28,7 @@
 
 #include <mono/utils/mono-sigcontext.h>
 
-#ifdef __i386__
+#if defined(__i386__) || defined(TARGET_X86)
 
 #include <mono/utils/mono-context.h>
 
@@ -58,7 +58,7 @@
 #define ARCH_SIGCTX_SP(ctx)    (UCONTEXT_REG_ESP ((ctx)))
 #define ARCH_SIGCTX_IP(ctx)    (UCONTEXT_REG_EIP ((ctx)))
 
-#elif defined(__x86_64__)
+#elif defined(__x86_64__) || defined(TARGET_AMD64)
 
 #include <mono/utils/mono-context.h>