From patchwork Fri Feb 19 17:20:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John David Anglin X-Patchwork-Id: 1442377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dhyys3K2Rz9sBy for ; Sat, 20 Feb 2021 04:20:52 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 98D5F398C823; Fri, 19 Feb 2021 17:20:49 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mtlfep01.bell.net (belmont80srvr.owm.bell.net [184.150.200.80]) by sourceware.org (Postfix) with ESMTP id 76D1E398C80D for ; Fri, 19 Feb 2021 17:20:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 76D1E398C80D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=bell.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=dave.anglin@bell.net Received: from bell.net mtlfep01 184.150.200.30 by mtlfep01.bell.net with ESMTP id <20210219172046.ZEIK120733.mtlfep01.bell.net@mtlspm01.bell.net> for ; Fri, 19 Feb 2021 12:20:46 -0500 Received: from [192.168.2.49] (really [70.50.109.22]) by mtlspm01.bell.net with ESMTP id <20210219172046.BQQH130487.mtlspm01.bell.net@[192.168.2.49]>; Fri, 19 Feb 2021 12:20:46 -0500 To: GNU C Library From: John David Anglin Subject: [COMMITTED] hppa: Correct hppa EFD_NONBLOCK, IN_NONBLOCK, SFD_NONBLOCK and TFD_NONBLOCK defines Message-ID: Date: Fri, 19 Feb 2021 12:20:47 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 Content-Language: en-US X-CM-Analysis: v=2.4 cv=cZIXElPM c=1 sm=1 tr=0 ts=602ff36e a=S6gQgrXzeH76ECG4GouVuA==:117 a=S6gQgrXzeH76ECG4GouVuA==:17 a=IkcTkHD0fZMA:10 a=qa6Q16uM49sA:10 a=DnQ8TWWe71EzaThxrnsA:9 a=QEXdDO2ut3YA:10 X-CM-Envelope: MS4xfAnf/0DzYwSACFOiAwMZY6hiw7lXsJkK6TLA5+L+hUdhcGURGezpvZ9LjkRG4KCaCfLt5DnoSX6wTICtr/YKTSIGlzQVtivOlTqW3O0rvcGAu4l+rI2q ZqulpeOcJV5RbFo6M+V4FxzOP3LgPpyt/KnZRnMfbqQ+dVUiljUeAdXVwNtco7acw87KJPRxX4BtKeOnvK+nwhRwO8Qy05yK8Lo= X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, UNPARSEABLE_RELAY 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: , Cc: Helge Deller Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The enclosed change fixes a problem observed building the Debian strace package. We need to change the defines for EFD_NONBLOCK, IN_NONBLOCK, SFD_NONBLOCK and TFD_NONBLOCK to make them consistent with O_NONBLOCK and the current Linux kernel on parisc. O_NONBLOCK was updated sometime ago. Committed to trunk. Regards, Dave --- sysdeps/unix/sysv/linux/hppa/bits/eventfd.h | 2 +- sysdeps/unix/sysv/linux/hppa/bits/inotify.h | 2 +- sysdeps/unix/sysv/linux/hppa/bits/signalfd.h | 2 +- sysdeps/unix/sysv/linux/hppa/bits/timerfd.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/hppa/bits/eventfd.h b/sysdeps/unix/sysv/linux/hppa/bits/eventfd.h index e692b44c56..c1a46a16b0 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/eventfd.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/eventfd.h @@ -26,6 +26,6 @@ enum #define EFD_SEMAPHORE EFD_SEMAPHORE EFD_CLOEXEC = 010000000, #define EFD_CLOEXEC EFD_CLOEXEC - EFD_NONBLOCK = 00200004 /* HPUX has separate NDELAY & NONBLOCK */ + EFD_NONBLOCK = 00200000 #define EFD_NONBLOCK EFD_NONBLOCK }; diff --git a/sysdeps/unix/sysv/linux/hppa/bits/inotify.h b/sysdeps/unix/sysv/linux/hppa/bits/inotify.h index f6cf97e8a7..a69a4a88d9 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/inotify.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/inotify.h @@ -24,6 +24,6 @@ enum { IN_CLOEXEC = 010000000, #define IN_CLOEXEC IN_CLOEXEC - IN_NONBLOCK = 000200004 /* HPUX has separate NDELAY & NONBLOCK */ + IN_NONBLOCK = 000200000 #define IN_NONBLOCK IN_NONBLOCK }; diff --git a/sysdeps/unix/sysv/linux/hppa/bits/signalfd.h b/sysdeps/unix/sysv/linux/hppa/bits/signalfd.h index dd4ba77cc8..18568a9f1d 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/signalfd.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/signalfd.h @@ -24,6 +24,6 @@ enum { SFD_CLOEXEC = 010000000, #define SFD_CLOEXEC SFD_CLOEXEC - SFD_NONBLOCK = 00200004 /* HPUX has separate NDELAY & NONBLOCK */ + SFD_NONBLOCK = 00200000 #define SFD_NONBLOCK SFD_NONBLOCK }; diff --git a/sysdeps/unix/sysv/linux/hppa/bits/timerfd.h b/sysdeps/unix/sysv/linux/hppa/bits/timerfd.h index f64502477a..9d7f228995 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/timerfd.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/timerfd.h @@ -24,6 +24,6 @@ enum { TFD_CLOEXEC = 010000000, #define TFD_CLOEXEC TFD_CLOEXEC - TFD_NONBLOCK = 000200004 /* HPUX has separate NDELAY & NONBLOCK */ + TFD_NONBLOCK = 000200000 #define TFD_NONBLOCK TFD_NONBLOCK };