diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-04 12:20:07 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-04 12:20:08 -0700 |
| commit | b868827a61162e0345537b293b92a96e3784d516 (patch) | |
| tree | fc0084f62245e72fef0a428cf24ebe5f5d212b04 | |
| parent | aff92e8c2cac67c6d78cfcf57ca5858aa74808b9 (diff) | |
| parent | 7c84162756a132d3e46af0dac564508b01baddd1 (diff) | |
| download | external_qemu-b868827a61162e0345537b293b92a96e3784d516.zip external_qemu-b868827a61162e0345537b293b92a96e3784d516.tar.gz external_qemu-b868827a61162e0345537b293b92a96e3784d516.tar.bz2 | |
Merge "Xcode 4.3 compatibility checkin"
| -rw-r--r-- | target-arm/exec.h | 6 | ||||
| -rw-r--r-- | target-i386/exec.h | 6 |
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" |