This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch sid in repository glibc.
commit a3d73b1a85cdb8ae44c38ff2c3005a80f6771564 Author: Samuel Thibault <[email protected]> Date: Mon Jan 22 14:28:48 2018 +0100 Disable _Float128 for icc too debian/patches/any/local-cudacc-float128.diff --- debian/changelog | 7 +++++++ debian/patches/any/local-cudacc-float128.diff | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38e2227..d7a5099 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +glibc (2.26-5) UNRELEASED; urgency=medium + + * debian/patches/any/local-cudacc-float128.diff: Disable _Float128 for icc + too. + + -- Samuel Thibault <[email protected]> Mon, 22 Jan 2018 14:27:57 +0100 + glibc (2.26-4) unstable; urgency=medium [ Aurelien Jarno ] diff --git a/debian/patches/any/local-cudacc-float128.diff b/debian/patches/any/local-cudacc-float128.diff index e01a35b..fc47ce8 100644 --- a/debian/patches/any/local-cudacc-float128.diff +++ b/debian/patches/any/local-cudacc-float128.diff @@ -1,4 +1,4 @@ -Description: Turn off HAVE_FLOAT128 for CUDACC compilers. +Description: Turn off HAVE_FLOAT128 for CUDACC and ICC compilers. Author: Adam Conrad <[email protected]> Bug-Ubuntu: https://bugs.launchpad.net/bugs/1717257 Forwarded: no @@ -12,7 +12,7 @@ Last-Update: 2017-10-11 ? __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(__CUDACC__) && !defined(__ICC) # define __HAVE_FLOAT128 1 #else # define __HAVE_FLOAT128 0 @@ -23,7 +23,7 @@ Last-Update: 2017-10-11 includes corresponding *f128 interfaces for it. */ #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \ - && defined __FLOAT128__ -+ && defined __FLOAT128__ && !defined(__CUDACC__) ++ && defined __FLOAT128__ && !defined(__CUDACC__) && !defined(__ICC) # define __HAVE_FLOAT128 1 #else # define __HAVE_FLOAT128 0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
