From patchwork Sun Dec 26 07:20:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 49257 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 155113858439 for ; Sun, 26 Dec 2021 07:20:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 155113858439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640503240; bh=dGt1w39qQmUpqckP/lmV9NiPdjM6GSeTRyiIBmNlID4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=CXNfMM9gIPshAtWyyylAMXkNS7SqE5UQvzvaUxykpR2lrP70ocdQRYOmi8orfPWuo VKrsKZkSONZS/QUqdInX6MfZUTxOmoQKLSOg0jBI5BDMZyF2BS1B9uUwCg2UE1zyOa D/sWT56QJuIkBppzfNfiZVfXg2xRsaruLDw4GGvI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id 820533858D37 for ; Sun, 26 Dec 2021 07:20:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 820533858D37 Received: by mail-pl1-x62a.google.com with SMTP id i6so3287738pla.0 for ; Sat, 25 Dec 2021 23:20:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dGt1w39qQmUpqckP/lmV9NiPdjM6GSeTRyiIBmNlID4=; b=vaUOCM4adoD5VzMXeTHXdbP33Uy52xCC3DjSZG7oY1omDcA3HC2zVm69TzorFPtBpe kAHKnyJlTRQo9KNnscO99wsUb9kSxK63+A84Wp12lDPeU9QNXiAOh7scEHZQ433docA+ XSGDHKWLl3pmvgg64AYnvZAurzUixJhfnsgqp0S8UjGzMW6G6hMpZSJoy3DeMd18iY0Z NZVOjrMhSlZccmlPHnPYvFgswNylvj51bBkAd4HlCeVmff6+AQHPf7smxb6ujt4+Ws0y rfPBKhK2PnrguwOUlK9Athe8KXl2UWaTsG4bmHOM7hkbXdfUb3pm6FMIUOoUploma1O1 8QZg== X-Gm-Message-State: AOAM530BrInNdbycdXpdXf9rANbJop+NgCwXaC0rUWhcIg8o4P0gZ2dO KvdVt2IWv15WEuE4/vPlOl4VUd8u00o= X-Google-Smtp-Source: ABdhPJxAVmjyQzwbRBldUmF1gyMo4Nn7EsD/3HfrmibPvo/KrUXibvrbN9SonHQOKevrI0vSHAdhtg== X-Received: by 2002:a17:903:1c7:b0:149:7cab:6d7f with SMTP id e7-20020a17090301c700b001497cab6d7fmr1593356plh.101.1640503218367; Sat, 25 Dec 2021 23:20:18 -0800 (PST) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id c124sm12989572pfb.139.2021.12.25.23.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Dec 2021 23:20:17 -0800 (PST) To: GLIBC patches Subject: [PATCH] open64: Force O_LARGEFILE on 32-bit architectures Date: Sun, 26 Dec 2021 16:20:08 +0900 Message-Id: <20211226072008.1575854-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Stafford Horne via Libc-alpha From: Stafford Horne Reply-To: Stafford Horne Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" When running tests on OpenRISC which has 32-bit wordsize but 64-bit timesize it was found that O_LARGEFILE is not being set when calling open64. For 64-bit architectures the O_LARGEFILE flag is generally implied by the kernel according to force_o_largefile. However, for 32-bit architectures this is not done. For this patch I add an extra condition to the EXTRA_OPEN_FLAGS ifdef logic to allow setting O_LARGEFILE on 32-bit architectures. Tested on the OpenRISC the build works and timezone/tst-tzset passes which was failing before. I would expect this also would fix arc. --- sysdeps/unix/sysv/linux/open64.c | 3 +-- sysdeps/unix/sysv/linux/open64_nocancel.c | 2 +- sysdeps/unix/sysv/linux/openat64.c | 2 +- sysdeps/unix/sysv/linux/openat64_nocancel.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sysdeps/unix/sysv/linux/open64.c b/sysdeps/unix/sysv/linux/open64.c index 0904696973..5ae5e98b57 100644 --- a/sysdeps/unix/sysv/linux/open64.c +++ b/sysdeps/unix/sysv/linux/open64.c @@ -23,8 +23,7 @@ #include #include - -#ifdef __OFF_T_MATCHES_OFF64_T +#if defined __OFF_T_MATCHES_OFF64_T && (__WORDSIZE != 32) # define EXTRA_OPEN_FLAGS 0 #else # define EXTRA_OPEN_FLAGS O_LARGEFILE diff --git a/sysdeps/unix/sysv/linux/open64_nocancel.c b/sysdeps/unix/sysv/linux/open64_nocancel.c index d7f35656a1..0fe41175ac 100644 --- a/sysdeps/unix/sysv/linux/open64_nocancel.c +++ b/sysdeps/unix/sysv/linux/open64_nocancel.c @@ -23,7 +23,7 @@ #include -#ifdef __OFF_T_MATCHES_OFF64_T +#if defined __OFF_T_MATCHES_OFF64_T && (__WORDSIZE != 32) # define EXTRA_OPEN_FLAGS 0 #else # define EXTRA_OPEN_FLAGS O_LARGEFILE diff --git a/sysdeps/unix/sysv/linux/openat64.c b/sysdeps/unix/sysv/linux/openat64.c index dc226567c1..1019fc13ac 100644 --- a/sysdeps/unix/sysv/linux/openat64.c +++ b/sysdeps/unix/sysv/linux/openat64.c @@ -21,7 +21,7 @@ #include -#ifdef __OFF_T_MATCHES_OFF64_T +#if defined __OFF_T_MATCHES_OFF64_T && (__WORDSIZE != 32) # define EXTRA_OPEN_FLAGS 0 #else # define EXTRA_OPEN_FLAGS O_LARGEFILE diff --git a/sysdeps/unix/sysv/linux/openat64_nocancel.c b/sysdeps/unix/sysv/linux/openat64_nocancel.c index 51377aea45..324f719ea4 100644 --- a/sysdeps/unix/sysv/linux/openat64_nocancel.c +++ b/sysdeps/unix/sysv/linux/openat64_nocancel.c @@ -22,7 +22,7 @@ #include #include -#ifdef __OFF_T_MATCHES_OFF64_T +#if defined __OFF_T_MATCHES_OFF64_T && (__WORDSIZE != 32) # define EXTRA_OPEN_FLAGS 0 #else # define EXTRA_OPEN_FLAGS O_LARGEFILE