diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2018-02-18 18:23:14 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2018-02-19 20:39:17 +0000 |
| commit | d5f136743d84ca2f7786ad796451b41881a8786b (patch) | |
| tree | 511107e0f38fbdcc98387d91a03a14bf09f1db7e | |
| parent | 1b7671f6e19d2f8f71752a25e490337dbbcb1d12 (diff) | |
| download | glibc-d5f136743d84ca2f7786ad796451b41881a8786b.zip glibc-d5f136743d84ca2f7786ad796451b41881a8786b.tar.gz glibc-d5f136743d84ca2f7786ad796451b41881a8786b.tar.bz2 | |
Fix posix/tst-glob_lstat_compat on alpha [BZ #22818]
The tst-glob_lstat_compat test needs to run tests on the previous
version of glob. On alpha, there are three versions of glob, GLIBC_2.0,
GLIBC_2.1 and GLIBC_2.27, while on other architectures there are only
the GLIBC_2.0 and GLIBC_2.27 version. Therefore on alpha the previous
version is GLIBC_2.1 and not GLIBC_2.0.
Changelog:
[BZ #22818]
* posix/tst-glob_lstat_compat.c [__alpha__] (glob): Access
the GLIBC_2.1 version.
(cherry picked from commit f8d79582896c52cc2b50bdd030a3ec27ef23b587)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | posix/tst-glob_lstat_compat.c | 7 |
3 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,9 @@ +2018-02-18 Aurelien Jarno <aurelien@aurel32.net> + + [BZ #22818] + * posix/tst-glob_lstat_compat.c [__alpha__] (glob): Access + the GLIBC_2.1 version. + 2018-02-02 Sean McKean <smckean83@gmail.com> [BZ #22735] @@ -13,6 +13,7 @@ The following bugs are resolved with this release: configured with --enable-default-pie [22735] Misleading typo in time.h source comment regarding CLOCKS_PER_SECOND [22797] Linux: use reserved name __key in pkey_get + [22818] posix/tst-glob_lstat_compat failure on alpha [22827] RISC-V ELF64 parser mis-reads flag in ldconfig diff --git a/posix/tst-glob_lstat_compat.c b/posix/tst-glob_lstat_compat.c index c46bc9e..22cd1f0 100644 --- a/posix/tst-glob_lstat_compat.c +++ b/posix/tst-glob_lstat_compat.c @@ -35,7 +35,14 @@ #if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_27) __typeof (glob) glob; +/* On alpha glob exists in version GLIBC_2_0, GLIBC_2_1, and GLIBC_2_27. + This test needs to access the version prior to GLIBC_2_27, which is + GLIBC_2_1 on alpha, GLIBC_2_0 elsewhere. */ +# ifdef __alpha__ +compat_symbol_reference (libc, glob, glob, GLIBC_2_1); +# else compat_symbol_reference (libc, glob, glob, GLIBC_2_0); +# endif /* Compat glob should not call gl_lstat since for some old binaries it might be unitialized (for instance GNUmake). Check if it is indeed |