mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-03-31 06:53:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

improve machinery for ldso to report libc version

Browse Source 
eliminate gratuitous glue function for reporting the version, which
was probably leftover from the old dynamic linker design which lacked
a clear barrier for when/how it could access global data. put the
declaration for the data object that replaces it in libc.h where it
can be type checked.
This commit is contained in:
Rich Felker 2018-09-06 16:17:56 -04:00
parent 3b028c2831
commit 18bf0829a7
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ldso/dynlink.c
View File

@ -99,8 +99,6 @@ int __init_tp(void *);
void __init_libc(char **, char *);
void *__copy_tls(unsigned char *);
hidden const char *__libc_get_version(void);
static struct builtin_tls {
char c;
struct pthread pt;
@ -1562,7 +1560,7 @@ _Noreturn void __dls3(size_t *sp)
"Version %s\n"
"Dynamic Program Loader\n"
"Usage: %s [options] [--] pathname%s\n",
__libc_get_version(), ldname,
__libc_version, ldname,
ldd_mode ? "" : " [args]");
_exit(1);
}

2
src/internal/libc.h
View File

@ -43,6 +43,8 @@ extern hidden size_t __hwcap;
extern hidden size_t __sysinfo;
extern char *__progname, *__progname_full;
extern hidden const char __libc_version[];
/* Designed to avoid any overhead in non-threaded processes */
hidden void __lock(volatile int *);
hidden void __unlock(volatile int *);

7
src/internal/version.c
View File

@ -1,9 +1,4 @@
#include "version.h"
#include "libc.h"
static const char version[] = VERSION;
hidden const char *__libc_get_version()
{
return version;
}
const char __libc_version[] = VERSION;