From f8d79582896c52cc2b50bdd030a3ec27ef23b587 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun, 18 Feb 2018 18:23:14 +0100
Subject: [PATCH] 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.
---
ChangeLog | 6 ++++++
posix/tst-glob_lstat_compat.c | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 9be766b2a1..d6262e5746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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-18 Aurelien Jarno <aurelien@aurel32.net>
[BZ #21508]
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