From patchwork Thu Oct 8 13:30:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 40684 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1C1A3894C1A; Thu, 8 Oct 2020 13:30:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1C1A3894C1A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1602163826; bh=hZ7q3kyLqKxUQjLp7lkmFzs/NZ3fx4Jf5KIs9JKh3es=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=XP3TsHzyjNbwfJwHC8DWaKkXtV1Y8jRe2weXdwtK1H5jg565Ma0Oh4cwrsKSe0qso sH8cpP6yNV1M9he0veS2fVh6NO2QJ1y26geXCltwBYognpnO8fS7SZW7RxjdMmMhCh oLzI79GTEBprD47X6TY/e2umyDGt+L7/ai48ecjU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) by sourceware.org (Postfix) with ESMTPS id 7C75D3894C1A for ; Thu, 8 Oct 2020 13:30:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7C75D3894C1A Received: by mail-qk1-x72a.google.com with SMTP id y198so6993185qka.0 for ; Thu, 08 Oct 2020 06:30:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hZ7q3kyLqKxUQjLp7lkmFzs/NZ3fx4Jf5KIs9JKh3es=; b=X2BwvlRRAC9sIUrYZxpXftoA96qRYjCgg8wIp4jKm5YWZTHS94yHcBwCHX95Cuq6tu nlGhq4oQqBmbSiQZKRYBW+EKNk2fdvhoFqBGJkF/QSHpCRw58svqU7cvxFzntsLRdpJN Grm5VtDeWSHW5vfx5vBnPCfXj0bYNSC01X+La9ILOxJm3bfG+/Y93pXhpGedOZj7h5u+ 4E2jSUmlGipFs5Wp1WS+ILn1nM1o8z+PN1fH+6ZWyqhzU2oLJUPeULk8V3Pnbl1Waota 2sKw/QVCT+9oKjCzsIW7SuBWt58x1Ou4GK3O2DM+4wzmsI2s44p8jIyBpbpZaeMdXUEh /Eyw== X-Gm-Message-State: AOAM532m6wCflMiDMEH8YQuQMg6Ev33Q5NOcx4Bi+7mlq1itN+ozRQZW 3EYJohxsFsPMw03yO3SZAiECjTEtY/Q1bg== X-Google-Smtp-Source: ABdhPJxdBhSORfXjNVpEe3Wfk+H+gyi9JIBkDD8pJQwlXzUGv786f7FQ2l9qrD4/vMA5Y8Xbv6m5tw== X-Received: by 2002:a37:5cc2:: with SMTP id q185mr7519609qkb.35.1602163822814; Thu, 08 Oct 2020 06:30:22 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id q135sm2628847qka.93.2020.10.08.06.30.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 06:30:22 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [COMMITTED 3/3] nptl: Add missing cancellation flags on lockf Date: Thu, 8 Oct 2020 10:30:15 -0300 Message-Id: <20201008133015.68359-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201008133015.68359-1-adhemerval.zanella@linaro.org> References: <20201008133015.68359-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" It also removes CFLAGS-lockf.c duplicate rule. It fixes nptl/tst-cancelx16 on mips64-linux-gnu. --- io/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io/Makefile b/io/Makefile index cf380f3516..36ac06070a 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