Fix extra PLT reference in libc.so due to __glob64_time64 if build with gcc 7.5 on...

Starting with recent commit 84f7ce84474c1648ce96884f1c91ca7b97ca3fc2
"posix: Add glob64 with 64-bit time_t support", elf/check-localplt
fails due to extra PLT reference __glob64_time64 in __glob64_time64
itself.

This is observable with gcc 7.5 on x86_64 with -m32 or s390x with
-m31.  E.g. if build with gcc 10, gcc is generating a call to
__glob64_time64.localalias.

This patch is adding a hidden version of __glob64_time64 in the
same way as for __globfree64_time64.

diff --git a/include/glob.h b/include/glob.h
index f48c71960dcf75d6eff474bea95142bce1021d5e..483d5ba9900657bf4d3aadbbf52d40d235e7ecdf 100644 (file)
--- a/include/glob.h
+++ b/include/glob.h
@@ -31,6 +31,7 @@ typedef struct
 extern int __glob64_time64 (const char *pattern, int flags,
                            int (*errfunc) (const char *, int),
                            glob64_time64_t *pglob);
+libc_hidden_proto (__glob64_time64)
 void __globfree64_time64 (glob64_time64_t *pglob);
 libc_hidden_proto (__globfree64_time64)
 # endif

diff --git a/posix/glob64-time64.c b/posix/glob64-time64.c
index b0f8facd849b8a9003abc7c6716ae27e8be81933..434d8ddd7bac27667bba73ea71cdf0057e3f663b 100644 (file)
--- a/posix/glob64-time64.c
+++ b/posix/glob64-time64.c
@@ -43,6 +43,7 @@ __glob64_time64 (const char *pattern, int flags,
   __set_errno (ENOSYS);
   return GLOB_NOSYS;
 }
+libc_hidden_def (__glob64_time64)
 
 stub_warning (glob64)
 

diff --git a/sysdeps/unix/sysv/linux/glob64-time64.c b/sysdeps/unix/sysv/linux/glob64-time64.c
index 260f067fa41fd56c0a74a4e6e7e841b0fc74b9bf..a465f70905e5a8a3380648df1db3de5ff8ab99c2 100644 (file)
--- a/sysdeps/unix/sysv/linux/glob64-time64.c
+++ b/sysdeps/unix/sysv/linux/glob64-time64.c
@@ -41,4 +41,5 @@
 # define COMPILE_GLOB64        1
 
 # include <posix/glob.c>
+libc_hidden_def (__glob64_time64)
 #endif