* [PATCH] errlist: add missing entry for EDEADLOCK (bug 29545)
@ 2022-09-08 9:15 Andreas Schwab
2022-09-08 9:36 ` Florian Weimer
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Schwab @ 2022-09-08 9:15 UTC (permalink / raw)
To: libc-alpha
Some architectures (mips, powerpc and sparc) define separate values for
EDEADLOCK and EDEADLK. Readd the errlist entry for EDEADLOCK for those
configurations. Also use the dependency files from generating the
auxiliary errlist and siglist files.
---
stdio-common/Makefile | 8 ++++++++
sysdeps/gnu/errlist.h | 3 +++
2 files changed, 11 insertions(+)
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index e11aaedd96..9c98c02884 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -267,6 +267,10 @@ $(objpfx)errlist-data-aux.S: errlist-data-gen.c
$(make-target-directory)
$(compile-command.c) $(pie-default) $(no-stack-protector) -S
+ifndef no_deps
+-include $(objpfx)errlist-data-aux.S.d $(objpfx)errlist-data-aux-shared.S.d
+endif
+
$(objpfx)errlist-data.os: $(objpfx)errlist-data-aux-shared.S
$(objpfx)errlist-data.o: $(objpfx)errlist-data-aux.S
@@ -278,6 +282,10 @@ $(objpfx)siglist-aux.S: siglist-gen.c
$(make-target-directory)
$(compile-command.c) $(pie-default) $(no-stack-protector) -S
+ifndef no_deps
+-include $(objpfx)siglist-aux.S.d $(objpfx)siglist-aux-shared.S.d
+endif
+
$(objpfx)siglist.os: $(objpfx)siglist-aux-shared.S
$(objpfx)siglist.o: $(objpfx)siglist-aux.S
diff --git a/sysdeps/gnu/errlist.h b/sysdeps/gnu/errlist.h
index 6329e5f393..e8416448da 100644
--- a/sysdeps/gnu/errlist.h
+++ b/sysdeps/gnu/errlist.h
@@ -593,6 +593,9 @@ _S(EBADRQC, N_("Invalid request code"))
#ifdef EBADSLT
_S(EBADSLT, N_("Invalid slot"))
#endif
+#if defined EDEADLOCK && EDEADLOCK != EDEADLK
+_S (EDEADLOCK, N_ ("File locking deadlock error"))
+#endif
#ifdef EBFONT
_S(EBFONT, N_("Bad font file format"))
#endif
--
2.37.3
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] errlist: add missing entry for EDEADLOCK (bug 29545)
2022-09-08 9:15 [PATCH] errlist: add missing entry for EDEADLOCK (bug 29545) Andreas Schwab
@ 2022-09-08 9:36 ` Florian Weimer
0 siblings, 0 replies; 2+ messages in thread
From: Florian Weimer @ 2022-09-08 9:36 UTC (permalink / raw)
To: Andreas Schwab via Libc-alpha; +Cc: Andreas Schwab
* Andreas Schwab via Libc-alpha:
> Some architectures (mips, powerpc and sparc) define separate values for
> EDEADLOCK and EDEADLK. Readd the errlist entry for EDEADLOCK for those
> configurations. Also use the dependency files from generating the
> auxiliary errlist and siglist files.
Looks good, thanks.
Florian
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-08 9:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-08 9:15 [PATCH] errlist: add missing entry for EDEADLOCK (bug 29545) Andreas Schwab
2022-09-08 9:36 ` Florian Weimer
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).