From 600d9e0c87940da9b0fdeff492bf888df852d40c Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 4 Dec 2020 09:13:43 +0100 Subject: elf: Add glibc-hwcaps subdirectory support to ld.so cache processing This recognizes the DL_CACHE_HWCAP_EXTENSION flag in cache entries, and picks the supported cache entry with the highest priority. The elf/tst-glibc-hwcaps-prepend-cache test documents a non-desired aspect of the current cache implementation: If the cache selects a DSO that does not exist on disk, _dl_map_object falls back to open_path, which may or may not find an alternative implementation. This is an existing limitation that also applies to the legacy hwcaps processing for ld.so.cache. Reviewed-by: Adhemerval Zanella --- elf/tst-glibc-hwcaps-cache.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 elf/tst-glibc-hwcaps-cache.c (limited to 'elf/tst-glibc-hwcaps-cache.c') diff --git a/elf/tst-glibc-hwcaps-cache.c b/elf/tst-glibc-hwcaps-cache.c new file mode 100644 index 0000000000..4bad56afc0 --- /dev/null +++ b/elf/tst-glibc-hwcaps-cache.c @@ -0,0 +1,45 @@ +/* Wrapper to invoke tst-glibc-hwcaps in a container, to test ld.so.cache. + Copyright (C) 2020 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 + . */ + +/* This program is just a wrapper that runs ldconfig followed by + tst-glibc-hwcaps. The actual test is provided via an + implementation in a sysdeps subdirectory. */ + +#include +#include +#include +#include + +int +main (int argc, char **argv) +{ + /* Run ldconfig to populate the cache. */ + { + char *command = xasprintf ("%s/ldconfig", support_install_rootsbindir); + if (system (command) != 0) + return 1; + free (command); + } + + /* Reuse tst-glibc-hwcaps. Since this code is running in a + container, we can launch it directly. */ + char *path = xasprintf ("%s/elf/tst-glibc-hwcaps", support_objdir_root); + execv (path, argv); + printf ("error: execv of %s failed: %m\n", path); + return 1; +} -- cgit 1.4.1