runtime: fix misc gcc-isms and undefined behavior

[gcc.git] / libgo / runtime / go-cdiv.c

diff --git a/libgo/runtime/go-cdiv.c b/libgo/runtime/go-cdiv.c
index 0a81e458c84d35f69bf8d5ad06a5a5df27c574e8..0355e26fc8ed2a955bddc7dcd41e180d33691f66 100644 (file)
--- a/libgo/runtime/go-cdiv.c
+++ b/libgo/runtime/go-cdiv.c
@@ -4,6 +4,9 @@
    Use of this source code is governed by a BSD-style
    license that can be found in the LICENSE file.  */
 
+#include <complex.h>
+#include <math.h>
+
 /* Calls to these functions are generated by the Go frontend for
    division of complex64 or complex128.  We use these because Go's
    complex division expects slightly different results from the GCC
@@ -13,33 +16,33 @@
    the the whole number is Inf, but an operation involving NaN ought
    to result in NaN, not Inf.  */
 
-__complex float
-__go_complex64_div (__complex float a, __complex float b)
+complex float
+__go_complex64_div (complex float a, complex float b)
 {
-  if (__builtin_expect (b == 0+0i, 0))
+  if (__builtin_expect (b == 0, 0))
     {
-      if (!__builtin_isinff (__real__ a)
-         && !__builtin_isinff (__imag__ a)
-         && (__builtin_isnanf (__real__ a) || __builtin_isnanf (__imag__ a)))
+      if (!isinf (crealf (a))
+         && !isinf (cimagf (a))
+         && (isnan (crealf (a)) || isnan (cimagf (a))))
        {
          /* Pass "1" to nanf to match math/bits.go.  */
-         return __builtin_nanf("1") + __builtin_nanf("1")*1i;
+         return nanf("1") + nanf("1")*I;
        }
     }
   return a / b;
 }
 
-__complex double
-__go_complex128_div (__complex double a, __complex double b)
+complex double
+__go_complex128_div (complex double a, complex double b)
 {
-  if (__builtin_expect (b == 0+0i, 0))
+  if (__builtin_expect (b == 0, 0))
     {
-      if (!__builtin_isinf (__real__ a)
-         && !__builtin_isinf (__imag__ a)
-         && (__builtin_isnan (__real__ a) || __builtin_isnan (__imag__ a)))
+      if (!isinf (creal (a))
+         && !isinf (cimag (a))
+         && (isnan (creal (a)) || isnan (cimag (a))))
        {
          /* Pass "1" to nan to match math/bits.go.  */
-         return __builtin_nan("1") + __builtin_nan("1")*1i;
+         return nan("1") + nan("1")*I;
        }
     }
   return a / b;