This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] ia64: fpu: fix gamma definition handling [BZ #15421]
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Cc: joseph at codesourcery dot com
- Date: Tue, 29 Dec 2015 01:08:43 -0500
- Subject: [PATCH] ia64: fpu: fix gamma definition handling [BZ #15421]
- Authentication-results: sourceware.org; auth=none
The rework in commit d709042a6e5ab3c360280faad6f9538a34dc8eea broke
buiding on ia64 due to compat_symbol expanding into ... in some cases.
The common files were wrapped in a BUILD_LGAMMA check, but the ia64
ones were not. Add that logic to the ia64 files too.
---
sysdeps/ia64/fpu/w_lgamma_main.c | 14 +++++++++-----
sysdeps/ia64/fpu/w_lgammaf_main.c | 14 +++++++++-----
sysdeps/ia64/fpu/w_lgammal_main.c | 16 ++++++++++------
3 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/sysdeps/ia64/fpu/w_lgamma_main.c b/sysdeps/ia64/fpu/w_lgamma_main.c
index 0d93bde..3ad73b6 100644
--- a/sysdeps/ia64/fpu/w_lgamma_main.c
+++ b/sysdeps/ia64/fpu/w_lgamma_main.c
@@ -53,21 +53,25 @@
#include "libm_support.h"
+#include <math.h>
+#include <math_private.h>
+
#include <lgamma-compat.h>
extern double __libm_lgamma(double /*x*/, int* /*signgam*/, int /*signgamsz*/);
-
+#if BUILD_LGAMMA
double LGFUNC (lgamma) (double x)
{
return CALL_LGAMMA (double, __libm_lgamma, x);
}
-#if USE_AS_COMPAT
+# if USE_AS_COMPAT
compat_symbol (libm, __lgamma_compat, lgamma, LGAMMA_OLD_VER);
-#else
+# else
versioned_symbol (libm, __ieee754_lgamma, lgamma, LGAMMA_NEW_VER);
-#endif
-#if GAMMA_ALIAS
+# endif
+# if GAMMA_ALIAS
strong_alias (LGFUNC (lgamma), __ieee754_gamma)
weak_alias (__ieee754_gamma, gamma)
+# endif
#endif
diff --git a/sysdeps/ia64/fpu/w_lgammaf_main.c b/sysdeps/ia64/fpu/w_lgammaf_main.c
index d8e86a6..2f3dd41 100644
--- a/sysdeps/ia64/fpu/w_lgammaf_main.c
+++ b/sysdeps/ia64/fpu/w_lgammaf_main.c
@@ -53,21 +53,25 @@
#include "libm_support.h"
+#include <math.h>
+#include <math_private.h>
+
#include <lgamma-compat.h>
extern float __libm_lgammaf(float /*x*/, int* /*signgam*/, int /*signgamsz*/);
-
+#if BUILD_LGAMMA
float LGFUNC (lgammaf) (float x)
{
return CALL_LGAMMA (float, __libm_lgammaf, x);
}
-#if USE_AS_COMPAT
+# if USE_AS_COMPAT
compat_symbol (libm, __lgammaf_compat, lgammaf, LGAMMA_OLD_VER);
-#else
+# else
versioned_symbol (libm, __ieee754_lgammaf, lgammaf, LGAMMA_NEW_VER);
-#endif
-#if GAMMA_ALIAS
+# endif
+# if GAMMA_ALIAS
strong_alias (LGFUNC (lgammaf), __ieee754_gammaf)
weak_alias (__ieee754_gammaf, gammaf)
+# endif
#endif
diff --git a/sysdeps/ia64/fpu/w_lgammal_main.c b/sysdeps/ia64/fpu/w_lgammal_main.c
index 5c73f33..7879611 100644
--- a/sysdeps/ia64/fpu/w_lgammal_main.c
+++ b/sysdeps/ia64/fpu/w_lgammal_main.c
@@ -52,21 +52,25 @@
#include "libm_support.h"
-
-extern double __libm_lgammal(long double /*x*/, int* /*signgam*/, int /*signgamsz*/);
+#include <math.h>
+#include <math_private.h>
#include <lgamma-compat.h>
+extern double __libm_lgammal(long double /*x*/, int* /*signgam*/, int /*signgamsz*/);
+
+#if BUILD_LGAMMA
long double LGFUNC (lgammal) (long double x)
{
return CALL_LGAMMA (long double, __libm_lgammal, x);
}
-#if USE_AS_COMPAT
+# if USE_AS_COMPAT
compat_symbol (libm, __lgammal_compat, lgammal, LGAMMA_OLD_VER);
-#else
+# else
versioned_symbol (libm, __ieee754_lgammal, lgammal, LGAMMA_NEW_VER);
-#endif
-#if GAMMA_ALIAS
+# endif
+# if GAMMA_ALIAS
strong_alias (LGFUNC (lgammal), __ieee754_gammal)
weak_alias (__ieee754_gammal, gammal)
+# endif
#endif
--
2.6.2