aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog72
-rw-r--r--include/math.h2
-rw-r--r--sysdeps/alpha/fpu/s_copysign.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_copysignl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_finitel.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_fmal.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_frexpl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_isinfl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_isnanl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_modfl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c2
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/s_signbitl.c2
-rw-r--r--sysdeps/ieee754/ldbl-64-128/s_copysignl.c2
-rw-r--r--sysdeps/ieee754/ldbl-64-128/s_finitel.c2
-rw-r--r--sysdeps/ieee754/ldbl-64-128/s_frexpl.c2
-rw-r--r--sysdeps/ieee754/ldbl-64-128/s_isinfl.c4
-rw-r--r--sysdeps/ieee754/ldbl-64-128/s_isnanl.c4
-rw-r--r--sysdeps/ieee754/ldbl-64-128/s_modfl.c2
-rw-r--r--sysdeps/ieee754/ldbl-64-128/s_scalbnl.c2
-rw-r--r--sysdeps/ieee754/ldbl-64-128/s_signbitl.c2
-rw-r--r--sysdeps/ieee754/ldbl-64-128/w_scalblnl.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_copysign.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_finite.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_frexp.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_isinf.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_isnan.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_ldexp.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_ldexpl.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_modf.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_scalbln.c2
-rw-r--r--sysdeps/ieee754/ldbl-opt/s_scalbn.c2
-rw-r--r--sysdeps/powerpc/power5+/fpu/s_modf.c2
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_copysign.S2
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_copysignl.S2
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/s_isnan.S2
-rw-r--r--sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c2
-rw-r--r--sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c2
-rw-r--r--sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c2
-rw-r--r--sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c2
-rw-r--r--sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c2
-rw-r--r--sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S2
-rw-r--r--sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S2
-rw-r--r--sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S2
-rw-r--r--sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S2
-rw-r--r--sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S2
-rw-r--r--sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S2
-rw-r--r--sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c2
-rw-r--r--sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c2
-rw-r--r--sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c2
-rw-r--r--sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c2
-rw-r--r--sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c2
-rw-r--r--sysdeps/powerpc/powerpc64/fpu/s_copysign.S2
-rw-r--r--sysdeps/powerpc/powerpc64/fpu/s_copysignl.S2
-rw-r--r--sysdeps/powerpc/powerpc64/fpu/s_isnan.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S2
-rw-r--r--sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S2
-rw-r--r--sysdeps/sparc/sparc32/fpu/s_signbitl.S2
-rw-r--r--sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S2
67 files changed, 140 insertions, 68 deletions
diff --git a/ChangeLog b/ChangeLog
index 90889f0125..faeec31775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,77 @@
2014-11-24 Siddhesh Poyarekar <siddhesh@redhat.com>
+ * include/math.h: Use IS_IN instead of IS_IN_libm.
+ * sysdeps/alpha/fpu/s_copysign.c: Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_copysignl.c: Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_finitel.c: Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_fmal.c: Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_frexpl.c: Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_isinfl.c: Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_isnanl.c: Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_modfl.c: Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c: Likewise.
+ * sysdeps/ieee754/ldbl-128ibm/s_signbitl.c: Likewise.
+ * sysdeps/ieee754/ldbl-64-128/s_copysignl.c: Likewise.
+ * sysdeps/ieee754/ldbl-64-128/s_finitel.c: Likewise.
+ * sysdeps/ieee754/ldbl-64-128/s_frexpl.c: Likewise.
+ * sysdeps/ieee754/ldbl-64-128/s_isinfl.c: Likewise.
+ * sysdeps/ieee754/ldbl-64-128/s_isnanl.c: Likewise.
+ * sysdeps/ieee754/ldbl-64-128/s_modfl.c: Likewise.
+ * sysdeps/ieee754/ldbl-64-128/s_scalbnl.c: Likewise.
+ * sysdeps/ieee754/ldbl-64-128/s_signbitl.c: Likewise.
+ * sysdeps/ieee754/ldbl-64-128/w_scalblnl.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_copysign.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_finite.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_frexp.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_isinf.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_isnan.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_ldexp.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_ldexpl.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_modf.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_scalbln.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/s_scalbn.c: Likewise.
+ * sysdeps/powerpc/power5+/fpu/s_modf.c: Likewise.
+ * sysdeps/powerpc/powerpc32/fpu/s_copysign.S: Likewise.
+ * sysdeps/powerpc/powerpc32/fpu/s_copysignl.S: Likewise.
+ * sysdeps/powerpc/powerpc32/fpu/s_isnan.S: Likewise.
+ * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c:
+ Likewise.
+ * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c:
+ Likewise.
+ * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c:
+ Likewise.
+ * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c:
+ Likewise.
+ * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c:
+ Likewise.
+ * sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S: Likewise.
+ * sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S: Likewise.
+ * sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S: Likewise.
+ * sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S: Likewise.
+ * sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S: Likewise.
+ * sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S: Likewise.
+ * sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c: Likewise.
+ * sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c: Likewise.
+ * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c: Likewise.
+ * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c: Likewise.
+ * sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c: Likewise.
+ * sysdeps/powerpc/powerpc64/fpu/s_copysign.S: Likewise.
+ * sysdeps/powerpc/powerpc64/fpu/s_copysignl.S: Likewise.
+ * sysdeps/powerpc/powerpc64/fpu/s_isnan.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S: Likewise.
+ * sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S: Likewise.
+ * sysdeps/sparc/sparc32/fpu/s_signbitl.S: Likewise.
+ * sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S: Likewise.
+
* nptl/lowlevellock.c: Use IS_IN instead of IS_IN_libpthread.
* nptl/pthreadP.h: Likewise.
* nptl_db/structs.def: Likewise.
diff --git a/include/math.h b/include/math.h
index cbbce59501..b10bfa0474 100644
--- a/include/math.h
+++ b/include/math.h
@@ -6,7 +6,7 @@
/* Now define the internal interfaces. */
extern int __matherr (struct exception *__exc);
-# if !defined NOT_IN_libc || defined IS_IN_libm
+# if !defined NOT_IN_libc || IS_IN (libm)
hidden_proto (__finite)
hidden_proto (__isinf)
hidden_proto (__isnan)
diff --git a/sysdeps/alpha/fpu/s_copysign.c b/sysdeps/alpha/fpu/s_copysign.c
index 13f5f1bf4b..9092613e02 100644
--- a/sysdeps/alpha/fpu/s_copysign.c
+++ b/sysdeps/alpha/fpu/s_copysign.c
@@ -30,7 +30,7 @@ weak_alias (__copysign, copysign)
strong_alias (__copysign, __copysignl)
weak_alias (__copysign, copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c b/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c
index a16a886852..3b8ec1a74d 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c
@@ -34,7 +34,7 @@ long double __copysignl(long double x, long double y)
return x;
}
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __copysignl, copysignl);
#else
long_double_symbol (libc, __copysignl, copysignl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_finitel.c b/sysdeps/ieee754/ldbl-128ibm/s_finitel.c
index 7b4655fadb..b562ce60b6 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_finitel.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_finitel.c
@@ -40,7 +40,7 @@ ___finitel (long double x)
}
hidden_ver (___finitel, __finitel)
weak_alias (___finitel, ____finitel)
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, ____finitel, finitel);
long_double_symbol (libm, ___finitel, __finitel);
#else
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fmal.c b/sysdeps/ieee754/ldbl-128ibm/s_fmal.c
index 46dedf83fb..a2111d0598 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_fmal.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_fmal.c
@@ -37,7 +37,7 @@ __fmal (long double x, long double y, long double z)
return (x * y) + z;
}
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __fmal, fmal);
#else
long_double_symbol (libc, __fmal, fmal);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c b/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c
index a644f9269e..483c6a8c5d 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c
@@ -141,7 +141,7 @@ long double __frexpl(long double x, int *eptr)
*eptr = expon;
return x;
}
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __frexpl, frexpl);
#else
long_double_symbol (libc, __frexpl, frexpl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c b/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c
index 6a728221fc..730aa4d8d1 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c
@@ -33,7 +33,7 @@ ___isinfl (long double x)
return ~mask & (hx >> 62);
}
hidden_ver (___isinfl, __isinfl)
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
weak_alias (___isinfl, ____isinfl)
long_double_symbol (libc, ___isinfl, isinfl);
long_double_symbol (libc, ____isinfl, __isinfl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c b/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c
index d12f1d3bf5..9980875df2 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c
@@ -39,7 +39,7 @@ ___isnanl (long double x)
return (int) (hx >> 63);
}
hidden_ver (___isnanl, __isnanl)
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
weak_alias (___isnanl, ____isnanl)
long_double_symbol (libc, ___isnanl, isnanl);
long_double_symbol (libc, ____isnanl, __isnanl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_modfl.c b/sysdeps/ieee754/ldbl-128ibm/s_modfl.c
index ed03ce236c..260cc3e33c 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_modfl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_modfl.c
@@ -89,7 +89,7 @@ long double __modfl(long double x, long double *iptr)
}
}
}
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __modfl, modfl);
#else
long_double_symbol (libc, __modfl, modfl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c b/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c
index 161172db6e..a0d7aa9d63 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c
@@ -102,7 +102,7 @@ long double __scalbnl (long double x, int n)
x = ldbl_pack (xhi, xlo);
return x*twolm54;
}
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __scalbnl, scalbnl);
#else
long_double_symbol (libc, __scalbnl, scalbnl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c b/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c
index 6d25711064..fbccaf12fa 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c
@@ -31,7 +31,7 @@ ___signbitl (long double x)
EXTRACT_WORDS64 (e, xhi);
return e < 0;
}
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, ___signbitl, __signbitl);
#else
long_double_symbol (libc, ___signbitl, __signbitl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_copysignl.c b/sysdeps/ieee754/ldbl-64-128/s_copysignl.c
index 1319584a52..211e7240ac 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_copysignl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_copysignl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <sysdeps/ieee754/ldbl-128/s_copysignl.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __copysignl, copysignl);
#else
long_double_symbol (libc, __copysignl, copysignl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_finitel.c b/sysdeps/ieee754/ldbl-64-128/s_finitel.c
index 90717a1057..c0862a7485 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_finitel.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_finitel.c
@@ -8,7 +8,7 @@
#undef __finitel
hidden_ver (___finitel, __finitel)
_weak_alias (___finitel, ____finitel)
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, ____finitel, finitel);
long_double_symbol (libm, ___finitel, __finitel);
#else
diff --git a/sysdeps/ieee754/ldbl-64-128/s_frexpl.c b/sysdeps/ieee754/ldbl-64-128/s_frexpl.c
index 685bbbab41..c7b6aaaaee 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_frexpl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_frexpl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <sysdeps/ieee754/ldbl-128/s_frexpl.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __frexpl, frexpl);
#else
long_double_symbol (libc, __frexpl, frexpl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_isinfl.c b/sysdeps/ieee754/ldbl-64-128/s_isinfl.c
index e046032b09..6dab0e9223 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_isinfl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_isinfl.c
@@ -1,5 +1,5 @@
#include <math_ldbl_opt.h>
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# undef weak_alias
# define weak_alias(n,a)
# undef hidden_def
@@ -7,7 +7,7 @@
# define __isinfl(arg) ___isinfl(arg)
#endif
#include <sysdeps/ieee754/ldbl-128/s_isinfl.c>
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# undef __isinfl
hidden_ver (___isinfl, __isinfl)
_weak_alias (___isinfl, ____isinfl)
diff --git a/sysdeps/ieee754/ldbl-64-128/s_isnanl.c b/sysdeps/ieee754/ldbl-64-128/s_isnanl.c
index 3673463ae5..ad5ecc5281 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_isnanl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_isnanl.c
@@ -1,5 +1,5 @@
#include <math_ldbl_opt.h>
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# undef weak_alias
# define weak_alias(n,a)
# undef hidden_def
@@ -7,7 +7,7 @@
# define __isnanl(arg) ___isnanl(arg)
#endif
#include <sysdeps/ieee754/ldbl-128/s_isnanl.c>
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# undef __isnanl
hidden_ver (___isnanl, __isnanl)
_weak_alias (___isnanl, ____isnanl)
diff --git a/sysdeps/ieee754/ldbl-64-128/s_modfl.c b/sysdeps/ieee754/ldbl-64-128/s_modfl.c
index c17d6690a8..fa4d3ad82a 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_modfl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_modfl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <sysdeps/ieee754/ldbl-128/s_modfl.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __modfl, modfl);
#else
long_double_symbol (libc, __modfl, modfl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_scalbnl.c b/sysdeps/ieee754/ldbl-64-128/s_scalbnl.c
index 78520e9648..fe2412b97a 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_scalbnl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_scalbnl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <sysdeps/ieee754/ldbl-128/s_scalbnl.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __scalbnl, scalbnl);
#else
long_double_symbol (libc, __scalbnl, scalbnl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_signbitl.c b/sysdeps/ieee754/ldbl-64-128/s_signbitl.c
index f66db2f651..850db7386a 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_signbitl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_signbitl.c
@@ -4,7 +4,7 @@
#define __signbitl(arg) ___signbitl(arg)
#include <sysdeps/ieee754/ldbl-128/s_signbitl.c>
#undef __signbitl
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, ___signbitl, __signbitl);
#else
long_double_symbol (libc, ___signbitl, __signbitl);
diff --git a/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c b/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c
index fc6c4cfd8e..2f3fc1f7ff 100644
--- a/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c
+++ b/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c
@@ -20,7 +20,7 @@
#undef weak_alias
#define weak_alias(name, alias)
#include <math/w_scalblnl.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __w_scalblnl, scalblnl);
#else
long_double_symbol (libc, __w_scalblnl, scalblnl);
diff --git a/sysdeps/ieee754/ldbl-opt/s_copysign.c b/sysdeps/ieee754/ldbl-opt/s_copysign.c
index 425e0eadbd..f4303f5768 100644
--- a/sysdeps/ieee754/ldbl-opt/s_copysign.c
+++ b/sysdeps/ieee754/ldbl-opt/s_copysign.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_copysign.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_finite.c b/sysdeps/ieee754/ldbl-opt/s_finite.c
index 897dbfd3b0..7d3ab0068d 100644
--- a/sysdeps/ieee754/ldbl-opt/s_finite.c
+++ b/sysdeps/ieee754/ldbl-opt/s_finite.c
@@ -1,7 +1,7 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_finite.c>
weak_alias (__finite, ___finite)
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
compat_symbol (libm, __finite, __finitel, GLIBC_2_1);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_frexp.c b/sysdeps/ieee754/ldbl-opt/s_frexp.c
index 59ce352200..0e3a5e0830 100644
--- a/sysdeps/ieee754/ldbl-opt/s_frexp.c
+++ b/sysdeps/ieee754/ldbl-opt/s_frexp.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_frexp.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __frexp, frexpl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_isinf.c b/sysdeps/ieee754/ldbl-opt/s_isinf.c
index 401c8b1318..1f760a0320 100644
--- a/sysdeps/ieee754/ldbl-opt/s_isinf.c
+++ b/sysdeps/ieee754/ldbl-opt/s_isinf.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_isinf.c>
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/ieee754/ldbl-opt/s_isnan.c b/sysdeps/ieee754/ldbl-opt/s_isnan.c
index 164b800b85..33f57f1955 100644
--- a/sysdeps/ieee754/ldbl-opt/s_isnan.c
+++ b/sysdeps/ieee754/ldbl-opt/s_isnan.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_isnan.c>
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexp.c b/sysdeps/ieee754/ldbl-opt/s_ldexp.c
index f0f6519892..20e107be7e 100644
--- a/sysdeps/ieee754/ldbl-opt/s_ldexp.c
+++ b/sysdeps/ieee754/ldbl-opt/s_ldexp.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <math/s_ldexp.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __ldexp, ldexpl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
index d4636b9cc1..0dce1b1620 100644
--- a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
+++ b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <math/s_ldexpl.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __ldexpl, ldexpl);
#else
long_double_symbol (libc, __ldexpl, ldexpl);
diff --git a/sysdeps/ieee754/ldbl-opt/s_modf.c b/sysdeps/ieee754/ldbl-opt/s_modf.c
index 2263811e5e..93acb43ae6 100644
--- a/sysdeps/ieee754/ldbl-opt/s_modf.c
+++ b/sysdeps/ieee754/ldbl-opt/s_modf.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_modf.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __modf, modfl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_scalbln.c b/sysdeps/ieee754/ldbl-opt/s_scalbln.c
index 2398bba49a..391142b769 100644
--- a/sysdeps/ieee754/ldbl-opt/s_scalbln.c
+++ b/sysdeps/ieee754/ldbl-opt/s_scalbln.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_scalbln.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
compat_symbol (libm, __scalbln, scalblnl, GLIBC_2_1);
#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_scalbn.c b/sysdeps/ieee754/ldbl-opt/s_scalbn.c
index 094735ea53..1ad81b199e 100644
--- a/sysdeps/ieee754/ldbl-opt/s_scalbn.c
+++ b/sysdeps/ieee754/ldbl-opt/s_scalbn.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_scalbn.c>
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __scalbn, scalbnl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/power5+/fpu/s_modf.c b/sysdeps/powerpc/power5+/fpu/s_modf.c
index 06da3ac809..7d6cc84088 100644
--- a/sysdeps/powerpc/power5+/fpu/s_modf.c
+++ b/sysdeps/powerpc/power5+/fpu/s_modf.c
@@ -49,7 +49,7 @@ weak_alias (__modf, modf)
strong_alias (__modf, __modfl)
weak_alias (__modf, modfl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __modf, modfl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_copysign.S b/sysdeps/powerpc/powerpc32/fpu/s_copysign.S
index 0d172d732f..25b7ce12f1 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_copysign.S
@@ -50,7 +50,7 @@ strong_alias(__copysign,__copysignf)
weak_alias (__copysign,copysignl)
strong_alias(__copysign,__copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S b/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S
index ecfeafcf7f..31fe9fe36e 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S
@@ -42,7 +42,7 @@ L(0): bgelr cr6
blr
END (__copysignl)
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __copysignl, copysignl)
#else
long_double_symbol (libc, __copysignl, copysignl)
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/fpu/s_isnan.S
index d82a3c64e8..caa85e9e4f 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_isnan.S
@@ -48,7 +48,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c
index 52df99d442..74cd540b2c 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c
@@ -42,7 +42,7 @@ weak_alias (__copysign, copysign)
weak_alias (__copysign,copysignl)
strong_alias(__copysign,__copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c
index c56e7ca994..5244d9a404 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c
@@ -36,7 +36,7 @@ strong_alias (__finite, __finitel)
weak_alias (__finite, finitel)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c
index 2f72c34a94..ba57a256fc 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c
@@ -36,7 +36,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c
index 8f3666b101..f182d5056b 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c
@@ -42,7 +42,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c
index 596b32c9ba..383156b6eb 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c
@@ -35,7 +35,7 @@ weak_alias (__modf, modf)
strong_alias (__modf, __modfl)
weak_alias (__modf, modfl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __modf, modfl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S
index 99879a89de..e91c56709f 100644
--- a/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S
@@ -52,7 +52,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S b/sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S
index d767dcbf46..90e0d29749 100644
--- a/sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S
@@ -47,7 +47,7 @@ strong_alias (__copysign, __copysignl)
weak_alias (__copysign, copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, copysign, copysignl, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S
index 563e70aa89..461ae0d67b 100644
--- a/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S
@@ -52,7 +52,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S b/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S
index 20e266b304..cd1b184835 100644
--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S
+++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S
@@ -78,7 +78,7 @@ strong_alias (__finite, __finitel)
weak_alias (__finite, finitel)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S b/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S
index 47d608a9c2..f9d5ca1214 100644
--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S
+++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S
@@ -77,7 +77,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S
index 9cb82840a5..6aa9e11916 100644
--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S
@@ -82,7 +82,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
index f3e6b3a620..c42b37ce4f 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
@@ -42,7 +42,7 @@ weak_alias (__copysign, copysign)
weak_alias (__copysign,copysignl)
strong_alias(__copysign,__copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
index b9e908df58..078540d36a 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
@@ -39,7 +39,7 @@ strong_alias (__finite, __finitel)
weak_alias (__finite, finitel)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c
index e349a06311..5781c3d035 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c
@@ -39,7 +39,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c
index 65a5ca0cf6..2fd76b442a 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c
@@ -48,7 +48,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c
index f416fa979a..a61adf512c 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c
@@ -35,7 +35,7 @@ weak_alias (__modf, modf)
strong_alias (__modf, __modfl)
weak_alias (__modf, modfl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __modf, modfl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysign.S b/sysdeps/powerpc/powerpc64/fpu/s_copysign.S
index 49c793d386..78b3756321 100644
--- a/sysdeps/powerpc/powerpc64/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc64/fpu/s_copysign.S
@@ -50,7 +50,7 @@ strong_alias(__copysign,__copysignf)
weak_alias (__copysign,copysignl)
strong_alias(__copysign,__copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S b/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S
index 39e180a5ed..453c01a109 100644
--- a/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S
+++ b/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S
@@ -43,7 +43,7 @@ L(0):
blr
END (__copysignl)
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, __copysignl, copysignl)
#else
long_double_symbol (libc, __copysignl, copysignl)
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/fpu/s_isnan.S
index 629dae6841..71e79f6a0e 100644
--- a/sysdeps/powerpc/powerpc64/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/fpu/s_isnan.S
@@ -47,7 +47,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S
index 4ce6cf9006..46796abe7d 100644
--- a/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S
@@ -51,7 +51,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S b/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S
index e1ea089c09..c5bb161450 100644
--- a/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S
@@ -47,7 +47,7 @@ strong_alias (__copysign, __copysignl)
weak_alias (__copysign, copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, copysign, copysignl, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S
index 8a149b21b7..0ba6ad427b 100644
--- a/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S
@@ -50,7 +50,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S
index 3172fe3364..20ed867fce 100644
--- a/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S
@@ -49,7 +49,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S b/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S
index 765d68914a..8d4916dea9 100644
--- a/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S
+++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S
@@ -57,7 +57,7 @@ strong_alias (__finite, __finitef)
hidden_def (__finitef)
weak_alias (__finitef, finitef)
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, __finite, __finitel, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0)
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S
index e102d4b448..79fd2e6d1c 100644
--- a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S
+++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S
@@ -61,7 +61,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S
index eabee712ea..5056261b98 100644
--- a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S
@@ -60,7 +60,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S
index 3e981265ab..67492dcce0 100644
--- a/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S
+++ b/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S
@@ -43,7 +43,7 @@ strong_alias (__finite, __finitef)
hidden_def (__finitef)
weak_alias (__finitef, finitef)
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, __finite, __finitel, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0)
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S
index 125de3943d..e2c0034f54 100644
--- a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S
+++ b/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S
@@ -53,7 +53,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S
index 2c7b2d1d9a..8ecd135efd 100644
--- a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S
@@ -48,7 +48,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/sparc/sparc32/fpu/s_signbitl.S b/sysdeps/sparc/sparc32/fpu/s_signbitl.S
index 64813f1913..52f1baa2e9 100644
--- a/sysdeps/sparc/sparc32/fpu/s_signbitl.S
+++ b/sysdeps/sparc/sparc32/fpu/s_signbitl.S
@@ -25,7 +25,7 @@ ENTRY (___signbitl)
srl %o1, 31, %o0
END (___signbitl)
-#ifdef IS_IN_libm
+#if IS_IN (libm)
long_double_symbol (libm, ___signbitl, __signbitl);
#else
long_double_symbol (libc, ___signbitl, __signbitl);
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S b/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S
index f2e40b1249..584204e6e2 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S
@@ -32,7 +32,7 @@ END (__isnan)
hidden_def (__isnan)
weak_alias (__isnan, isnan)
-#ifndef IS_IN_libm
+#if !IS_IN (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S b/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S
index c5fa62bc99..b8f344e611 100644
--- a/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S
+++ b/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S
@@ -46,7 +46,7 @@ ENTRY(__feraiseexcept)
END(__feraiseexcept)
cfi_endproc
-#ifdef IS_IN_libm
+#if IS_IN (libm)
# include <shlib-compat.h>
# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
strong_alias (__feraiseexcept, __old_feraiseexcept)