16 files changed, 21 insertions, 20 deletions
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h
index a9a182169b..fc102c23a4 100644
--- a/sysdeps/generic/_G_config.h
+++ b/sysdeps/generic/_G_config.h
@@ -9,6 +9,7 @@
 #include <bits/types.h>
 #define __need_size_t
 #define __need_wint_t
+#define __need_NULL
 #include <stddef.h>
 #ifndef _WINT_T
 /* Integral type unchanged by default argument promotions that can
diff --git a/sysdeps/generic/e_acoshl.c b/sysdeps/generic/e_acoshl.c
index 2c7e8ca3cd..2c2fbe8eb4 100644
--- a/sysdeps/generic/e_acoshl.c
+++ b/sysdeps/generic/e_acoshl.c
@@ -10,5 +10,5 @@ __ieee754_acoshl (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_acoshl)
+stub_warning (acoshl)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_acosl.c b/sysdeps/generic/e_acosl.c
index f7ee70d592..d844d885b8 100644
--- a/sysdeps/generic/e_acosl.c
+++ b/sysdeps/generic/e_acosl.c
@@ -10,5 +10,5 @@ __ieee754_acosl (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_acosl)
+stub_warning (acosl)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_asinl.c b/sysdeps/generic/e_asinl.c
index 271a375fa2..3b26f030ef 100644
--- a/sysdeps/generic/e_asinl.c
+++ b/sysdeps/generic/e_asinl.c
@@ -10,5 +10,5 @@ __ieee754_asinl (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_asinl)
+stub_warning (asinl)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_atan2l.c b/sysdeps/generic/e_atan2l.c
index 00d43d95c2..0caed8a32f 100644
--- a/sysdeps/generic/e_atan2l.c
+++ b/sysdeps/generic/e_atan2l.c
@@ -10,5 +10,5 @@ __ieee754_atan2l (long double x, long double y)
   return 0.0;
 }
 
-stub_warning (__ieee754_atan2l)
+stub_warning (atan2l)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_expl.c b/sysdeps/generic/e_expl.c
index 9d6a4bd4bd..f9467c38ab 100644
--- a/sysdeps/generic/e_expl.c
+++ b/sysdeps/generic/e_expl.c
@@ -10,5 +10,5 @@ __ieee754_expl (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_expl)
+stub_warning (expl)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_fmodl.c b/sysdeps/generic/e_fmodl.c
index 950ba085b5..380da24e41 100644
--- a/sysdeps/generic/e_fmodl.c
+++ b/sysdeps/generic/e_fmodl.c
@@ -10,5 +10,5 @@ __ieee754_fmodl (long double x, long double y)
   return 0.0;
 }
 
-stub_warning (__ieee754_fmodl)
+stub_warning (fmodl)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_j0l.c b/sysdeps/generic/e_j0l.c
index 1e36bf76ad..624914b9ff 100644
--- a/sysdeps/generic/e_j0l.c
+++ b/sysdeps/generic/e_j0l.c
@@ -10,7 +10,7 @@ __ieee754_j0l (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_j0l)
+stub_warning (j0l)
 
 long double
 __ieee754_y0l (long double x)
@@ -20,5 +20,5 @@ __ieee754_y0l (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_y0l)
+stub_warning (y0l)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_j1l.c b/sysdeps/generic/e_j1l.c
index a1d30e2501..c2ae40e05c 100644
--- a/sysdeps/generic/e_j1l.c
+++ b/sysdeps/generic/e_j1l.c
@@ -10,7 +10,7 @@ __ieee754_j1l (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_j1l)
+stub_warning (j1l)
 
 long double
 __ieee754_y1l (long double x)
@@ -20,5 +20,5 @@ __ieee754_y1l (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_y1l)
+stub_warning (y1l)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_jnl.c b/sysdeps/generic/e_jnl.c
index 78915ec817..411598d40a 100644
--- a/sysdeps/generic/e_jnl.c
+++ b/sysdeps/generic/e_jnl.c
@@ -10,7 +10,7 @@ __ieee754_jnl (int n, long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_jnl)
+stub_warning (jnl)
 
 long double
 __ieee754_ynl (int n, long double x)
@@ -20,5 +20,5 @@ __ieee754_ynl (int n, long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_ynl)
+stub_warning (ynl)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_lgammal_r.c b/sysdeps/generic/e_lgammal_r.c
index bba92bb5e2..0c1bc661ad 100644
--- a/sysdeps/generic/e_lgammal_r.c
+++ b/sysdeps/generic/e_lgammal_r.c
@@ -10,5 +10,6 @@ __ieee754_lgammal_r (long double x, int *signgamp)
   return 0.0;
 }
 
-stub_warning (__ieee754_lgammal_r)
+stub_warning (lgammal)
+stub_warning (lgammal_r)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_log10l.c b/sysdeps/generic/e_log10l.c
index fef310308a..5bc264b32c 100644
--- a/sysdeps/generic/e_log10l.c
+++ b/sysdeps/generic/e_log10l.c
@@ -10,5 +10,5 @@ __ieee754_log10l (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_log10l)
+stub_warning (log10l)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_logl.c b/sysdeps/generic/e_logl.c
index 3fe7a48459..9ba9cfc799 100644
--- a/sysdeps/generic/e_logl.c
+++ b/sysdeps/generic/e_logl.c
@@ -10,5 +10,5 @@ __ieee754_logl (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_logl)
+stub_warning (logl)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_powl.c b/sysdeps/generic/e_powl.c
index 96ec53943e..afc2248b6b 100644
--- a/sysdeps/generic/e_powl.c
+++ b/sysdeps/generic/e_powl.c
@@ -10,5 +10,5 @@ __ieee754_powl (long double x, long double y)
   return 0.0;
 }
 
-stub_warning (__ieee754_powl)
+stub_warning (powl)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/e_sqrtl.c b/sysdeps/generic/e_sqrtl.c
index d5380809ed..7680bdb145 100644
--- a/sysdeps/generic/e_sqrtl.c
+++ b/sysdeps/generic/e_sqrtl.c
@@ -10,5 +10,5 @@ __ieee754_sqrtl (long double x)
   return 0.0;
 }
 
-stub_warning (__ieee754_sqrtl)
+stub_warning (sqrtl)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/s_exp2l.c b/sysdeps/generic/s_exp2l.c
index 46ecc4eae3..64ef6d3d50 100644
--- a/sysdeps/generic/s_exp2l.c
+++ b/sysdeps/generic/s_exp2l.c
@@ -3,13 +3,12 @@
 #include <errno.h>
 
 long double
-__exp2l (long double x)
+__ieee754_exp2l (long double x)
 {
-  fputs ("__exp2l not implemented\n", stderr);
+  fputs ("__ieee754_exp2l not implemented\n", stderr);
   __set_errno (ENOSYS);
   return 0.0;
 }
-weak_alias (__exp2l, exp2l)
 
 stub_warning (exp2l)
 #include <stub-tag.h>