mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging

Browse Source 
* afaerber-or/cocoa-for-upstream:
  cocoa: Suppress Cocoa frontend for -qtest
  arch_init: Fix AltiVec build on Darwin/ppc
This commit is contained in:
Anthony Liguori 2012-05-29 06:54:16 -05:00
commit 1c4ad9d2b4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch_init.c
View File

@ -100,6 +100,10 @@ const uint32_t arch_type = QEMU_ARCH;
#define VECTYPE vector unsigned char #define VECTYPE vector unsigned char
#define SPLAT(p) vec_splat(vec_ld(0, p), 0) #define SPLAT(p) vec_splat(vec_ld(0, p), 0)
#define ALL_EQ(v1, v2) vec_all_eq(v1, v2) #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__ #elif defined __SSE2__
#include <emmintrin.h> #include <emmintrin.h>
#define VECTYPE __m128i #define VECTYPE __m128i

3
ui/cocoa.m
View File

@ -879,7 +879,8 @@ int main (int argc, const char * argv[]) {
!strcmp(opt, "-vnc") || !strcmp(opt, "-vnc") ||
!strcmp(opt, "-nographic") || !strcmp(opt, "-nographic") ||
!strcmp(opt, "-version") || !strcmp(opt, "-version") ||
!strcmp(opt, "-curses")) { !strcmp(opt, "-curses") ||
!strcmp(opt, "-qtest")) {
return qemu_main(gArgc, gArgv, *_NSGetEnviron()); return qemu_main(gArgc, gArgv, *_NSGetEnviron());
} }
} }