From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu, 8 Oct 2020 13:27:40 +0000 (-0300)
Subject: nptl: Add missing cancellation flags on lockf
X-Git-Tag: glibc-2.33~421
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=addff78f1f6729408a88d7452b16b8f5ee7e6878;p=thirdparty%2Fglibc.git

nptl: Add missing cancellation flags on lockf

It also removes CFLAGS-lockf.c duplicate rule.  It fixes
nptl/tst-cancelx16 on mips64-linux-gnu.
---

diff --git a/io/Makefile b/io/Makefile
index cf380f35167..36ac06070a2 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -93,7 +93,8 @@ CFLAGS-fcntl.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-fcntl64.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-poll.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-ppoll.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-lockf.c += -fexceptions
+CFLAGS-lockf.c += -fexceptions -fasynchronous-unwind-tables
+CFLAGS-lockf64.c += -fexceptions -fasynchronous-unwind-tables
 CFLAGS-statfs.c += -fexceptions
 CFLAGS-fstatfs.c += -fexceptions
 CFLAGS-statvfs.c += -fexceptions
@@ -102,7 +103,6 @@ CFLAGS-fts.c += -Wno-uninitialized $(uses-callbacks) -fexceptions
 CFLAGS-fts64.c += -Wno-uninitialized $(uses-callbacks) -fexceptions
 CFLAGS-ftw.c += $(uses-callbacks) -fexceptions
 CFLAGS-ftw64.c += $(uses-callbacks) -fexceptions
-CFLAGS-lockf.c += -fexceptions
 CFLAGS-posix_fallocate.c += -fexceptions
 CFLAGS-posix_fallocate64.c += -fexceptions
 CFLAGS-fallocate.c += -fexceptions