aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/math/ldexp.go9
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index b86cb85..4fe569c 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-db685a1a9aa8b3b916dd6d1284895e01d73158e1
+5fd112e5c2968e94761c41519c451d789e23a92b
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/go/math/ldexp.go b/libgo/go/math/ldexp.go
index 2898f5d..e91a090 100644
--- a/libgo/go/math/ldexp.go
+++ b/libgo/go/math/ldexp.go
@@ -13,10 +13,15 @@ package math
// Ldexp(NaN, exp) = NaN
//extern ldexp
-func libc_ldexp(float64, int) float64
+func libc_ldexp(float64, int32) float64
func Ldexp(frac float64, exp int) float64 {
- r := libc_ldexp(frac, exp)
+ if exp > MaxInt32 {
+ exp = MaxInt32
+ } else if exp < MinInt32 {
+ exp = MinInt32
+ }
+ r := libc_ldexp(frac, int32(exp))
return r
}