From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id F341E384FB5E for ; Mon, 20 Feb 2023 13:17:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F341E384FB5E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676899026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rCxljCvl8y2WFvNQ1JJH2dYrX7U+SSgpVRRobbpXR0Q=; b=DoVHRmsVFKCsUVI76uCbPbOPvBqcYzNePy+11q9A9DpuiZhU0nIXTB6kRX3Bm9wNvHIclc +Uw2eAtJlbG0CsNPQyTjtL1d2EX/qjhzhmf2/Y225Q/ZHlorXqYeb1DuDxNMScm4/c1QcU ugbhXOzGTER8b4w0wLJFKKcVcB3TQ9k= Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-518-9SeTF5KlN3mVj6geSRxDzA-1; Sun, 19 Feb 2023 16:11:58 -0500 X-MC-Unique: 9SeTF5KlN3mVj6geSRxDzA-1 Received: by mail-io1-f72.google.com with SMTP id m6-20020a056602018600b0073dfed277b3so751879ioo.16 for ; Sun, 19 Feb 2023 13:11:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rCxljCvl8y2WFvNQ1JJH2dYrX7U+SSgpVRRobbpXR0Q=; b=iq9sQ6yPcmg7iHPvaki8A2SaRzE+hhF2qb6JYurfu2riLtdumVTAg3YFkGkKy8DYAs wZkUWurqoHpJy3DFi3pQbpXbotykrAhtOtlDiyicp1EQft5okuFmk29jd43EKuwMS0f3 mjgqmhROwj/EWuieJIsppTdcEGFeyQgNRF8zpdUjkyGjdH6NKPBAOowCaGKRDLUHzRkP p8H17mpWf3qjhKmh21EPogAlu3uljDDVVC3q6i9BNs940GIGdhjCGkk3dW3CaTuA5j93 d2l+bKrf1UfCDe0TyEO84qDdKIMKnBSiQlqiWTlUksbyfvGoQee5VponZRVs966PWwSh 09/A== X-Gm-Message-State: AO0yUKXxTRsV8gPuHHrYn4peMZPC23xX7OfJjm3PM33FdGYDjl5jfIOE MMBtbllyo3huzclWwhbTnPVkYWP7WkrYPxE2gNj0hC17XYk6KxXWYsl0xHlvGG9oT5Yf18mIoff m+CFCeKsslPArq04/D2ODBxMViQ== X-Received: by 2002:a5d:9407:0:b0:721:90c5:7d0e with SMTP id v7-20020a5d9407000000b0072190c57d0emr5649153ion.9.1676841117258; Sun, 19 Feb 2023 13:11:57 -0800 (PST) X-Google-Smtp-Source: AK7set9aKnmFScSvRSycpYTruqrOdNi36QMgPvNmz/ncSVNUmItOq6+pMAmfbOOaXyuAtbQhWTkzFw== X-Received: by 2002:a5d:9407:0:b0:721:90c5:7d0e with SMTP id v7-20020a5d9407000000b0072190c57d0emr5649141ion.9.1676841116913; Sun, 19 Feb 2023 13:11:56 -0800 (PST) Received: from [192.168.0.241] ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id z23-20020a5ec917000000b00704608527d1sm3592278iol.37.2023.02.19.13.11.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Feb 2023 13:11:55 -0800 (PST) Message-ID: <9d118eb4-5eab-c893-d011-be338046ae21@redhat.com> Date: Sun, 19 Feb 2023 16:11:54 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH v2 1/5] Linux: Move wordsize-32 Version to default To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20221207212246.2384051-1-adhemerval.zanella@linaro.org> <20221207212246.2384051-2-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <20221207212246.2384051-2-adhemerval.zanella@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 12/7/22 16:22, Adhemerval Zanella wrote: > And remove redundant entries on other architectures Version. The > version for fallocate64 was supposed to be 2.10, but itt was then s/itt/it/g - Please fix the commit message. - Post a v3 with my RB and TB lines added (and the other conflicts cleaned up) - Then push to master. - This should mean the bot cleans up patchwork and we should clean thses up as superseded. > added to 32-bit platforms in 2.11 because it mistakenly wasn't > exported for them in 2.10 (see the commit message for > 1f3615a1c97a030bca59f728f998947f852679b9). linux/generic did not > exist before 2.15, i.e. when the tile ports were added (and OK. Agreed. > microblaze did not exist before 2.18), which explains those > differences but also illustrates that "2.11 for 32-bit, 2.10 for OK. I reviewed this and it looks corrct. > 64-bit" should be sufficient since versions older than the minimum > for the architecture are automatically adjusted. LGTM. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell > --- > sysdeps/unix/sysv/linux/Versions | 3 +++ > sysdeps/unix/sysv/linux/arm/Versions | 3 --- > sysdeps/unix/sysv/linux/generic/wordsize-32/Versions | 5 ----- > sysdeps/unix/sysv/linux/hppa/Versions | 3 --- > sysdeps/unix/sysv/linux/i386/Versions | 4 ---- > sysdeps/unix/sysv/linux/m68k/Versions | 3 --- > sysdeps/unix/sysv/linux/microblaze/Versions | 5 ----- > sysdeps/unix/sysv/linux/mips/Versions | 3 --- > sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions | 3 --- > sysdeps/unix/sysv/linux/s390/s390-32/Versions | 3 --- > sysdeps/unix/sysv/linux/sh/Versions | 3 --- > sysdeps/unix/sysv/linux/sparc/sparc32/Versions | 3 --- > 12 files changed, 3 insertions(+), 38 deletions(-) > delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/Versions > delete mode 100644 sysdeps/unix/sysv/linux/microblaze/Versions > > diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions > index ca6eb1a49e..bc59bce42f 100644 > --- a/sysdeps/unix/sysv/linux/Versions > +++ b/sysdeps/unix/sysv/linux/Versions > @@ -157,6 +157,9 @@ libc { > GLIBC_2.10 { > fallocate; > } > + GLIBC_2.11 { > + fallocate64; > + } OK. Make this the default. > GLIBC_2.12 { > _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; > > diff --git a/sysdeps/unix/sysv/linux/arm/Versions b/sysdeps/unix/sysv/linux/arm/Versions > index 7e5ba53455..6e7cb6e2e5 100644 > --- a/sysdeps/unix/sysv/linux/arm/Versions > +++ b/sysdeps/unix/sysv/linux/arm/Versions > @@ -4,9 +4,6 @@ libc { > inb; inw; inl; > outb; outw; outl; > } > - GLIBC_2.11 { > - fallocate64; > - } OK. Matches default. > GLIBC_2.24 { > recvmsg; sendmsg; > } > diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/Versions b/sysdeps/unix/sysv/linux/generic/wordsize-32/Versions > deleted file mode 100644 > index cdc6022015..0000000000 > --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/Versions > +++ /dev/null > @@ -1,5 +0,0 @@ > -libc { > - GLIBC_2.15 { > - fallocate64; > - } > -} OK. This will get raised by ports which use it. > diff --git a/sysdeps/unix/sysv/linux/hppa/Versions b/sysdeps/unix/sysv/linux/hppa/Versions > index 357c68a782..78528e5fa2 100644 > --- a/sysdeps/unix/sysv/linux/hppa/Versions > +++ b/sysdeps/unix/sysv/linux/hppa/Versions > @@ -13,9 +13,6 @@ libc { > GLIBC_2.4 { > _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; > } > - GLIBC_2.11 { > - fallocate64; > - } OK. Matches default. > GLIBC_2.12 { > _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; > } > diff --git a/sysdeps/unix/sysv/linux/i386/Versions b/sysdeps/unix/sysv/linux/i386/Versions > index 1335e6551b..f99a4d88d0 100644 > --- a/sysdeps/unix/sysv/linux/i386/Versions > +++ b/sysdeps/unix/sysv/linux/i386/Versions > @@ -37,10 +37,6 @@ libc { > # v* > vm86; > } > - GLIBC_2.11 { > - # f* > - fallocate64; > - } OK. Matches default. > GLIBC_PRIVATE { > __modify_ldt; __uname; > } > diff --git a/sysdeps/unix/sysv/linux/m68k/Versions b/sysdeps/unix/sysv/linux/m68k/Versions > index d98ae120c1..a77ea60338 100644 > --- a/sysdeps/unix/sysv/linux/m68k/Versions > +++ b/sysdeps/unix/sysv/linux/m68k/Versions > @@ -29,9 +29,6 @@ libc { > # v* > versionsort64; > } > - GLIBC_2.11 { > - fallocate64; > - } OK. Matches default. > GLIBC_2.31 { > msgctl; semctl; shmctl; > } > diff --git a/sysdeps/unix/sysv/linux/microblaze/Versions b/sysdeps/unix/sysv/linux/microblaze/Versions > deleted file mode 100644 > index aa48a3c155..0000000000 > --- a/sysdeps/unix/sysv/linux/microblaze/Versions > +++ /dev/null > @@ -1,5 +0,0 @@ > -libc { > - GLIBC_2.18 { > - fallocate64; > - } > -} OK. Microblaze is a 2.18 port, and shlib-versions is GLIBC_2.18 for the port. OK. So fallocate64@@GLIBC_2.11 will be raised to fallocate64@@GLIBC_2.18 anyway. > diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions > index db6222e9a7..9ea0fa65a4 100644 > --- a/sysdeps/unix/sysv/linux/mips/Versions > +++ b/sysdeps/unix/sysv/linux/mips/Versions > @@ -26,9 +26,6 @@ libc { > pthread_attr_setstack; > pthread_attr_setstacksize; > } > - GLIBC_2.11 { > - fallocate64; > - } OK. Matches the default. > GLIBC_PRIVATE { > # nptl/pthread_cond_timedwait.c uses INTERNAL_VSYSCALL(clock_gettime). > __vdso_clock_gettime; > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions > index 918e0231d0..416e8db5ae 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions > +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions > @@ -31,9 +31,6 @@ libc { > siglongjmp; > swapcontext; > } > - GLIBC_2.11 { > - fallocate64; > - } OK. Matches the default. > GLIBC_2.17 { > __ppc_get_timebase_freq; > } > diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Versions b/sysdeps/unix/sysv/linux/s390/s390-32/Versions > index bd1a46df88..1b96fc42a3 100644 > --- a/sysdeps/unix/sysv/linux/s390/s390-32/Versions > +++ b/sysdeps/unix/sysv/linux/s390/s390-32/Versions > @@ -44,9 +44,6 @@ libc { > getutmpx; > login; > } > - GLIBC_2.11 { > - fallocate64; > - } OK. Matches the default. > GLIBC_2.31 { > msgctl; semctl; shmctl; > } > diff --git a/sysdeps/unix/sysv/linux/sh/Versions b/sysdeps/unix/sysv/linux/sh/Versions > index 9c734ff755..3ad702e165 100644 > --- a/sysdeps/unix/sysv/linux/sh/Versions > +++ b/sysdeps/unix/sysv/linux/sh/Versions > @@ -22,9 +22,6 @@ libc { > # v* > versionsort64; > } > - GLIBC_2.11 { > - fallocate64; > - } OK. Matches the default. > GLIBC_2.16 { > fanotify_mark; > } > diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions > index d928a65346..4529e7fe6f 100644 > --- a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions > +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions > @@ -17,7 +17,4 @@ libc { > # s* > scandir64; > } > - GLIBC_2.11 { > - fallocate64; > - } OK. Matches the default. > } -- Cheers, Carlos.