AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

stdio: Split __get_errname definition from errlist.c

Browse Source 
The loader does not need to pull all __get_errlist definitions
and its size is decreased:

Before:
$ size elf/ld.so
   text    data     bss     dec     hex filename
 197774   11024     456  209254   33166 elf/ld.so

After:
$ size elf/ld.so
   text    data     bss     dec     hex filename
 191510    9936     456  201902   314ae elf/ld.so

Checked on x86_64-linux-gnu.
This commit is contained in:
Adhemerval Zanella 2022-04-06 11:46:46 -03:00
parent 26b2478322
commit 592b6d00aa
4 changed files with 85 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stdio-common/Makefile
View File

@ -88,6 +88,7 @@ routines := \
aux := \
errlist \
errname \
fxprintf \
printf-parsemb \
printf-parsewc \

38
stdio-common/errlist.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991-2022 Free Software Foundation, Inc.
/* Internal errno names mapping definition.
Copyright (C) 1991-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
@ -40,39 +41,4 @@ __get_errlist (int errnum)
return NULL;
}
static const union sys_errname_t
{
struct
{
#define MSGSTRFIELD1(line) str##line
#define MSGSTRFIELD(line) MSGSTRFIELD1(line)
#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(#n)];
#include <errlist.h>
#undef _S
};
char str[0];
} _sys_errname = { {
#define _S(n, s) #n,
#include <errlist.h>
#undef _S
} };
static const unsigned short _sys_errnameidx[] =
{
#define _S(n, s) \
[ERR_MAP(n)] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
#include <errlist.h>
#undef _S
};
const char *
__get_errname (int errnum)
{
int mapped = ERR_MAP (errnum);
if (mapped < 0 || mapped >= array_length (_sys_errnameidx)
|| (mapped > 0 && _sys_errnameidx[mapped] == 0))
return NULL;
return _sys_errname.str + _sys_errnameidx[mapped];
}
#include <errlist-compat.c>

61
stdio-common/errname.c Normal file
View File

@ -0,0 +1,61 @@
/* Internal errno names mapping definition.
Copyright (C) 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
<https://www.gnu.org/licenses/>. */
#include <stdio.h>
#include <errno.h>
#include <libintl.h>
#include <array_length.h>
#ifndef ERR_MAP
# define ERR_MAP(n) n
#endif
static const union sys_errname_t
{
struct
{
#define MSGSTRFIELD1(line) str##line
#define MSGSTRFIELD(line) MSGSTRFIELD1(line)
#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(#n)];
#include <errlist.h>
#undef _S
};
char str[0];
} _sys_errname = { {
#define _S(n, s) #n,
#include <errlist.h>
#undef _S
} };
static const unsigned short _sys_errnameidx[] =
{
#define _S(n, s) \
[ERR_MAP(n)] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
#include <errlist.h>
#undef _S
};
const char *
__get_errname (int errnum)
{
int mapped = ERR_MAP (errnum);
if (mapped < 0 || mapped >= array_length (_sys_errnameidx)
|| (mapped > 0 && _sys_errnameidx[mapped] == 0))
return NULL;
return _sys_errname.str + _sys_errnameidx[mapped];
}

21
sysdeps/mach/hurd/errname.c Normal file
View File

@ -0,0 +1,21 @@
/* Copyright (C) 1998-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
<https://www.gnu.org/licenses/>. */
#include <mach/error.h>
#define ERR_MAP(value) err_get_code (value)
#include <stdio-common/errname.c>