XXX hack: force os to be NetBSD

This needs to be properly upstreamed to QEMU build system.

diff --git a/configure b/configure
index 779623a645afe8278f7c5c0feb4f627128cbd348..777dd67d11f8df350aeef39fa56f42c5cc5c7ff1 100755 (executable)
--- a/configure
+++ b/configure
@@ -448,6 +448,8 @@ else
   targetos=`uname -s`
 fi
 
+targetos='NetBSD'
+
 # Some host OSes need non-standard checks for which CPU to use.
 # Note that these checks are broken for cross-compilation: if you're
 # cross-compiling to one of these OSes then you'll need to specify
@@ -587,7 +589,7 @@ DragonFly)
 ;;
 NetBSD)
   bsd="yes"
-  make="${MAKE-gmake}"
+  # make="${MAKE-gmake}"
   audio_drv_list="oss"
   audio_possible_drivers="oss sdl esd"
   oss_lib="-lossaudio"

diff --git a/include/qemu-common.h b/include/qemu-common.h
index f8622141a80b44bc9e00609d63b529d67addc0b4..73dbbe995671c65e8e7c3e25ae65a855db1b69a9 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -446,11 +446,6 @@ void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size);
 /* altivec.h may redefine the bool macro as vector type.
  * Reset it to POSIX semantics. */
 #define bool _Bool
-#elif defined __SSE2__
-#include <emmintrin.h>
-#define VECTYPE        __m128i
-#define SPLAT(p)       _mm_set1_epi8(*(p))
-#define ALL_EQ(v1, v2) (_mm_movemask_epi8(_mm_cmpeq_epi8(v1, v2)) == 0xFFFF)
 #else
 #define VECTYPE        unsigned long
 #define SPLAT(p)       (*(p) * (~0UL / 255))