From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2138) id 072073858D28; Thu, 8 Sep 2022 09:40:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 072073858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1662630047; bh=px51GxMYDvmhLbnrTYPGtGTFXPGlGPtgVXmO3IUYT0w=; h=From:To:Subject:Date:From; b=RjnrppX0q0qnqQ2ezigWbCv2CUlLaBD7W4wKHR3fkvgtbO5iMI3idSgtyjRVPoEJ6 a33ZuMX2nW36fHQHfjCaF22OHgBGrNzxsonNTC9Dij/P6pjcjMWQkfEqLRZ6iZPTME KkMyGNwjkCCQXBVYxRT/w6oXMsGUGc+06/2B6oe8= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Andreas Schwab To: glibc-cvs@sourceware.org Subject: [glibc] errlist: add missing entry for EDEADLOCK (bug 29545) X-Act-Checkin: glibc X-Git-Author: Andreas Schwab X-Git-Refname: refs/heads/master X-Git-Oldrev: b8cc607f3c1e8371b89158f427a61f28018604a5 X-Git-Newrev: 3d7d5c10c806ee24f8e35014e41e203002609a3f Message-Id: <20220908094047.072073858D28@sourceware.org> Date: Thu, 8 Sep 2022 09:40:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3d7d5c10c806ee24f8e35014e41e203002609a3f commit 3d7d5c10c806ee24f8e35014e41e203002609a3f Author: Andreas Schwab 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