diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-02-17 02:12:35 -0200 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-02-17 02:12:35 -0200 |
commit | 00defcc58077ec049dca717e7d0882f8691a6664 (patch) | |
tree | 0fe3c5f9b046e7378e554bef56ec4b2c5442d268 /fpu | |
parent | ed880109f74f0a4dd5b7ec09e6a2d9ba4903d9a5 (diff) | |
parent | d0f2c4c60263e29a87681433e696844401514194 (diff) |
Merge commit 'd0f2c4c60263e29a87681433e696844401514194' into upstream-merge
* commit 'd0f2c4c60263e29a87681433e696844401514194': (47 commits)
Do not use dprintf
arm host: fix compiler warning
tcg-i386: Implement setcond.
tcg-i386: Implement small forward branches.
Add -static earlier to LDFLAGS for compile_prog()
Fix missing symbols in .rel/.rela.plt sections
configure: remove debugging code introduced in aa527b65d8187b97d73f889b6cae7b6ac6f82d32
configure: fix compilation on hosts without -fstack-protector-all
Update MAINTAINERS
target-mips: don't call cpu_loop_exit() from helper.c
target-arm: refactor cp15.c13 register access
linux-user: remove signal handler before calling abort()
fix locking error with current_tb
linux-user: adapt uname machine to emulated CPU
target-ppc: change DCR helpers to target_long arguments
tcg-x86_64: implement setcond
tcg: add tcg_invert_cond
tcg: generic support for conditional set
tcg: document double-word support opcodes.
usb-linux: increase buffer for USB control requests
...
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'fpu')
-rw-r--r-- | fpu/softfloat-native.c | 20 | ||||
-rw-r--r-- | fpu/softfloat-native.h | 7 |
2 files changed, 0 insertions, 27 deletions
diff --git a/fpu/softfloat-native.c b/fpu/softfloat-native.c index cb0e97be2..f89b82d8c 100644 --- a/fpu/softfloat-native.c +++ b/fpu/softfloat-native.c @@ -13,8 +13,6 @@ void set_float_rounding_mode(int val STATUS_PARAM) #if (defined(CONFIG_BSD) && !defined(__APPLE__) && !defined(__GLIBC__)) || \ (defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10) fpsetround(val); -#elif defined(__arm__) - /* nothing to do */ #else fesetround(val); #endif @@ -366,25 +364,7 @@ float64 float64_trunc_to_int( float64 a STATUS_PARAM ) float64 float64_round_to_int( float64 a STATUS_PARAM ) { -#if defined(__arm__) - switch(STATUS(float_rounding_mode)) { - default: - case float_round_nearest_even: - asm("rndd %0, %1" : "=f" (a) : "f"(a)); - break; - case float_round_down: - asm("rnddm %0, %1" : "=f" (a) : "f"(a)); - break; - case float_round_up: - asm("rnddp %0, %1" : "=f" (a) : "f"(a)); - break; - case float_round_to_zero: - asm("rnddz %0, %1" : "=f" (a) : "f"(a)); - break; - } -#else return rint(a); -#endif } float64 float64_rem( float64 a, float64 b STATUS_PARAM) diff --git a/fpu/softfloat-native.h b/fpu/softfloat-native.h index fe737b32b..6da0bcbbe 100644 --- a/fpu/softfloat-native.h +++ b/fpu/softfloat-native.h @@ -126,13 +126,6 @@ enum { float_round_up = FP_RP, float_round_to_zero = FP_RZ }; -#elif defined(__arm__) -enum { - float_round_nearest_even = 0, - float_round_down = 1, - float_round_up = 2, - float_round_to_zero = 3 -}; #else enum { float_round_nearest_even = FE_TONEAREST, |