From 3ca622e4d6054c0b99b2df36580462663edc8d12 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 12 Sep 2017 18:52:05 -0300 Subject: posix: Fix compat glob code on s390 and alpha This patch fixes the compat glob implementation consolidation from commit 116f1c64d with the following changes: - Add a compat implementation on s390 to avoid the architecture to build the symbols on default linux oldglob.c by setting GLOB_NO_OLD_VERSION. - Remove the duplicate rule to build oldglob on alpha. Checked on s390-linux-gnu and alpha-linux-gnu using build-many-glibc.py. * sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c: New file. * sysdeps/unix/sysv/linux/alpha/Makefile [$(subdir) = csu] (sysdep_routines): Remove rule. --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/alpha/Makefile | 4 ---- sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c diff --git a/ChangeLog b/ChangeLog index e7b77cef33..3b74c0e196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-09-13 Adhemerval Zanella + + * sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c: New file. + * sysdeps/unix/sysv/linux/alpha/Makefile + [$(subdir) = csu] (sysdep_routines): Remove rule. + 2017-09-13 Joseph Myers * sysdeps/generic/libm-alias-double.h: New file. diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile index 47bd189f94..50f4fb1183 100644 --- a/sysdeps/unix/sysv/linux/alpha/Makefile +++ b/sysdeps/unix/sysv/linux/alpha/Makefile @@ -1,7 +1,3 @@ -ifeq ($(subdir),posix) -sysdep_routines += oldglob -endif - ifeq ($(subdir),stdlib) gen-as-const-headers += ucontext-offsets.sym endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c b/sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c new file mode 100644 index 0000000000..56d7d12ea6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c @@ -0,0 +1,2 @@ +#define GLOB_NO_OLD_VERSION +#include -- cgit 1.4.1