picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Andreas Schwab 2022-09-08 10:25:21 +02:00
parent b8cc607f3c
commit 3d7d5c10c8
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stdio-common/Makefile
View File

@ -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

3
sysdeps/gnu/errlist.h
View File

@ -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