diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-02 13:02:01 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-02 13:02:01 +0200 |
| commit | 52e7939e712d0eb282c8b6cd9b57f17fb55cd68f (patch) | |
| tree | e953241be24915f4b4123f8702b51e8bc780995f /fpu | |
| parent | Merge commit '98304c846d8866dae6322ef400ce6595b23cfc41' into upstream-merge (diff) | |
| parent | Merge commit 'mst/for_anthony' into mst (diff) | |
| download | qemu-kvm-52e7939e712d0eb282c8b6cd9b57f17fb55cd68f.tar.gz qemu-kvm-52e7939e712d0eb282c8b6cd9b57f17fb55cd68f.tar.bz2 qemu-kvm-52e7939e712d0eb282c8b6cd9b57f17fb55cd68f.zip | |
Merge commit '365369847f2827b14b96c52d0fbaf9cce404e68a' into upstream-merge
* commit '365369847f2827b14b96c52d0fbaf9cce404e68a':
tcg: increase TCG_MAX_OP_SIZE to 192
tcg: initial mips support
target-mips: use physical address in lladdr
target-mips: add a function to do virtual -> physical translations
target-mips: split code raising MMU exception in a separate function
target-mips: factorize load/store code in op_helper.c
Fix commit a167ba50851cdac2fa36633587e98c5956cd6b18
Add support for GNU/kFreeBSD
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'fpu')
| -rw-r--r-- | fpu/softfloat-native.c | 2 | ||||
| -rw-r--r-- | fpu/softfloat-native.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/fpu/softfloat-native.c b/fpu/softfloat-native.c index b4b678406..cb0e97be2 100644 --- a/fpu/softfloat-native.c +++ b/fpu/softfloat-native.c @@ -10,7 +10,7 @@ void set_float_rounding_mode(int val STATUS_PARAM) { STATUS(float_rounding_mode) = val; -#if defined(CONFIG_BSD) && !defined(__APPLE__) || \ +#if (defined(CONFIG_BSD) && !defined(__APPLE__) && !defined(__GLIBC__)) || \ (defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10) fpsetround(val); #elif defined(__arm__) diff --git a/fpu/softfloat-native.h b/fpu/softfloat-native.h index 0893ce36f..35670c80d 100644 --- a/fpu/softfloat-native.h +++ b/fpu/softfloat-native.h @@ -1,7 +1,8 @@ /* Native implementation of soft float functions */ #include <math.h> -#if (defined(CONFIG_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) +#if (defined(CONFIG_BSD) && !defined(__APPLE__) && !defined(__GLIBC__)) \ + || defined(CONFIG_SOLARIS) #include <ieeefp.h> #define fabsf(f) ((float)fabs(f)) #else @@ -112,7 +113,8 @@ typedef union { /*---------------------------------------------------------------------------- | Software IEC/IEEE floating-point rounding mode. *----------------------------------------------------------------------------*/ -#if (defined(CONFIG_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) +#if (defined(CONFIG_BSD) && !defined(__APPLE__) && !defined(__GLIBC__)) \ + || defined(CONFIG_SOLARIS) #if defined(__OpenBSD__) #define FE_RM FP_RM #define FE_RP FP_RP |