From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id CFC81384BC00; Thu, 6 Oct 2022 11:02:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CFC81384BC00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665054152; bh=xamJ6DcwUEpDhtRa8q1ZYPZaF3DNiFUfQtsD/10RFwU=; h=From:To:Subject:Date:From; b=kRswWe/kELNHdoJow8GATBCTzQF1XI6AExu+n+RJJczB/NMK7jPsKJnQ3OaUhUN3M /sqw8qQWNw/sDS9cZlE2/W2eon6PEEx9Q15JpT6reyLvIXOApl+HmOiVAwiTzwTyDR LruOp/wIlBcCQzZY38X7nhLkzcvsQJVKYLSdAT5w= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] x86_64: Remove platform directory library loading test X-Act-Checkin: glibc X-Git-Author: Javier Pello X-Git-Refname: refs/heads/master X-Git-Oldrev: 7fe6734d28feb18acb3c50b13a5f5a52f66d39cf X-Git-Newrev: d178c67535f0d159df73843e7c18cbdb39b4d25d Message-Id: <20221006110232.CFC81384BC00@sourceware.org> Date: Thu, 6 Oct 2022 11:02:32 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d178c67535f0d159df73843e7c18cbdb39b4d25d commit d178c67535f0d159df73843e7c18cbdb39b4d25d Author: Javier Pello Date: Tue Sep 27 20:05:15 2022 +0200 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 Reviewed-by: Adhemerval Zanella Diff: --- 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(-) 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 - . */ - -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 - . */ - -void -foo (void) -{ -}