Message ID | 20221019221433.1082017-17-adhemerval.zanella@linaro.org |
---|---|
State | New |
Headers | show |
Series | Remove Linux generic sysdep | expand |
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote: > And remove redundant entries on other architectures Version. There are discrepancies between 2.11, 2.15, and 2.18 that need to be explained in the comment or changed. If all 32-bit arches were using 2.11 and the wordsize-32/Versions was never used, then that should be explained in the comment. If microblaze had a default version of 2.18 that pushed up the 2.11 value then that should be explained. Need a v2. > --- > 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 65d2ceda2c..59c39739c7 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; > + } The generic version says 2.15? sysdeps/unix/sysv/linux/generic/wordsize-32/Versions: libc { GLIBC_2.15 { 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; > - } OK. > 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; > - } > -} Doesn't match. > 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. > 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. > 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. > 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; > - } > -} Doesn't match. > 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. > 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. > 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. > 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. > 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. > }
On Mon, 5 Dec 2022, Carlos O'Donell via Libc-alpha wrote: > On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote: > > And remove redundant entries on other architectures Version. > > There are discrepancies between 2.11, 2.15, and 2.18 that need to be explained > in the comment or changed. > > If all 32-bit arches were using 2.11 and the wordsize-32/Versions was never > used, then that should be explained in the comment. The version for fallocate64 was supposed to be 2.10. It 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 commit 1f3615a1c97a030bca59f728f998947f852679b9). linux/generic didn't exist before 2.15, i.e. when the tile ports were added (and microblaze didn't 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.
On 06/12/22 21:10, Joseph Myers wrote: > On Mon, 5 Dec 2022, Carlos O'Donell via Libc-alpha wrote: > >> On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote: >>> And remove redundant entries on other architectures Version. >> >> There are discrepancies between 2.11, 2.15, and 2.18 that need to be explained >> in the comment or changed. >> >> If all 32-bit arches were using 2.11 and the wordsize-32/Versions was never >> used, then that should be explained in the comment. > > The version for fallocate64 was supposed to be 2.10. It 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 commit > 1f3615a1c97a030bca59f728f998947f852679b9). linux/generic didn't exist > before 2.15, i.e. when the tile ports were added (and microblaze didn't > 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. > Thanks to explain it better than me, I will update the comment with this.
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index 65d2ceda2c..59c39739c7 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; - } }