Skip to content

Commit

Permalink
ia64: fpu: fix gamma definition handling [BZ #15421]
Browse files Browse the repository at this point in the history
The rework in commit d709042 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.
  • Loading branch information
Mike Frysinger committed Jan 2, 2016
1 parent e0043e1 commit 19e0751
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 16 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2016-01-01 Mike Frysinger <vapier@gentoo.org>

[BZ #15421]
* sysdeps/ia64/fpu/w_lgamma_main.c: Include math.h & math_private.h.
[BUILD_LGAMMA]: Wrap all code by define. Re-indent sub-preprocessor.
* sysdeps/ia64/fpu/w_lgammaf_main.c: Likewise.
* sysdeps/ia64/fpu/w_lgammal_main.c: Likewise.

2015-12-30 Dmitry V. Levin <ldv@altlinux.org>

[BZ #19408]
Expand Down
14 changes: 9 additions & 5 deletions sysdeps/ia64/fpu/w_lgamma_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 9 additions & 5 deletions sysdeps/ia64/fpu/w_lgammaf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 10 additions & 6 deletions sysdeps/ia64/fpu/w_lgammal_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 19e0751

Please sign in to comment.