aboutsummaryrefslogtreecommitdiffstats
path: root/target-i386
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-05-04 12:20:07 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-05-04 12:20:08 -0700
commitb868827a61162e0345537b293b92a96e3784d516 (patch)
treefc0084f62245e72fef0a428cf24ebe5f5d212b04 /target-i386
parentaff92e8c2cac67c6d78cfcf57ca5858aa74808b9 (diff)
parent7c84162756a132d3e46af0dac564508b01baddd1 (diff)
downloadexternal_qemu-b868827a61162e0345537b293b92a96e3784d516.zip
external_qemu-b868827a61162e0345537b293b92a96e3784d516.tar.gz
external_qemu-b868827a61162e0345537b293b92a96e3784d516.tar.bz2
Merge "Xcode 4.3 compatibility checkin"
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/exec.h6
1 files changed, 5 insertions, 1 deletions
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"