aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2018-02-18 18:23:14 +0100
committerAurelien Jarno <aurelien@aurel32.net>2018-02-18 18:23:47 +0100
commitf8d79582896c52cc2b50bdd030a3ec27ef23b587 (patch)
treefeece469808ec1b36b212a9b5c395945ee7261bd
parent56456a2aadf0522b51ea55be1291ca832c5d0524 (diff)
downloadglibc-f8d79582896c52cc2b50bdd030a3ec27ef23b587.tar
glibc-f8d79582896c52cc2b50bdd030a3ec27ef23b587.tar.gz
glibc-f8d79582896c52cc2b50bdd030a3ec27ef23b587.tar.bz2
glibc-f8d79582896c52cc2b50bdd030a3ec27ef23b587.zip
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.
-rw-r--r--ChangeLog6
-rw-r--r--posix/tst-glob_lstat_compat.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9be766b2a1..d6262e5746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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-18 Aurelien Jarno <aurelien@aurel32.net>
+
[BZ #21508]
* catgets/xopen-msg.awk: Ignore POT-Creation-Date line.
* intl/Makefile ($(objpfx)tst-gettext-de.po): Generate
diff --git a/posix/tst-glob_lstat_compat.c b/posix/tst-glob_lstat_compat.c
index c46bc9e578..22cd1f02f9 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