Patchwork [2/3] sysvipc: Implement semop based on semtimedop

login
register
mail settings
Submitter Florian Weimer
Date Oct. 17, 2019, 7:37 p.m.
Message ID <87k193w4c4.fsf@oldenburg2.str.redhat.com>
Download mbox | patch
Permalink /patch/35100/
State Committed
Headers show

Comments

Florian Weimer - Oct. 17, 2019, 7:37 p.m.
* Joseph Myers:

> I'm seeing a build failure for i686-gnu I suspect is caused by this 
> change.
>
> In file included from <command-line>:
> ./../include/libc-symbols.h:545:33: error: '__EI___semtimedop' aliased to undefined symbol '__GI___semtimedop'
>    extern thread __typeof (name) __EI_##name \
>                                  ^~~~~
> ./../include/libc-symbols.h:541:3: note: in expansion of macro '__hidden_ver2'
>    __hidden_ver2 (, local, internal, name)
>    ^~~~~~~~~~~~~
> ./../include/libc-symbols.h:550:29: note: in expansion of macro '__hidden_ver1'
>  #  define hidden_def(name)  __hidden_ver1(__GI_##name, name, name);
>                              ^~~~~~~~~~~~~
> ./../include/libc-symbols.h:619:32: note: in expansion of macro 'hidden_def'
>  # define libc_hidden_def(name) hidden_def (name)
>                                 ^~~~~~~~~~
> semtimedop.c:32:1: note: in expansion of macro 'libc_hidden_def'
>  libc_hidden_def (__semtimedop)
>  ^~~~~~~~~~~~~~~
>
> https://sourceware.org/ml/libc-testresults/2019-q4/msg00085.html

This should fix it.

Thanks,
Florian

8<------------------------------------------------------------------8<
Subject: Remove libc_hidden_def from __semtimedop stub

This breaks the Hurd build after commit 765cdd0bffd77960ae852104f
("sysvipc: Implement semop based on semtimedop") added it to the stub.

-----
 sysvipc/semtimedop.c | 1 -
 1 file changed, 1 deletion(-)
Joseph Myers - Oct. 17, 2019, 7:40 p.m.
On Thu, 17 Oct 2019, Florian Weimer wrote:

> This should fix it.
> 
> Thanks,
> Florian
> 
> 8<------------------------------------------------------------------8<
> Subject: Remove libc_hidden_def from __semtimedop stub
> 
> This breaks the Hurd build after commit 765cdd0bffd77960ae852104f
> ("sysvipc: Implement semop based on semtimedop") added it to the stub.

Thanks, please commit.
Adhemerval Zanella Netto - Oct. 17, 2019, 7:49 p.m.
On 17/10/2019 16:37, Florian Weimer wrote:
> * Joseph Myers:
> 
>> I'm seeing a build failure for i686-gnu I suspect is caused by this 
>> change.
>>
>> In file included from <command-line>:
>> ./../include/libc-symbols.h:545:33: error: '__EI___semtimedop' aliased to undefined symbol '__GI___semtimedop'
>>    extern thread __typeof (name) __EI_##name \
>>                                  ^~~~~
>> ./../include/libc-symbols.h:541:3: note: in expansion of macro '__hidden_ver2'
>>    __hidden_ver2 (, local, internal, name)
>>    ^~~~~~~~~~~~~
>> ./../include/libc-symbols.h:550:29: note: in expansion of macro '__hidden_ver1'
>>  #  define hidden_def(name)  __hidden_ver1(__GI_##name, name, name);
>>                              ^~~~~~~~~~~~~
>> ./../include/libc-symbols.h:619:32: note: in expansion of macro 'hidden_def'
>>  # define libc_hidden_def(name) hidden_def (name)
>>                                 ^~~~~~~~~~
>> semtimedop.c:32:1: note: in expansion of macro 'libc_hidden_def'
>>  libc_hidden_def (__semtimedop)
>>  ^~~~~~~~~~~~~~~
>>
>> https://sourceware.org/ml/libc-testresults/2019-q4/msg00085.html
> 
> This should fix it.
> 
> Thanks,
> Florian
> 
> 8<------------------------------------------------------------------8<
> Subject: Remove libc_hidden_def from __semtimedop stub
> 
> This breaks the Hurd build after commit 765cdd0bffd77960ae852104f
> ("sysvipc: Implement semop based on semtimedop") added it to the stub.
> 
> -----
>  sysvipc/semtimedop.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/sysvipc/semtimedop.c b/sysvipc/semtimedop.c
> index 68707d6ade..a4b750c813 100644
> --- a/sysvipc/semtimedop.c
> +++ b/sysvipc/semtimedop.c
> @@ -29,6 +29,5 @@ __semtimedop (int semid, struct sembuf *sops, size_t nsops,
>    return -1;
>  }
>  weak_alias (__semtimedop, semtimedop)
> -libc_hidden_def (__semtimedop)
>  
>  stub_warning (semtimedop)
> 

Ugh, I though I removed it from last iteration, thanks for catching it.

Patch

diff --git a/sysvipc/semtimedop.c b/sysvipc/semtimedop.c
index 68707d6ade..a4b750c813 100644
--- a/sysvipc/semtimedop.c
+++ b/sysvipc/semtimedop.c
@@ -29,6 +29,5 @@  __semtimedop (int semid, struct sembuf *sops, size_t nsops,
   return -1;
 }
 weak_alias (__semtimedop, semtimedop)
-libc_hidden_def (__semtimedop)
 
 stub_warning (semtimedop)