From patchwork Thu Sep 8 09:15:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 1675481 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=Z2g+c6kX; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MNYQ32mMjz1yj1 for ; Thu, 8 Sep 2022 19:15:55 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7BA7A3858297 for ; Thu, 8 Sep 2022 09:15:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7BA7A3858297 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1662628551; bh=rorETGys6E1dxgJUze5CRgfe/0F/0lzcUXsZBw2KeYQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Z2g+c6kXz58pyNvzLEOcH2I1nV9yRtMielxV49+iUDlQc2pCmoZJRypfF5lavTeWp z/RB63cSPG5Cpg3S3Szc4ysh3Bad/2EhLjCATDfTIJYQC80NffWviIwO5IcTDqDgQl V9sbumTzoyP4jUmu1zYvjWjiPQV0uXqmVMUqyxdA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id E0901385828B for ; Thu, 8 Sep 2022 09:15:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E0901385828B Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 21F7E1F8D4 for ; Thu, 8 Sep 2022 09:15:35 +0000 (UTC) Received: from hawking.suse.de (unknown [10.168.4.11]) by relay2.suse.de (Postfix) with ESMTP id 2A31E2C141 for ; Thu, 8 Sep 2022 09:15:35 +0000 (UTC) Received: by hawking.suse.de (Postfix, from userid 17005) id C9B17444B05; Thu, 8 Sep 2022 11:15:34 +0200 (CEST) To: libc-alpha@sourceware.org Subject: [PATCH] errlist: add missing entry for EDEADLOCK (bug 29545) X-Yow: YOW!! The land of the rising SONY!! Date: Thu, 08 Sep 2022 11:15:34 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1.91 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andreas Schwab via Libc-alpha From: Andreas Schwab Reply-To: Andreas Schwab Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "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