Message ID | 20220927200515.8749a18ef6f13beede3f1a60@otheo.eu |
---|---|
State | New |
Headers | show |
Series | Remove legacy hwcaps support | expand |
On 27/09/22 15:05, Javier Pello wrote: > This was to test loading of shared libraries from platform > subdirectories, but this functionality is going away in the > following commits. > > Signed-off-by: Javier Pello <devel@otheo.eu> LGTM, although I think this patch should be move after the functionality is removed. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > sysdeps/x86_64/Makefile | 16 ---------------- > sysdeps/x86_64/tst-x86_64-1.c | 26 -------------------------- > sysdeps/x86_64/tst-x86_64mod-1.c | 22 ---------------------- > 3 files changed, 64 deletions(-) > delete mode 100644 sysdeps/x86_64/tst-x86_64-1.c > delete mode 100644 sysdeps/x86_64/tst-x86_64mod-1.c > > diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile > index c19bef2d..3627c565 100644 > --- a/sysdeps/x86_64/Makefile > +++ b/sysdeps/x86_64/Makefile > @@ -57,17 +57,6 @@ $(objpfx)tst-quad2pie: $(objpfx)tst-quadmod2pie.o > CFLAGS-tst-quad1pie.c = $(PIE-ccflag) > CFLAGS-tst-quad2pie.c = $(PIE-ccflag) > > -tests += tst-x86_64-1 > -modules-names += x86_64/tst-x86_64mod-1 > -extra-test-objs += tst-x86_64mod-1.o > -LDFLAGS-tst-x86_64mod-1.so = -Wl,-soname,tst-x86_64mod-1.so > -ifneq (no,$(have-tunables)) > -# Test the state size for XSAVE when XSAVEC is disabled. > -tst-x86_64-1-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC > -endif > - > -$(objpfx)tst-x86_64-1: $(objpfx)x86_64/tst-x86_64mod-1.so > - > ifneq (no,$(have-tunables)) > tests += tst-platform-1 > modules-names += tst-platformmod-1 x86_64/tst-platformmod-2 > @@ -208,11 +197,6 @@ tests += \ > tst-rsi-wcslen > endif > > -$(objpfx)x86_64/tst-x86_64mod-1.os: $(objpfx)tst-x86_64mod-1.os > - $(make-target-directory) > - rm -f $@ > - ln $< $@ > - > do-tests-clean common-mostlyclean: tst-x86_64-1-clean > > .PHONY: tst-x86_64-1-clean > diff --git a/sysdeps/x86_64/tst-x86_64-1.c b/sysdeps/x86_64/tst-x86_64-1.c > deleted file mode 100644 > index 550439e5..00000000 > --- a/sysdeps/x86_64/tst-x86_64-1.c > +++ /dev/null > @@ -1,26 +0,0 @@ > -/* Test searching the "x86_64" directory for shared libraries. > - Copyright (C) 2017-2022 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - <https://www.gnu.org/licenses/>. */ > - > -extern void foo (void); > - > -int > -main (void) > -{ > - foo (); > - return 0; > -} > diff --git a/sysdeps/x86_64/tst-x86_64mod-1.c b/sysdeps/x86_64/tst-x86_64mod-1.c > deleted file mode 100644 > index a80458c4..00000000 > --- a/sysdeps/x86_64/tst-x86_64mod-1.c > +++ /dev/null > @@ -1,22 +0,0 @@ > -/* Test searching the "x86_64" directory for shared libraries. > - Copyright (C) 2017-2022 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - <https://www.gnu.org/licenses/>. */ > - > -void > -foo (void) > -{ > -}
On Mon, 3 Oct 2022 11:56:47 -0300 Adhemerval Zanella Netto wrote: > On 27/09/22 15:05, Javier Pello wrote: > > This was to test loading of shared libraries from platform > > subdirectories, but this functionality is going away in the > > following commits. > > > > Signed-off-by: Javier Pello <devel@otheo.eu> > > LGTM, although I think this patch should be move after the > functionality is removed. > > Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Thanks. I put this patch first because that is what Florian suggested, and I think that it makes sense to strive for the testsuite to pass at any intermediate commits (otherwise bisecting an unrelated bug may be harder), so the test should be removed before the functionality, but I am fine either way. Regards, Javier
On 04/10/22 14:53, Javier Pello wrote: > On Mon, 3 Oct 2022 11:56:47 -0300 Adhemerval Zanella Netto wrote: > >> On 27/09/22 15:05, Javier Pello wrote: >>> This was to test loading of shared libraries from platform >>> subdirectories, but this functionality is going away in the >>> following commits. >>> >>> Signed-off-by: Javier Pello <devel@otheo.eu> >> >> LGTM, although I think this patch should be move after the >> functionality is removed. >> >> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > > Thanks. I put this patch first because that is what Florian > suggested, and I think that it makes sense to strive for the > testsuite to pass at any intermediate commits (otherwise bisecting > an unrelated bug may be harder), so the test should be removed > before the functionality, but I am fine either way. Right, this make sense and I fine with current scheme then.
diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index c19bef2d..3627c565 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -57,17 +57,6 @@ $(objpfx)tst-quad2pie: $(objpfx)tst-quadmod2pie.o CFLAGS-tst-quad1pie.c = $(PIE-ccflag) CFLAGS-tst-quad2pie.c = $(PIE-ccflag) -tests += tst-x86_64-1 -modules-names += x86_64/tst-x86_64mod-1 -extra-test-objs += tst-x86_64mod-1.o -LDFLAGS-tst-x86_64mod-1.so = -Wl,-soname,tst-x86_64mod-1.so -ifneq (no,$(have-tunables)) -# Test the state size for XSAVE when XSAVEC is disabled. -tst-x86_64-1-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-XSAVEC -endif - -$(objpfx)tst-x86_64-1: $(objpfx)x86_64/tst-x86_64mod-1.so - ifneq (no,$(have-tunables)) tests += tst-platform-1 modules-names += tst-platformmod-1 x86_64/tst-platformmod-2 @@ -208,11 +197,6 @@ tests += \ tst-rsi-wcslen endif -$(objpfx)x86_64/tst-x86_64mod-1.os: $(objpfx)tst-x86_64mod-1.os - $(make-target-directory) - rm -f $@ - ln $< $@ - do-tests-clean common-mostlyclean: tst-x86_64-1-clean .PHONY: tst-x86_64-1-clean diff --git a/sysdeps/x86_64/tst-x86_64-1.c b/sysdeps/x86_64/tst-x86_64-1.c deleted file mode 100644 index 550439e5..00000000 --- a/sysdeps/x86_64/tst-x86_64-1.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Test searching the "x86_64" directory for shared libraries. - Copyright (C) 2017-2022 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - -extern void foo (void); - -int -main (void) -{ - foo (); - return 0; -} diff --git a/sysdeps/x86_64/tst-x86_64mod-1.c b/sysdeps/x86_64/tst-x86_64mod-1.c deleted file mode 100644 index a80458c4..00000000 --- a/sysdeps/x86_64/tst-x86_64mod-1.c +++ /dev/null @@ -1,22 +0,0 @@ -/* Test searching the "x86_64" directory for shared libraries. - Copyright (C) 2017-2022 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <https://www.gnu.org/licenses/>. */ - -void -foo (void) -{ -}
This was to test loading of shared libraries from platform subdirectories, but this functionality is going away in the following commits. Signed-off-by: Javier Pello <devel@otheo.eu> --- sysdeps/x86_64/Makefile | 16 ---------------- sysdeps/x86_64/tst-x86_64-1.c | 26 -------------------------- sysdeps/x86_64/tst-x86_64mod-1.c | 22 ---------------------- 3 files changed, 64 deletions(-) delete mode 100644 sysdeps/x86_64/tst-x86_64-1.c delete mode 100644 sysdeps/x86_64/tst-x86_64mod-1.c