d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtld-elf/paths.h: Make it usable outside rtld

Browse Source 
but still for tightly coupled things like ldd(1)

Rename paths.h to rtld_paths.h.
Add guard for rtld-specific externs declarations.
Add _COMPAT32_BASENAME_RTLD and _COMPAT32_PATH_RTLD.

Reviewed by:	arichardson, jhb
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D32464
This commit is contained in:
Konstantin Belousov 2021-10-12 18:50:49 +03:00
parent 9ce201f2ee
commit 33dba3bb0e
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libexec/rtld-elf/arm/reloc.c
View File

@ -16,7 +16,7 @@ __FBSDID("$FreeBSD$");
#include "debug.h" #include "debug.h"
#include "rtld.h" #include "rtld.h"
#include "paths.h" #include "rtld_paths.h"
#ifdef __ARM_FP #ifdef __ARM_FP
/* /*

2
libexec/rtld-elf/libmap.c
View File

@ -16,7 +16,7 @@
#include "debug.h" #include "debug.h"
#include "rtld.h" #include "rtld.h"
#include "libmap.h" #include "libmap.h"
#include "paths.h" #include "rtld_paths.h"
#include "rtld_libc.h" #include "rtld_libc.h"
TAILQ_HEAD(lm_list, lm); TAILQ_HEAD(lm_list, lm);

2
libexec/rtld-elf/rtld.c
View File

@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$");
#include "debug.h" #include "debug.h"
#include "rtld.h" #include "rtld.h"
#include "libmap.h" #include "libmap.h"
#include "paths.h" #include "rtld_paths.h"
#include "rtld_tls.h" #include "rtld_tls.h"
#include "rtld_printf.h" #include "rtld_printf.h"
#include "rtld_malloc.h" #include "rtld_malloc.h"

2
libexec/rtld-elf/rtld_malloc.c
View File

@ -55,7 +55,7 @@ static char *rcsid = "$FreeBSD$";
#include <unistd.h> #include <unistd.h>
#include "rtld.h" #include "rtld.h"
#include "rtld_printf.h" #include "rtld_printf.h"
#include "paths.h" #include "rtld_paths.h"
/* /*
* Pre-allocate mmap'ed pages * Pre-allocate mmap'ed pages

18
libexec/rtld-elf/paths.h → libexec/rtld-elf/rtld_paths.h
View File

@ -26,15 +26,19 @@
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef PATHS_H #ifndef _RTLD_PATHS_H
#define PATHS_H #define _RTLD_PATHS_H
#undef _PATH_ELF_HINTS #undef _PATH_ELF_HINTS
#ifndef _COMPAT32_BASENAME_RTLD
#define _COMPAT32_BASENAME_RTLD "ld-elf32.so.1"
#endif
#ifdef COMPAT_32BIT #ifdef COMPAT_32BIT
#define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints" #define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints"
#define _PATH_LIBMAP_CONF "/etc/libmap32.conf" #define _PATH_LIBMAP_CONF "/etc/libmap32.conf"
#define _BASENAME_RTLD "ld-elf32.so.1" #define _BASENAME_RTLD _COMPAT32_BASENAME_RTLD
#define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32" #define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32"
#define LD_ "LD_32_" #define LD_ "LD_32_"
#endif #endif
@ -55,6 +59,10 @@
#define _PATH_RTLD "/libexec/" _BASENAME_RTLD #define _PATH_RTLD "/libexec/" _BASENAME_RTLD
#endif #endif
#ifndef _COMPAT32_PATH_RTLD
#define _COMPAT32_PATH_RTLD "/libexec/" _COMPAT32_BASENAME_RTLD
#endif
#ifndef STANDARD_LIBRARY_PATH #ifndef STANDARD_LIBRARY_PATH
#define STANDARD_LIBRARY_PATH "/lib/casper:/lib:/usr/lib" #define STANDARD_LIBRARY_PATH "/lib/casper:/lib:/usr/lib"
#endif #endif
@ -69,10 +77,12 @@
#define SOFT_STANDARD_LIBRARY_PATH "/usr/libsoft" #define SOFT_STANDARD_LIBRARY_PATH "/usr/libsoft"
#define LD_SOFT_ "LD_SOFT_" #define LD_SOFT_ "LD_SOFT_"
#ifdef IN_RTLD
extern const char *ld_elf_hints_default; extern const char *ld_elf_hints_default;
extern const char *ld_path_libmap_conf; extern const char *ld_path_libmap_conf;
extern const char *ld_path_rtld; extern const char *ld_path_rtld;
extern const char *ld_standard_library_path; extern const char *ld_standard_library_path;
extern const char *ld_env_prefix; extern const char *ld_env_prefix;
#endif
#endif /* PATHS_H */ #endif /* _RTLD_PATHS_H */