From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1662628535; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=rorETGys6E1dxgJUze5CRgfe/0F/0lzcUXsZBw2KeYQ=; b=09dh6+AbBONybikUYJXiMoxamMUQTTk5xjOIYxT/kjCWjAplDhvFUmuG8Q2ZEZNWN0ZwHF YjZ5BWsrMYk/l+eoaD++NiN/+cjllwnJHVeSgfAttttxO6hdk+EzHLSoqJhVU9K0q8cLsh kgi0eRFCrf3raGfeUyUhPwufSmNBAdg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1662628535; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=rorETGys6E1dxgJUze5CRgfe/0F/0lzcUXsZBw2KeYQ=; b=hDVA9SH4gwOyTKfNjX95lG/s8DjATnhq2xC99D0zFLAAvKCMjSL7uvzo0cZgJSUm2MT6il mRgi6SK1+7raNeBg== 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) From: Andreas Schwab 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 Content-Type: text/plain 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 List-Id: 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."