diff mbox series

[v2,3/6] elf: Remove hwcap parameter from add_to_cache signature

Message ID 20220917162045.56fa6e596f4e2e65b99eec37@otheo.eu
State Superseded
Headers
Series Remove legacy hwcaps support |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Javier Pello Sept. 17, 2022, 2:20 p.m. UTC 
  Last commit made it so that the value passed for that parameter was
always 0 at its only call site.

Signed-off-by: Javier Pello <devel@otheo.eu>
---
 elf/cache.c                | 16 +++-------------
 elf/ldconfig.c             |  3 +--
 sysdeps/generic/ldconfig.h |  2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

Comments

Florian Weimer Sept. 22, 2022, 4:02 p.m. UTC | #1 
* Javier Pello:

> Last commit made it so that the value passed for that parameter was
> always 0 at its only call site.
>
> Signed-off-by: Javier Pello <devel@otheo.eu>

Patch looks okay.

Reviewed-by: Florian Weimer <fweimer@redhat.com>

Thanks,
Florian
diff mbox series

Patch

diff --git a/elf/cache.c b/elf/cache.c
index f5f3ef8c..ecbea2a0 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -764,7 +764,7 @@  save_cache (const char *cache_name)
 /* Add one library to the cache.  */
 void
 add_to_cache (const char *path, const char *filename, const char *soname,
-	      int flags, unsigned int isa_level, uint64_t hwcap,
+	      int flags, unsigned int isa_level,
 	      struct glibc_hwcaps_subdirectory *hwcaps)
 {
   struct cache_entry *new_entry = xmalloc (sizeof (*new_entry));
@@ -782,22 +782,12 @@  add_to_cache (const char *path, const char *filename, const char *soname,
   new_entry->path = path_interned;
   new_entry->flags = flags;
   new_entry->isa_level = isa_level;
-  new_entry->hwcap = hwcap;
+  new_entry->hwcap = 0;
   new_entry->hwcaps = hwcaps;
   new_entry->bits_hwcap = 0;
 
   if (hwcaps != NULL)
-    {
-      assert (hwcap == 0);
-      hwcaps->used = true;
-    }
-
-  /* Count the number of bits set in the masked value.  */
-  for (size_t i = 0;
-       (~((1ULL << i) - 1) & hwcap) != 0 && i < 8 * sizeof (hwcap); ++i)
-    if ((hwcap & (1ULL << i)) != 0)
-      ++new_entry->bits_hwcap;
-
+    hwcaps->used = true;
 
   /* Keep the list sorted - search for right place to insert.  */
   struct cache_entry *ptr = entries;
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 9399c228..56325c6c 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -982,8 +982,7 @@  search_dir (const struct dir_entry *entry)
 	}
       if (opt_build_cache)
 	add_to_cache (entry->path, filename, dlib_ptr->soname,
-		      dlib_ptr->flag, dlib_ptr->isa_level, 0,
-		      entry->hwcaps);
+		      dlib_ptr->flag, dlib_ptr->isa_level, entry->hwcaps);
     }
 
   /* Free all resources.  */
diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h
index 7cc898db..24222b0f 100644
--- a/sysdeps/generic/ldconfig.h
+++ b/sysdeps/generic/ldconfig.h
@@ -70,7 +70,7 @@  const char *glibc_hwcaps_subdirectory_name
 
 extern void add_to_cache (const char *path, const char *filename,
 			  const char *soname, int flags,
-			  unsigned int isa_level, uint64_t hwcap,
+			  unsigned int isa_level,
 			  struct glibc_hwcaps_subdirectory *);
 
 extern void init_aux_cache (void);