public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Andreas Schwab <schwab@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] errlist: add missing entry for EDEADLOCK (bug 29545) Date: Thu, 8 Sep 2022 09:40:47 +0000 (GMT) [thread overview] Message-ID: <20220908094047.072073858D28@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3d7d5c10c806ee24f8e35014e41e203002609a3f commit 3d7d5c10c806ee24f8e35014e41e203002609a3f Author: Andreas Schwab <schwab@suse.de> Date: Thu Sep 8 10:25:21 2022 +0200 errlist: add missing entry for EDEADLOCK (bug 29545) 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. Diff: --- 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
reply other threads:[~2022-09-08 9:40 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220908094047.072073858D28@sourceware.org \ --to=schwab@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).