svn commit: r354596 - in stable: 10/lib/libc/gen 10/lib/msun/src 11/lib/libc/gen 11/lib/msun/src 12/lib/libc/gen 12/lib/msun/src

[Dimitry Andric]

Author: dim
Date: Sun Nov 10 17:33:10 2019
New Revision: 354596
URL: https://svnweb.freebsd.org/changeset/base/354596

Log:
  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 <built-in>: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

Modified:
  stable/10/lib/libc/gen/isnan.c
  stable/10/lib/msun/src/math.h
  stable/10/lib/msun/src/s_isnan.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/lib/libc/gen/isnan.c
  stable/11/lib/msun/src/math.h
  stable/11/lib/msun/src/s_isnan.c
  stable/12/lib/libc/gen/isnan.c
  stable/12/lib/msun/src/math.h
  stable/12/lib/msun/src/s_isnan.c
Directory Properties:
  stable/11/   (props changed)
  stable/12/   (props changed)

Modified: stable/10/lib/libc/gen/isnan.c
==============================================================================
--- stable/10/lib/libc/gen/isnan.c	Sun Nov 10 17:00:23 2019	(r354595)
+++ stable/10/lib/libc/gen/isnan.c	Sun Nov 10 17:33:10 2019	(r354596)
@@ -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);
 

Modified: stable/10/lib/msun/src/math.h
==============================================================================
--- stable/10/lib/msun/src/math.h	Sun Nov 10 17:00:23 2019	(r354595)
+++ stable/10/lib/msun/src/math.h	Sun Nov 10 17:33:10 2019	(r354596)
@@ -219,6 +219,12 @@ __inline_isnanl(__const long double __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
  * (SUSv3, POSIX.1-2001, define it as a macro that accepts any real floating

Modified: stable/10/lib/msun/src/s_isnan.c
==============================================================================
--- stable/10/lib/msun/src/s_isnan.c	Sun Nov 10 17:00:23 2019	(r354595)
+++ stable/10/lib/msun/src/s_isnan.c	Sun Nov 10 17:33:10 2019	(r354596)
@@ -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)
 {