qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libio: Fix oversized __io_vtables 

IO_VTABLES_LEN is the size of the struct array in bytes, not the number
of __IO_jump_t's in the array. Drops just under 384kb from .rodata on
LP64 machines.

Fixes: 3020f72618 ("libio: Remove the usage of __libc_IO_vtables")
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Tested-by: Florian Weimer <fweimer@redhat.com>
(cherry picked from commit 8cb69e0543)
This commit is contained in:
Adam Jackson 2023-09-08 15:55:19 -04:00 committed by Florian Weimer
parent 5bdef6f27c
commit 92201f16cb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libio/vtables.c
View File

@ -20,6 +20,7 @@
#include <libioP.h>
#include <stdio.h>
#include <ldsodefs.h>
#include <array_length.h>
#include <pointer_guard.h>
#include <libio-macros.h>
@ -88,7 +89,7 @@
# pragma weak __wprintf_buffer_as_file_xsputn
#endif
const struct _IO_jump_t __io_vtables[IO_VTABLES_LEN] attribute_relro =
const struct _IO_jump_t __io_vtables[] attribute_relro =
{
/* _IO_str_jumps */
[IO_STR_JUMPS] =
@ -485,6 +486,8 @@ const struct _IO_jump_t __io_vtables[IO_VTABLES_LEN] attribute_relro =
},
#endif
};
_Static_assert (array_length (__io_vtables) == IO_VTABLES_NUM,
"initializer count");
#ifdef SHARED