* [PATCH] Fix conform linknamespace tests due to gnu_dev_makedev
@ 2021-03-31 8:23 Stefan Liebler
2021-03-31 9:31 ` Florian Weimer
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Liebler @ 2021-03-31 8:23 UTC (permalink / raw)
To: libc-alpha; +Cc: adhemerval.zanella, Stefan Liebler
If building on s390 / i686 with -Os, various conformance
tests are failing with e.g.
conform/ISO/assert.h/linknamespace.out:
[initial] __assert_fail -> [libc.a(assert.o)] __dcgettext -> [libc.a(dcgettext.o)] __dcigettext -> [libc.a(dcigettext.o)] __getcwd -> [libc.a(getcwd.o)] __fstatat64 -> [libc.a(fstatat64.o)] gnu_dev_makedev
The usage of gnu_dev_makedev was recently introduced by
usage of the makedev makro in commit:
5b980d4809913088729982865188b754939bcd39
linux: Use statx for MIPSn64
This patch is now linking against __gnu_dev_makedev as
also done in commit:
8b4a118222c7ed41bc653943b542915946dff1dd
Fix -Os gnu_dev_* linknamespace, localplt issues (bug 15105, bug 19463).
---
sysdeps/unix/sysv/linux/fstatat64.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/fstatat64.c b/sysdeps/unix/sysv/linux/fstatat64.c
index 31d3253044..f968e4ef05 100644
--- a/sysdeps/unix/sysv/linux/fstatat64.c
+++ b/sysdeps/unix/sysv/linux/fstatat64.c
@@ -53,8 +53,8 @@ fstatat64_time64_statx (int fd, const char *file, struct __stat64_t64 *buf,
return r;
*buf = (struct __stat64_t64) {
- .st_dev = makedev (tmp.stx_dev_major, tmp.stx_dev_minor),
- .st_rdev = makedev (tmp.stx_rdev_major, tmp.stx_rdev_minor),
+ .st_dev = __gnu_dev_makedev (tmp.stx_dev_major, tmp.stx_dev_minor),
+ .st_rdev = __gnu_dev_makedev (tmp.stx_rdev_major, tmp.stx_rdev_minor),
.st_ino = tmp.stx_ino,
.st_mode = tmp.stx_mode,
.st_nlink = tmp.stx_nlink,
--
2.23.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix conform linknamespace tests due to gnu_dev_makedev
2021-03-31 8:23 [PATCH] Fix conform linknamespace tests due to gnu_dev_makedev Stefan Liebler
@ 2021-03-31 9:31 ` Florian Weimer
2021-03-31 14:11 ` Stefan Liebler
0 siblings, 1 reply; 3+ messages in thread
From: Florian Weimer @ 2021-03-31 9:31 UTC (permalink / raw)
To: Stefan Liebler via Libc-alpha; +Cc: Stefan Liebler
* Stefan Liebler via Libc-alpha:
> If building on s390 / i686 with -Os, various conformance
> tests are failing with e.g.
> conform/ISO/assert.h/linknamespace.out:
> [initial] __assert_fail -> [libc.a(assert.o)] __dcgettext -> [libc.a(dcgettext.o)] __dcigettext -> [libc.a(dcigettext.o)] __getcwd -> [libc.a(getcwd.o)] __fstatat64 -> [libc.a(fstatat64.o)] gnu_dev_makedev
>
> The usage of gnu_dev_makedev was recently introduced by
> usage of the makedev makro in commit:
> 5b980d4809913088729982865188b754939bcd39
> linux: Use statx for MIPSn64
>
> This patch is now linking against __gnu_dev_makedev as
> also done in commit:
> 8b4a118222c7ed41bc653943b542915946dff1dd
> Fix -Os gnu_dev_* linknamespace, localplt issues (bug 15105, bug 19463).
> ---
> sysdeps/unix/sysv/linux/fstatat64.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/fstatat64.c b/sysdeps/unix/sysv/linux/fstatat64.c
> index 31d3253044..f968e4ef05 100644
> --- a/sysdeps/unix/sysv/linux/fstatat64.c
> +++ b/sysdeps/unix/sysv/linux/fstatat64.c
> @@ -53,8 +53,8 @@ fstatat64_time64_statx (int fd, const char *file, struct __stat64_t64 *buf,
> return r;
>
> *buf = (struct __stat64_t64) {
> - .st_dev = makedev (tmp.stx_dev_major, tmp.stx_dev_minor),
> - .st_rdev = makedev (tmp.stx_rdev_major, tmp.stx_rdev_minor),
> + .st_dev = __gnu_dev_makedev (tmp.stx_dev_major, tmp.stx_dev_minor),
> + .st_rdev = __gnu_dev_makedev (tmp.stx_rdev_major, tmp.stx_rdev_minor),
> .st_ino = tmp.stx_ino,
> .st_mode = tmp.stx_mode,
> .st_nlink = tmp.stx_nlink,
Looks reasonable, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix conform linknamespace tests due to gnu_dev_makedev
2021-03-31 9:31 ` Florian Weimer
@ 2021-03-31 14:11 ` Stefan Liebler
0 siblings, 0 replies; 3+ messages in thread
From: Stefan Liebler @ 2021-03-31 14:11 UTC (permalink / raw)
To: Florian Weimer, Stefan Liebler via Libc-alpha
On 31/03/2021 11:31, Florian Weimer wrote:
> * Stefan Liebler via Libc-alpha:
>
>> If building on s390 / i686 with -Os, various conformance
>> tests are failing with e.g.
>> conform/ISO/assert.h/linknamespace.out:
>> [initial] __assert_fail -> [libc.a(assert.o)] __dcgettext -> [libc.a(dcgettext.o)] __dcigettext -> [libc.a(dcigettext.o)] __getcwd -> [libc.a(getcwd.o)] __fstatat64 -> [libc.a(fstatat64.o)] gnu_dev_makedev
>>
>> The usage of gnu_dev_makedev was recently introduced by
>> usage of the makedev makro in commit:
>> 5b980d4809913088729982865188b754939bcd39
>> linux: Use statx for MIPSn64
>>
>> This patch is now linking against __gnu_dev_makedev as
>> also done in commit:
>> 8b4a118222c7ed41bc653943b542915946dff1dd
>> Fix -Os gnu_dev_* linknamespace, localplt issues (bug 15105, bug 19463).
>> ---
>> sysdeps/unix/sysv/linux/fstatat64.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/sysdeps/unix/sysv/linux/fstatat64.c b/sysdeps/unix/sysv/linux/fstatat64.c
>> index 31d3253044..f968e4ef05 100644
>> --- a/sysdeps/unix/sysv/linux/fstatat64.c
>> +++ b/sysdeps/unix/sysv/linux/fstatat64.c
>> @@ -53,8 +53,8 @@ fstatat64_time64_statx (int fd, const char *file, struct __stat64_t64 *buf,
>> return r;
>>
>> *buf = (struct __stat64_t64) {
>> - .st_dev = makedev (tmp.stx_dev_major, tmp.stx_dev_minor),
>> - .st_rdev = makedev (tmp.stx_rdev_major, tmp.stx_rdev_minor),
>> + .st_dev = __gnu_dev_makedev (tmp.stx_dev_major, tmp.stx_dev_minor),
>> + .st_rdev = __gnu_dev_makedev (tmp.stx_rdev_major, tmp.stx_rdev_minor),
>> .st_ino = tmp.stx_ino,
>> .st_mode = tmp.stx_mode,
>> .st_nlink = tmp.stx_nlink,
>
> Looks reasonable, thanks.
>
Committed.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-31 14:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-31 8:23 [PATCH] Fix conform linknamespace tests due to gnu_dev_makedev Stefan Liebler
2021-03-31 9:31 ` Florian Weimer
2021-03-31 14:11 ` Stefan Liebler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).