aboutsummaryrefslogtreecommitdiffstats
path: root/target-arm
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-06-11 17:03:18 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2012-06-12 11:01:46 +0800
commit0b3979707c09e058442c22d046b326ce244edda1 (patch)
treeedb8492d6181a99db7a38337ee2239c06d97661e /target-arm
parent32167ca6cd795b619f4327d83f643a0805735ead (diff)
downloadexternal_qemu-0b3979707c09e058442c22d046b326ce244edda1.zip
external_qemu-0b3979707c09e058442c22d046b326ce244edda1.tar.gz
external_qemu-0b3979707c09e058442c22d046b326ce244edda1.tar.bz2
Force emulator to quit if it's built w/o global register variable support
Clang and llvm-gcc don't support global register variable (GRV) crucial to emulator (where a register is reserved to point to target architecture state for better code-gen). Clang and llvm-gcc are provided in recent Xcode to replace the original gcc with GRV support. MacOSX developers may accidentally install newer Xcode and break emulator. This CL allows emulator (and the rest of Android tree) to build but forces emulator to quit if it's built w/o GRV support. Developers build Android tree with clang or llvm-gcc can still get good system image, but they have to use emulators built the other way or from SDKs to run it. Related CL & bug entry: https://android-review.googlesource.com/#/c/33011 http://code.google.com/p/android/issues/detail?id=32577 Change-Id: Ia585dd7bf9783e2ff4c114b4f0ec20b89684ab57
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/exec.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/target-arm/exec.h b/target-arm/exec.h
index 83571e6..43bfaa9 100644
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -19,11 +19,7 @@
#include "config.h"
#include "dyngen-exec.h"
-/* Xcode 4.3 doesn't support global register variables */
-#if !defined(__APPLE_CC__) || __APPLE_CC__ < 5621
- register
-#endif
-struct CPUARMState *env asm(AREG0);
+GLOBAL_REGISTER_VARIABLE_DECL struct CPUARMState *env asm(AREG0);
#include "cpu.h"
#include "exec-all.h"