From patchwork Wed Dec 7 21:22:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 61680 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 9A22D38369CA for ; Wed, 7 Dec 2022 21:23:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9A22D38369CA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670448195; bh=knZW0CaPwX3WnZbv81XIUz03oPS9KP/uNKWR7/ZeAoc=; 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=IIeXPuDdT5UmVEuOcAi8dQIluOlGoxjHOuOBSql2HSjKcWRHYGr5btdFWvMUSjOhj M8S5uxC5Bq67ZPTKVPjnaYgwBl0NYMJims0JmSM1N/dngSYCtUCoh+kjbFqP7rPap8 I2XeEUEQGN7ub8ywSWKDx8zrea/geNCWa5jyXn9k= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oo1-xc2c.google.com (mail-oo1-xc2c.google.com [IPv6:2607:f8b0:4864:20::c2c]) by sourceware.org (Postfix) with ESMTPS id B1FE43854572 for ; Wed, 7 Dec 2022 21:22:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B1FE43854572 Received: by mail-oo1-xc2c.google.com with SMTP id v62-20020a4a7c41000000b004a0a214dfbaso116657ooc.9 for ; Wed, 07 Dec 2022 13:22:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=knZW0CaPwX3WnZbv81XIUz03oPS9KP/uNKWR7/ZeAoc=; b=csdgP+xQbhTU8y4ND+C9fqdgck+Z0G2msNBXKDFXmUszyxV8+FGu2Hb0o7yaRjL4ph /7iYdTksxOTvddxvi930npnafoF2ZKJ4c/evkvToq8tWHQoNAjihWuydIrbYUzbRaW5l Yp7wNhnZOS0E7A2fYg8r0HM1HpGzBaRMeD5U1p1sR3cPragabQ4Hkrv6SM+fAjilFSRI p6UJYxoVYffnkH4nMEvBHf0wzZjzNyB1l/iLIvsf5Z4C3yAUBuuo3l8rJte01a5mzf+h JqR0F7I+60q2aPEgwqimIkUs7E+3H7OjdYFmExsXqKJklhSy8p/iqAjBG/fAfxbENJth NbQw== X-Gm-Message-State: ANoB5pmI0Y0F5LLkEs9r55rvnXYi75n/UrB/UuY0IUcQLtmNQY98sYfU J/hbVGt90CcVP4LEgmnfLL5W1uNzHtU8/WarJNM= X-Google-Smtp-Source: AA0mqf5DyVjqzDQnM5RP48pyl8in6hGtlzSQXuuBQio7i28MtDMDbj6WCaPtWsuw7bJ1xjL744Xqiw== X-Received: by 2002:a05:6820:60d:b0:4a0:8cf1:f6f4 with SMTP id e13-20020a056820060d00b004a08cf1f6f4mr11193872oow.49.1670448171778; Wed, 07 Dec 2022 13:22:51 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c2:6793:2c6f:f2fc:30ca:36c1]) by smtp.gmail.com with ESMTPSA id n189-20020aca59c6000000b0035a64076e0bsm9870305oib.37.2022.12.07.13.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Dec 2022 13:22:51 -0800 (PST) To: libc-alpha@sourceware.org, Carlos O'Donell Subject: [PATCH v2 1/5] Linux: Move wordsize-32 Version to default Date: Wed, 7 Dec 2022 18:22:42 -0300 Message-Id: <20221207212246.2384051-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221207212246.2384051-1-adhemerval.zanella@linaro.org> References: <20221207212246.2384051-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" And remove redundant entries on other architectures Version. The version for fallocate64 was supposed to be 2.10, but itt was then 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 microblaze did not exist before 2.18), which explains those differences but also illustrates that "2.11 for 32-bit, 2.10 for 64-bit" should be sufficient since versions older than the minimum for the architecture are automatically adjusted. 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; + } 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; - } 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; - } -} 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; - } 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; - } 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; - } 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; - } -} 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; - } 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; - } 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; - } 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; - } 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; - } }