diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-29 06:54:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-29 06:54:16 -0500 |
| commit | 1c4ad9d2b4b5f2be08588a91e4193d13cc314282 (patch) | |
| tree | 832b1d83d0608cd6d2b3ebaa2617ae0fb9ba3fc8 | |
| parent | dd86df756e02b684718dd5378725927361b0ad36 (diff) | |
| parent | 60b46aa2f3d40457d6f722cc79e3dbacd04b492f (diff) | |
Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging
* afaerber-or/cocoa-for-upstream:
cocoa: Suppress Cocoa frontend for -qtest
arch_init: Fix AltiVec build on Darwin/ppc
| -rw-r--r-- | arch_init.c | 4 | ||||
| -rw-r--r-- | ui/cocoa.m | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch_init.c b/arch_init.c index 988adcae07..a9e8b7442b 100644 --- a/arch_init.c +++ b/arch_init.c @@ -100,6 +100,10 @@ const uint32_t arch_type = QEMU_ARCH; #define VECTYPE vector unsigned char #define SPLAT(p) vec_splat(vec_ld(0, p), 0) #define ALL_EQ(v1, v2) vec_all_eq(v1, v2) +/* altivec.h may redefine the bool macro as vector type. + * Reset it to POSIX semantics. */ +#undef bool +#define bool _Bool #elif defined __SSE2__ #include <emmintrin.h> #define VECTYPE __m128i diff --git a/ui/cocoa.m b/ui/cocoa.m index e7d6e898ee..2383646dc0 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -879,7 +879,8 @@ int main (int argc, const char * argv[]) { !strcmp(opt, "-vnc") || !strcmp(opt, "-nographic") || !strcmp(opt, "-version") || - !strcmp(opt, "-curses")) { + !strcmp(opt, "-curses") || + !strcmp(opt, "-qtest")) { return qemu_main(gArgc, gArgv, *_NSGetEnviron()); } } |