diff mbox

[7/9] posix: Consolidate glob implementation

Message ID 4e53c914-8264-7501-3577-0757c7e15c3c@linaro.org
State Dropped
Headers

Commit Message

Adhemerval Zanella Sept. 13, 2017, 12:26 p.m. UTC 
  On 12/09/2017 11:34, Andreas Schwab wrote:
> On Sep 12 2017, Adhemerval Zanella <adhemerval.zanella@linaro.org> wrote:
> 
>> I will fix it and maybe it is confusing the linker and making you seem
>> the missing glob64 (since oldglob.os and glob64.os both provide the
>> same symbol).
> 
> glob64@GLIBC_2.1 is the only version and it isn't the default, thus
> becomes hidden.
> 
> Andreas.
> 

I pushed the patch below. It removes the alpha rule to add the oldglob
and refrain s390 to build the compat code.

---
diff mbox

Patch

diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile
index 47bd189..50f4fb1 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 0000000..56d7d12
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c
@@ -0,0 +1,2 @@ 
+#define GLOB_NO_OLD_VERSION
+#include <sysdeps/unix/sysv/linux/oldglob.c>