[gcc-7] 319/354: * Mask __float128 from CUDA compilers. LP: #1717257.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 16ebff634487e426d57fd5196af0f4b1251bb710
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Oct 16 17:03:43 2017 +0000

      * Mask __float128 from CUDA compilers. LP: #1717257.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9746 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                  |  8 +++++++-
 debian/patches/cuda-float128.diff | 24 ++++++++++++++++++++++++
 debian/rules.patch                |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 600d1ce..ca38b2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-gcc-7 (7.2.0-10) UNRELEASED; urgency=medium
+gcc-7 (7.2.0-11) UNRELEASED; urgency=medium
+
+  * Mask __float128 from CUDA compilers. LP: #1717257.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 16 Oct 2017 19:01:11 +0200
+
+gcc-7 (7.2.0-10) unstable; urgency=medium
 
   * Update to SVN 20171014 (r253748) from the gcc-7-branch.
     - Fix PR go/80914, PR target/82274 (x86), PR target/82524 (x86).
diff --git a/debian/patches/cuda-float128.diff b/debian/patches/cuda-float128.diff
new file mode 100644
index 0000000..61ccd5e
--- /dev/null
+++ b/debian/patches/cuda-float128.diff
@@ -0,0 +1,24 @@
+# Mask __float128 types from CUDA compilers (LP: #1717257)
+
+--- a/src/libstdc++-v3/include/std/type_traits	2017-10-14 14:26:53.293407511 -0600
++++ b/src/libstdc++-v3/include/std/type_traits	2017-10-14 14:31:37.857848519 -0600
+@@ -345,7 +345,7 @@
+     struct __is_floating_point_helper<long double>
+     : public true_type { };
+ 
+-#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128)
++#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128) && !defined(__CUDACC__)
+   template<>
+     struct __is_floating_point_helper<__float128>
+     : public true_type { };
+--- a/src/libstdc++-v3/include/bits/std_abs.h	2017-01-01 05:07:43.905435000 -0700
++++ b/src/libstdc++-v3/include/bits/std_abs.h	2017-10-14 14:31:56.251812105 -0600
+@@ -96,7 +96,7 @@
+   abs(__GLIBCXX_TYPE_INT_N_3 __x) { return __x >= 0 ? __x : -__x; }
+ #endif
+ 
+-#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128)
++#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128) && !defined(__CUDACC__)
+   inline _GLIBCXX_CONSTEXPR
+   __float128
+   abs(__float128 __x)
diff --git a/debian/rules.patch b/debian/rules.patch
index 5566b18..82c4033 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -76,6 +76,7 @@ debian_patches += \
 	pr81829 \
 	pr77631 \
 	pr67165 \
+	cuda-float128 \
 
 
 #	$(if $(filter yes, $(DEB_CROSS)),,gcc-print-file-name) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git