Skip to content

Commit

Permalink
Fix __finitel libm compat symbol version.
Browse files Browse the repository at this point in the history
The changes to restrict implementation-namespace symbol aliases such
as __finitel to compat symbols used code for __finitel in libm
analogous to that for __finitel in libc.  However, the versions for
the two symbols are actually different, GLIBC_2.0 in libc and
GLIBC_2.1 in libm.  This patch fixes the handling of the libm compat
symbol.

Tested for mips (o32), where it fixes an ABI test failure.

	* sysdeps/ieee754/dbl-64/s_finite.c
	[NO_LONG_DOUBLE && LDBL_CLASSIFY_COMPAT] (__finitel): Define
	compat symbol at version GLIBC_2_1 and use GLIBC_2_1 in
	SHLIB_COMPAT condition for libm, not GLIBC_2_0.
	* sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c
	[NO_LONG_DOUBLE && LDBL_CLASSIFY_COMPAT] (__finitel): Likewise.
  • Loading branch information
Joseph Myers committed Jan 20, 2016
1 parent 00b8537 commit dcb133b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
2016-01-20 Joseph Myers <joseph@codesourcery.com>

* sysdeps/ieee754/dbl-64/s_finite.c
[NO_LONG_DOUBLE && LDBL_CLASSIFY_COMPAT] (__finitel): Define
compat symbol at version GLIBC_2_1 and use GLIBC_2_1 in
SHLIB_COMPAT condition for libm, not GLIBC_2_0.
* sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c
[NO_LONG_DOUBLE && LDBL_CLASSIFY_COMPAT] (__finitel): Likewise.

* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/localplt.data
(__gtsf2): Add as optional for libc.so.
(__unordsf2): Likewise.
Expand Down
4 changes: 2 additions & 2 deletions sysdeps/ieee754/dbl-64/s_finite.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ weak_alias (__finite, finite)
# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
compat_symbol (libc, __finite, __finitel, GLIBC_2_0);
# endif
# if SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_23)
compat_symbol (libm, __finite, __finitel, GLIBC_2_0);
# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_23)
compat_symbol (libm, __finite, __finitel, GLIBC_2_1);
# endif
# endif
weak_alias (__finite, finitel)
Expand Down
4 changes: 2 additions & 2 deletions sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ weak_alias (__finite, finite)
# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
compat_symbol (libc, __finite, __finitel, GLIBC_2_0);
# endif
# if SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_23)
compat_symbol (libm, __finite, __finitel, GLIBC_2_0);
# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_23)
compat_symbol (libm, __finite, __finitel, GLIBC_2_1);
# endif
# endif
weak_alias (__finite, finitel)
Expand Down

0 comments on commit dcb133b

Please sign in to comment.