diff options
| author | Norikatsu Shigemura <nork@FreeBSD.org> | 2006-08-07 16:10:27 +0000 |
|---|---|---|
| committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2006-08-07 16:10:27 +0000 |
| commit | abffcb30ec97e8b7fe50b51b323a63201f83190d (patch) | |
| tree | 14535343032cf24b54d2d185d006e38ee894f846 /emulators/qemu-devel/files/patch-fbsd | |
| parent | o Update to 0.9.8. (diff) | |
Update to 0.8.2.
PR: ports/101381
Submitted by: Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=170008
Diffstat (limited to 'emulators/qemu-devel/files/patch-fbsd')
| -rw-r--r-- | emulators/qemu-devel/files/patch-fbsd | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/emulators/qemu-devel/files/patch-fbsd b/emulators/qemu-devel/files/patch-fbsd index 88b01def0e4d..7195d62837b8 100644 --- a/emulators/qemu-devel/files/patch-fbsd +++ b/emulators/qemu-devel/files/patch-fbsd @@ -1,21 +1,17 @@ Index: qemu/Makefile -@@ -13,11 +13,14 @@ +@@ -25,7 +25,10 @@ + DOCS= endif - DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 - --all: dyngen$(EXESUF) $(TOOLS) $(DOCS) -+all: bsd/libmath.a dyngen$(EXESUF) $(TOOLS) $(DOCS) - for d in $(TARGET_DIRS); do \ - $(MAKE) -C $$d $@ || exit 1 ; \ - done +-all: $(TOOLS) $(DOCS) recurse-all ++all: bsd/libmath.a $(TOOLS) $(DOCS) recurse-all ++ +bsd/libmath.a: + ( cd bsd ; $(BSD_MAKE) CC=$(CC) ) -+ - qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c - $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS) -@@ -26,6 +29,7 @@ + subdir-%: dyngen$(EXESUF) + $(MAKE) -C $(subst subdir-,,$@) all +@@ -40,6 +43,7 @@ clean: # avoid old build problems by removing potentially incorrect old files @@ -36,7 +32,7 @@ Index: qemu/Makefile.target cocoa.o: cocoa.m $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $< Index: qemu/fpu/softfloat-native.c -@@ -2,11 +2,15 @@ +@@ -2,11 +2,16 @@ context is supported */ #include "softfloat.h" #include <math.h> @@ -47,21 +43,22 @@ Index: qemu/fpu/softfloat-native.c void set_float_rounding_mode(int val STATUS_PARAM) { STATUS(float_rounding_mode) = val; --#if defined(_BSD) && !defined(__APPLE__) -+#if defined(_BSD) && !defined(__APPLE__) && \ -+ (defined(__FreeBSD__) && __FreeBSD_version < 500000) +-#if defined(_BSD) && !defined(__APPLE__) || (defined(HOST_SOLARIS) && HOST_SOLARIS < 10) ++#if defined(_BSD) && !defined(__APPLE__) && !defined(__FreeBSD__) || \ ++ (defined(__FreeBSD__) && __FreeBSD_version < 500000) || \ ++ (defined(HOST_SOLARIS) && HOST_SOLARIS < 10) fpsetround(val); #elif defined(__arm__) /* nothing to do */ -@@ -22,7 +26,7 @@ +@@ -22,7 +25,7 @@ } #endif --#if defined(_BSD) -+#if defined(_BSD) && !defined(__FreeBSD__) - #define lrint(d) ((long)rint(d)) - #define llrint(d) ((long long)rint(d)) - #endif +-#if defined(_BSD) || (defined(HOST_SOLARIS) && HOST_SOLARIS < 10) ++#if (defined(_BSD) && !defined(__FreeBSD__)) || (defined(HOST_SOLARIS) && HOST_SOLARIS < 10) + #define lrint(d) ((int32_t)rint(d)) + #define llrint(d) ((int64_t)rint(d)) + #define lrintf(f) ((int32_t)rint(f)) Index: qemu/fpu/softfloat-native.h @@ -1,8 +1,28 @@ /* Native implementation of soft float functions */ |