about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJavier Pello <devel@otheo.eu>2022-09-27 20:05:15 +0200
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-10-06 07:59:48 -0300
commitd178c67535f0d159df73843e7c18cbdb39b4d25d (patch)
tree5934561be480142b1125b9c6b4de0ce7453e4790
parent7fe6734d28feb18acb3c50b13a5f5a52f66d39cf (diff)
downloadglibc-d178c67535f0d159df73843e7c18cbdb39b4d25d.tar.gz
glibc-d178c67535f0d159df73843e7c18cbdb39b4d25d.tar.xz
glibc-d178c67535f0d159df73843e7c18cbdb39b4d25d.zip
x86_64: Remove platform directory library loading test
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>
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
-rw-r--r--sysdeps/x86_64/Makefile16
-rw-r--r--sysdeps/x86_64/tst-x86_64-1.c26
-rw-r--r--sysdeps/x86_64/tst-x86_64mod-1.c22
3 files changed, 0 insertions, 64 deletions
diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
index c19bef2dec..3627c5659f 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 550439e5af..0000000000
--- 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 a80458c47a..0000000000
--- 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)
-{
-}