qemu: build on x86_64.

This commit is contained in:
Jerome Duval
2014-02-27 21:01:26 +00:00
parent 9d4da0d236
commit 7e57931e12
5 changed files with 70 additions and 4 deletions

View File

@@ -0,0 +1,63 @@
From 4656339211c608955f9dbbabf4c6a9456f20fd64 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 26 Feb 2014 17:02:49 +0000
Subject: Haiku: adapt configure for x86_64
* don't hardcode arch/cpu.
* define _POSIX_C_SOURCE for memalign.
diff --git a/configure b/configure
index 2f11a10..59ed591 100755
--- a/configure
+++ b/configure
@@ -583,7 +583,7 @@ Haiku)
sysconfdir="${prefix}/etc"
bindir="${prefix}"
confsuffix=""
- CFLAGS="-fno-pic -march=prescott -mtune=core2 $CFLAGS"
+ CFLAGS="$CFLAGS -D_POSIX_C_SOURCE"
QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS"
LIBS="-lposix_error_mapper -lnetwork -lbe -lbsd -lgame -lmedia -lstdc++ $LIBS"
;;
--
1.8.3.4
From 8d6f0e83ae6e429a1407b991772e3be40df292a0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 26 Feb 2014 17:19:05 +0000
Subject: Haiku: don't hardcode types.
diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h
index a445506..f3927e2 100644
--- a/include/fpu/softfloat.h
+++ b/include/fpu/softfloat.h
@@ -55,24 +55,12 @@ these four paragraphs for those parts of this code that are retained.
| to the same as `int'.
*----------------------------------------------------------------------------*/
typedef uint8_t flag;
-#ifndef __HAIKU__
typedef uint8_t uint8;
typedef int8_t int8;
typedef unsigned int uint32;
typedef signed int int32;
typedef uint64_t uint64;
typedef int64_t int64;
-#else
-// Haiku types
-typedef signed char int8;
-typedef unsigned char uint8;
-typedef short int16;
-typedef unsigned short uint16;
-typedef long int32;
-typedef unsigned long uint32;
-typedef long long int64;
-typedef unsigned long long uint64;
-#endif
#define LIT64( a ) a##LL
#define INLINE static inline
--
1.8.3.4

View File

@@ -7,7 +7,9 @@ SRC_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b1
COPYRIGHT="2003-2008 Fabrice Bellard" COPYRIGHT="2003-2008 Fabrice Bellard"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="1" REVISION="1"
ARCHITECTURES="x86" ARCHITECTURES="x86 x86_64"
PATCHES="qemu-1.7.0.patchset"
PROVIDES=" PROVIDES="
qemu = $portVersion qemu = $portVersion
@@ -59,6 +61,7 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion haiku_devel >= $haikuVersion
cmd:awk
cmd:gcc cmd:gcc
cmd:ld cmd:ld
cmd:make cmd:make

View File

@@ -8,7 +8,7 @@ LICENSE="GNU GPL v2"
COPYRIGHT="2005 David Gibson, IBM Corporation" COPYRIGHT="2005 David Gibson, IBM Corporation"
REVISION="1" REVISION="1"
ARCHITECTURES="x86" ARCHITECTURES="x86 x86_64"
PROVIDES=" PROVIDES="
dtc = $portVersion dtc = $portVersion

View File

@@ -17,7 +17,7 @@ SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz"
CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4" CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4"
REVISION="1" REVISION="1"
ARCHITECTURES="?x86" ARCHITECTURES="?x86 x86_64"
PATCHES="bison-${portVersion}.patch" PATCHES="bison-${portVersion}.patch"

View File

@@ -15,7 +15,7 @@ COPYRIGHT="1987-1998 The Open Group
REVISION="1" REVISION="1"
ARCHITECTURES="x86" ARCHITECTURES="x86 x86_64"
SECONDARY_ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="x86"
PROVIDES=" PROVIDES="