Turn off HAVE_FLOAT128 for CUDACC and ICC compilers.

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1717257
Forwarded: no
Last-Update: 2017-10-11

Gbp-Pq: Topic any
Gbp-Pq: Name local-cudacc-float128.diff

diff --git a/sysdeps/powerpc/bits/floatn.h b/sysdeps/powerpc/bits/floatn.h
index b1175363c2f397bdab0533c37d078e2add396737..5442022bdd9cde233edf939a0a29f720817acc0f 100644 (file)
--- a/sysdeps/powerpc/bits/floatn.h
+++ b/sysdeps/powerpc/bits/floatn.h
@@ -26,7 +26,7 @@
    floating-point type with the IEEE 754 binary128 format, and this glibc
    includes corresponding *f128 interfaces for it.  */
 #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \
-    && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH
+    && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH && !defined(__CUDACC__) && !defined(__ICC)
 # define __HAVE_FLOAT128 1
 #else
 # define __HAVE_FLOAT128 0

diff --git a/sysdeps/x86/bits/floatn.h b/sysdeps/x86/bits/floatn.h
index f7f3d05667d64850cba5cd0d9958f29a4bd132cb..8b5cc784d62c6ab4aedaf96e38e94fc49409cb2c 100644 (file)
--- a/sysdeps/x86/bits/floatn.h
+++ b/sysdeps/x86/bits/floatn.h
@@ -28,7 +28,8 @@
    support, for x86_64 and x86.  */
 #if (defined __x86_64__                                                        \
      ? __GNUC_PREREQ (4, 3)                                            \
-     : (defined __GNU__ ? __GNUC_PREREQ (4, 5) : __GNUC_PREREQ (4, 4)))
+     : (defined __GNU__ ? __GNUC_PREREQ (4, 5) : __GNUC_PREREQ (4, 4))) \
+     &&  !defined(__CUDACC__) && !defined(__ICC)
 # define __HAVE_FLOAT128 1
 #else
 # define __HAVE_FLOAT128 0