diff mbox series

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

Message ID 20210630141737.147527-1-stli@linux.ibm.com
State Committed
Commit ba436665b1c9e8bcef76947a4b59706bc64ceead
Headers show
Series Fix extra PLT reference in libc.so due to __glob64_time64 if build with gcc 7.5 on 32bit. | expand

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Stefan Liebler June 30, 2021, 2:17 p.m. UTC
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.
---
 include/glob.h                          | 1 +
 posix/glob64-time64.c                   | 1 +
 sysdeps/unix/sysv/linux/glob64-time64.c | 1 +
 3 files changed, 3 insertions(+)

Comments

Florian Weimer June 30, 2021, 2:32 p.m. UTC | #1
* Stefan Liebler via Libc-alpha:

> 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.
> ---
>  include/glob.h                          | 1 +
>  posix/glob64-time64.c                   | 1 +
>  sysdeps/unix/sysv/linux/glob64-time64.c | 1 +
>  3 files changed, 3 insertions(+)
>
> diff --git a/include/glob.h b/include/glob.h
> index f48c71960d..483d5ba990 100644
> --- 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 b0f8facd84..434d8ddd7b 100644
> --- 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 260f067fa4..a465f70905 100644
> --- 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

Patch looks okay to me.

Thanks,
Florian
Stefan Liebler July 1, 2021, 2:48 p.m. UTC | #2
On 30/06/2021 16:32, Florian Weimer wrote:
> * Stefan Liebler via Libc-alpha:
> 
>> 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.
>> ---
>>  include/glob.h                          | 1 +
>>  posix/glob64-time64.c                   | 1 +
>>  sysdeps/unix/sysv/linux/glob64-time64.c | 1 +
>>  3 files changed, 3 insertions(+)
>>
>> diff --git a/include/glob.h b/include/glob.h
>> index f48c71960d..483d5ba990 100644
>> --- 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 b0f8facd84..434d8ddd7b 100644
>> --- 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 260f067fa4..a465f70905 100644
>> --- 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
> 
> Patch looks okay to me.
> 
> Thanks,
> Florian
> 

Committed.

Thanks,
Stefan
diff mbox series

Patch

diff --git a/include/glob.h b/include/glob.h
index f48c71960d..483d5ba990 100644
--- 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 b0f8facd84..434d8ddd7b 100644
--- 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 260f067fa4..a465f70905 100644
--- 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