aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Sutton <al@funkyandroid.com>2012-02-22 17:49:13 +0000
committerAl Sutton <al@funkyandroid.com>2012-02-22 17:49:13 +0000
commit7c84162756a132d3e46af0dac564508b01baddd1 (patch)
tree9f098de371ff504f266afab74743b79aa6333633
parent349beb3f9b2a10a9a5cc001c115c2f742a833d6f (diff)
downloadexternal_qemu-7c84162756a132d3e46af0dac564508b01baddd1.zip
external_qemu-7c84162756a132d3e46af0dac564508b01baddd1.tar.gz
external_qemu-7c84162756a132d3e46af0dac564508b01baddd1.tar.bz2
Xcode 4.3 compatibility checkin
The Xcode 4.3 compiler doesn't have support for global register variables so this patch ensures that the register keyword is not incuded for that compiler. Signed-off-by: Al Sutton <al@funkyandroid.com>
-rw-r--r--target-arm/exec.h6
-rw-r--r--target-i386/exec.h6
2 files changed, 10 insertions, 2 deletions
diff --git a/target-arm/exec.h b/target-arm/exec.h
index 07bfd57..83571e6 100644
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -19,7 +19,11 @@
#include "config.h"
#include "dyngen-exec.h"
-register struct CPUARMState *env asm(AREG0);
+/* Xcode 4.3 doesn't support global register variables */
+#if !defined(__APPLE_CC__) || __APPLE_CC__ < 5621
+ register
+#endif
+struct CPUARMState *env asm(AREG0);
#include "cpu.h"
#include "exec-all.h"
diff --git a/target-i386/exec.h b/target-i386/exec.h
index 42b471a..d194f89 100644
--- a/target-i386/exec.h
+++ b/target-i386/exec.h
@@ -29,7 +29,11 @@
#include "cpu-defs.h"
-register struct CPUX86State *env asm(AREG0);
+/* Xcode 4.3 doesn't support global register variables */
+#if !defined(__APPLE_CC__) || __APPLE_CC__ < 5621
+ register
+#endif
+struct CPUX86State *env asm(AREG0);
#include "qemu-common.h"
#include "qemu-log.h"