From c95ee20e10dae9ef627d80bd0d52c7ed12ccb060 Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 10 Nov 2019 17:33:10 +0000 Subject: [PATCH] MFC r354255: Add __isnan()/__isnanf() aliases for compatibility with glibc and CUDA Even though clang comes with a number of internal CUDA wrapper headers, compiling sample CUDA programs will result in errors similar to: In file included from :1: In file included from /usr/lib/clang/9.0.0/include/__clang_cuda_runtime_wrapper.h:204: /usr/home/arr/cuda/var/cuda-repo-10-0-local-10.0.130-410.48/usr/local/cuda-10.0//include/crt/math_functions.hpp:2910:7: error: no matching function for call to '__isnan' if (__isnan(a)) { ^~~~~~~ /usr/lib/clang/9.0.0/include/__clang_cuda_device_functions.h:460:16: note: candidate function not viable: call to __device__ function from __host__ function __DEVICE__ int __isnan(double __a) { return __nv_isnand(__a); } ^ CUDA expects __isnan() and __isnanf() declarations to be available, which are glibc specific extensions, equivalent to the regular isnan() and isnanf(). To provide these, define __isnan() and __isnanf() as aliases of the already existing static inline functions __inline_isnan() and __inline_isnanf() from math.h. Reported by: arrowd PR: 241550 git-svn-id: svn://svn.freebsd.org/base/stable/10@354596 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- lib/libc/gen/isnan.c | 7 +++++++ lib/msun/src/math.h | 6 ++++++ lib/msun/src/s_isnan.c | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c index 72c2868b5..d4f1c1b07 100644 --- a/lib/libc/gen/isnan.c +++ b/lib/libc/gen/isnan.c @@ -41,6 +41,13 @@ */ #ifdef PIC +/* + * Because math.h defines __isnan and __isnanf as aliases for compatibility with + * glibc and CUDA, we have to undefine them here to avoid redefinition errors. + */ +#undef __isnan +#undef __isnanf + __weak_reference(__isnan, isnan); __weak_reference(__isnanf, isnanf); diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index e70966662..ae5286717 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -218,6 +218,12 @@ __inline_isnanl(__const long double __x) return (__x != __x); } +/* + * Define the following aliases, for compatibility with glibc and CUDA. + */ +#define __isnan __inline_isnan +#define __isnanf __inline_isnanf + /* * Version 2 of the Single UNIX Specification (UNIX98) defined isnan() and * isinf() as functions taking double. C99, and the subsequent POSIX revisions diff --git a/lib/msun/src/s_isnan.c b/lib/msun/src/s_isnan.c index a54ded3fe..62da43c51 100644 --- a/lib/msun/src/s_isnan.c +++ b/lib/msun/src/s_isnan.c @@ -43,6 +43,12 @@ isnan(double d) } #endif /* !PIC */ +/* + * Because math.h defines __isnanf as an alias for compatibility with glibc and + * CUDA, we have to undefine it here to avoid redefinition errors. + */ +#undef __isnanf + int __isnanf(float f) { -- 2.42.0