From 535e935a284b2ec96659d1ac40eebf61321f2362 Mon Sep 17 00:00:00 2001 From: Noah Goldstein Date: Wed, 13 Apr 2022 19:46:03 -0500 Subject: Replace {u}int_fast{16|32} with {u}int32_t On 32-bit machines this has no affect. On 64-bit machines {u}int_fast{16|32} are set as {u}int64_t which is often not ideal. Particularly x86_64 this change both saves code size and may save instruction cost. Full xcheck passes on x86_64. --- sysdeps/mips/dl-machine-reject-phdr.h | 2 +- sysdeps/unix/sysv/linux/dl-sysdep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/mips/dl-machine-reject-phdr.h b/sysdeps/mips/dl-machine-reject-phdr.h index e784320234..45b6bcaeac 100644 --- a/sysdeps/mips/dl-machine-reject-phdr.h +++ b/sysdeps/mips/dl-machine-reject-phdr.h @@ -152,7 +152,7 @@ static const struct abi_req none_req = { true, true, true, false, true }; impact of dlclose. */ static bool __attribute_used__ -elf_machine_reject_phdr_p (const ElfW(Phdr) *phdr, uint_fast16_t phnum, +elf_machine_reject_phdr_p (const ElfW(Phdr) *phdr, unsigned int phnum, const char *buf, size_t len, struct link_map *map, int fd) { diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c index c90f109b11..a67c454673 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/dl-sysdep.c @@ -269,7 +269,7 @@ _dl_discover_osversion (void) } expected_note = { { sizeof "Linux", sizeof (ElfW(Word)), 0 }, "Linux" }; const ElfW(Phdr) *const phdr = GLRO(dl_sysinfo_map)->l_phdr; const ElfW(Word) phnum = GLRO(dl_sysinfo_map)->l_phnum; - for (uint_fast16_t i = 0; i < phnum; ++i) + for (unsigned int i = 0; i < phnum; ++i) if (phdr[i].p_type == PT_NOTE) { const ElfW(Addr) start = (phdr[i].p_vaddr -- cgit 1.4.1