Page MenuHomeFreeBSD
Differential D39986

Mk/Uses/magick.mk: Improve readability
ClosedPublic
Actions

Authored by zirias on May 6 2023, 10:42 AM.
Tags
None
Referenced Files
F114884399: D39986.id121724.diff
Fri, Apr 18, 2:50 AM
Unknown Object (File)
Mon, Apr 14, 8:52 AM
Unknown Object (File)
Thu, Apr 3, 7:40 PM
Unknown Object (File)
Mar 10 2025, 11:14 AM
Unknown Object (File)
Feb 15 2025, 9:16 PM
Unknown Object (File)
Feb 14 2025, 12:28 AM
Unknown Object (File)
Feb 14 2025, 12:26 AM
Unknown Object (File)
Feb 14 2025, 12:04 AM
View All 47 Files
Subscribers
cperciva
mat

Details

Reviewers
tcberner
Group Reviewers
portmgr
Commits
R11:326005b3bb9f: Mk/Uses/magick.mk: Improve readability
Summary

Improve readability by replacing the AT&T-style expansions with some
explicit logic. This also avoids incompatibility with very old make
versions where % in these expansions also matches empty strings.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 51354
Build 48245: arc lint + arc unit

Revision Contents
Changeset List

PathSize
Mk/
Uses/
15 lines

Diff 121604

View Options

Mk/Uses/magick.mk

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Lines
/* Types. */ /* Types. */
typedef void (*func_ptr_type)(); typedef void (*func_ptr_type)();
typedef void * (*path_enum_proc) (const char *path, size_t len, void *arg); typedef void * (*path_enum_proc) (const char *path, size_t len, void *arg);
/* /*
* Function declarations. * Function declarations.
*/ */
static const char *basename(const char *); static const char *basename(const char *);
static void die(void) __dead2;
static void digest_dynamic1(Obj_Entry *, int, const Elf_Dyn **, static void digest_dynamic1(Obj_Entry *, int, const Elf_Dyn **,
const Elf_Dyn **, const Elf_Dyn **); const Elf_Dyn **, const Elf_Dyn **);
static void digest_dynamic2(Obj_Entry *, const Elf_Dyn *, const Elf_Dyn *, static void digest_dynamic2(Obj_Entry *, const Elf_Dyn *, const Elf_Dyn *,
const Elf_Dyn *); const Elf_Dyn *);
static void digest_dynamic(Obj_Entry *, int); static void digest_dynamic(Obj_Entry *, int);
static Obj_Entry *digest_phdr(const Elf_Phdr *, int, caddr_t, const char *); static Obj_Entry *digest_phdr(const Elf_Phdr *, int, caddr_t, const char *);
static Obj_Entry *dlcheck(void *); static Obj_Entry *dlcheck(void *);
static Obj_Entry *dlopen_object(const char *name, int fd, Obj_Entry *refobj, static Obj_Entry *dlopen_object(const char *name, int fd, Obj_Entry *refobj,
▲ Show 20 Lines • Show All 335 Lines • ▼ Show 20 Lines if (sysctl(mib, 2, __stack_chk_guard, &len, NULL, 0) == -1 ||
*/ */
if (!trust) { if (!trust) {
if (unsetenv(LD_ "PRELOAD") || unsetenv(LD_ "LIBMAP") || if (unsetenv(LD_ "PRELOAD") || unsetenv(LD_ "LIBMAP") ||
unsetenv(LD_ "LIBRARY_PATH") || unsetenv(LD_ "LIBRARY_PATH_FDS") || unsetenv(LD_ "LIBRARY_PATH") || unsetenv(LD_ "LIBRARY_PATH_FDS") ||
unsetenv(LD_ "LIBMAP_DISABLE") || unsetenv(LD_ "LIBMAP_DISABLE") ||
unsetenv(LD_ "DEBUG") || unsetenv(LD_ "ELF_HINTS_PATH") || unsetenv(LD_ "DEBUG") || unsetenv(LD_ "ELF_HINTS_PATH") ||
unsetenv(LD_ "LOADFLTR") || unsetenv(LD_ "LIBRARY_PATH_RPATH")) { unsetenv(LD_ "LOADFLTR") || unsetenv(LD_ "LIBRARY_PATH_RPATH")) {
_rtld_error("environment corrupt; aborting"); _rtld_error("environment corrupt; aborting");
die(); _rtld_die();
} }
} }
ld_debug = getenv(LD_ "DEBUG"); ld_debug = getenv(LD_ "DEBUG");
libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL; libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL;
libmap_override = getenv(LD_ "LIBMAP"); libmap_override = getenv(LD_ "LIBMAP");
ld_library_path = getenv(LD_ "LIBRARY_PATH"); ld_library_path = getenv(LD_ "LIBRARY_PATH");
ld_library_dirs = getenv(LD_ "LIBRARY_PATH_FDS"); ld_library_dirs = getenv(LD_ "LIBRARY_PATH_FDS");
ld_preload = getenv(LD_ "PRELOAD"); ld_preload = getenv(LD_ "PRELOAD");
Show All 32 Lines (caddr_t) aux_info[AT_BASE]->a_un.a_ptr);
* already loaded. * already loaded.
*/ */
if (aux_info[AT_EXECFD] != NULL) { /* Load the main program. */ if (aux_info[AT_EXECFD] != NULL) { /* Load the main program. */
int fd = aux_info[AT_EXECFD]->a_un.a_val; int fd = aux_info[AT_EXECFD]->a_un.a_val;
dbg("loading main program"); dbg("loading main program");
obj_main = map_object(fd, argv0, NULL); obj_main = map_object(fd, argv0, NULL);
close(fd); close(fd);
if (obj_main == NULL) if (obj_main == NULL)
die(); _rtld_die();
max_stack_flags = obj->stack_flags; max_stack_flags = obj->stack_flags;
} else { /* Main program already loaded. */ } else { /* Main program already loaded. */
const Elf_Phdr *phdr; const Elf_Phdr *phdr;
int phnum; int phnum;
caddr_t entry; caddr_t entry;
dbg("processing main program's program header"); dbg("processing main program's program header");
assert(aux_info[AT_PHDR] != NULL); assert(aux_info[AT_PHDR] != NULL);
phdr = (const Elf_Phdr *) aux_info[AT_PHDR]->a_un.a_ptr; phdr = (const Elf_Phdr *) aux_info[AT_PHDR]->a_un.a_ptr;
assert(aux_info[AT_PHNUM] != NULL); assert(aux_info[AT_PHNUM] != NULL);
phnum = aux_info[AT_PHNUM]->a_un.a_val; phnum = aux_info[AT_PHNUM]->a_un.a_val;
assert(aux_info[AT_PHENT] != NULL); assert(aux_info[AT_PHENT] != NULL);
assert(aux_info[AT_PHENT]->a_un.a_val == sizeof(Elf_Phdr)); assert(aux_info[AT_PHENT]->a_un.a_val == sizeof(Elf_Phdr));
assert(aux_info[AT_ENTRY] != NULL); assert(aux_info[AT_ENTRY] != NULL);
entry = (caddr_t) aux_info[AT_ENTRY]->a_un.a_ptr; entry = (caddr_t) aux_info[AT_ENTRY]->a_un.a_ptr;
if ((obj_main = digest_phdr(phdr, phnum, entry, argv0)) == NULL) if ((obj_main = digest_phdr(phdr, phnum, entry, argv0)) == NULL)
die(); _rtld_die();
} }
if (aux_info[AT_EXECPATH] != 0) { if (aux_info[AT_EXECPATH] != 0) {
char *kexecpath; char *kexecpath;
char buf[MAXPATHLEN]; char buf[MAXPATHLEN];
kexecpath = aux_info[AT_EXECPATH]->a_un.a_ptr; kexecpath = aux_info[AT_EXECPATH]->a_un.a_ptr;
dbg("AT_EXECPATH %p %s", kexecpath, kexecpath); dbg("AT_EXECPATH %p %s", kexecpath, kexecpath);
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines obj_main->dynsymcount);
sym_zero.st_shndx = SHN_UNDEF; sym_zero.st_shndx = SHN_UNDEF;
sym_zero.st_value = -(uintptr_t)obj_main->relocbase; sym_zero.st_value = -(uintptr_t)obj_main->relocbase;
if (!libmap_disable) if (!libmap_disable)
libmap_disable = (bool)lm_init(libmap_override); libmap_disable = (bool)lm_init(libmap_override);
dbg("loading LD_PRELOAD libraries"); dbg("loading LD_PRELOAD libraries");
if (load_preload_objects() == -1) if (load_preload_objects() == -1)
die(); _rtld_die();
preload_tail = obj_tail; preload_tail = obj_tail;
dbg("loading needed objects"); dbg("loading needed objects");
if (load_needed_objects(obj_main, 0) == -1) if (load_needed_objects(obj_main, 0) == -1)
die(); _rtld_die();
/* Make a list of all objects loaded at startup. */ /* Make a list of all objects loaded at startup. */
last_interposer = obj_main; last_interposer = obj_main;
for (obj = obj_list; obj != NULL; obj = obj->next) { for (obj = obj_list; obj != NULL; obj = obj->next) {
if (obj->z_interpose && obj != obj_main) { if (obj->z_interpose && obj != obj_main) {
objlist_put_after(&list_main, last_interposer, obj); objlist_put_after(&list_main, last_interposer, obj);
last_interposer = obj; last_interposer = obj;
} else { } else {
objlist_push_tail(&list_main, obj); objlist_push_tail(&list_main, obj);
} }
obj->refcount++; obj->refcount++;
} }
dbg("checking for required versions"); dbg("checking for required versions");
if (rtld_verify_versions(&list_main) == -1 && !ld_tracing) if (rtld_verify_versions(&list_main) == -1 && !ld_tracing)
die(); _rtld_die();
if (ld_tracing) { /* We're done */ if (ld_tracing) { /* We're done */
trace_loaded_objects(obj_main); trace_loaded_objects(obj_main);
exit(0); exit(0);
} }
if (getenv(LD_ "DUMP_REL_PRE") != NULL) { if (getenv(LD_ "DUMP_REL_PRE") != NULL) {
dump_relocations(obj_main); dump_relocations(obj_main);
Show All 12 Lines#endif
* block even if they didn't ask for it. * block even if they didn't ask for it.
*/ */
allocate_tls_offset(entry->obj); allocate_tls_offset(entry->obj);
} }
if (relocate_objects(obj_main, if (relocate_objects(obj_main,
ld_bind_now != NULL && *ld_bind_now != '\0', ld_bind_now != NULL && *ld_bind_now != '\0',
&obj_rtld, SYMLOOK_EARLY, NULL) == -1) &obj_rtld, SYMLOOK_EARLY, NULL) == -1)
die(); _rtld_die();
dbg("doing copy relocations"); dbg("doing copy relocations");
if (do_copy_relocations(obj_main) == -1) if (do_copy_relocations(obj_main) == -1)
die(); _rtld_die();
if (getenv(LD_ "DUMP_REL_POST") != NULL) { if (getenv(LD_ "DUMP_REL_POST") != NULL) {
dump_relocations(obj_main); dump_relocations(obj_main);
exit (0); exit (0);
} }
/* /*
* Setup TLS for main thread. This must be done after the * Setup TLS for main thread. This must be done after the
Show All 15 Lines _rtld_die();
r_debug_state(NULL, &obj_main->linkmap); /* say hello to gdb! */ r_debug_state(NULL, &obj_main->linkmap); /* say hello to gdb! */
map_stacks_exec(NULL); map_stacks_exec(NULL);
dbg("resolving ifuncs"); dbg("resolving ifuncs");
if (resolve_objects_ifunc(obj_main, if (resolve_objects_ifunc(obj_main,
ld_bind_now != NULL && *ld_bind_now != '\0', SYMLOOK_EARLY, ld_bind_now != NULL && *ld_bind_now != '\0', SYMLOOK_EARLY,
NULL) == -1) NULL) == -1)
die(); _rtld_die();
if (!obj_main->crt_no_init) { if (!obj_main->crt_no_init) {
/* /*
* Make sure we don't call the main program's init and fini * Make sure we don't call the main program's init and fini
* functions for binaries linked with old crt1 which calls * functions for binaries linked with old crt1 which calls
* _init itself. * _init itself.
*/ */
obj_main->init = obj_main->fini = (Elf_Addr)NULL; obj_main->init = obj_main->fini = (Elf_Addr)NULL;
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines_rtld_bind(Obj_Entry *obj, Elf_Size reloff)
rel = (const Elf_Rel *) ((caddr_t) obj->pltrel + reloff); rel = (const Elf_Rel *) ((caddr_t) obj->pltrel + reloff);
else else
rel = (const Elf_Rel *) ((caddr_t) obj->pltrela + reloff); rel = (const Elf_Rel *) ((caddr_t) obj->pltrela + reloff);
where = (Elf_Addr *) (obj->relocbase + rel->r_offset); where = (Elf_Addr *) (obj->relocbase + rel->r_offset);
def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, true, NULL, def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, true, NULL,
&lockstate); &lockstate);
if (def == NULL) if (def == NULL)
die(); _rtld_die();
if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
target = (Elf_Addr)rtld_resolve_ifunc(defobj, def); target = (Elf_Addr)rtld_resolve_ifunc(defobj, def);
else else
target = (Elf_Addr)(defobj->relocbase + def->st_value); target = (Elf_Addr)(defobj->relocbase + def->st_value);
dbg("\"%s\" in \"%s\" ==> %p in \"%s\"", dbg("\"%s\" in \"%s\" ==> %p in \"%s\"",
defobj->strtab + def->st_name, basename(obj->path), defobj->strtab + def->st_name, basename(obj->path),
(void *)target, basename(defobj->path)); (void *)target, basename(defobj->path));
▲ Show 20 Lines • Show All 132 Lines • ▼ Show 20 Linesorigin_subst(char *real, const char *origin_path)
} }
res1 = origin_subst_one(real, "$ORIGIN", origin_path, false); res1 = origin_subst_one(real, "$ORIGIN", origin_path, false);
res2 = origin_subst_one(res1, "$OSNAME", uts.sysname, true); res2 = origin_subst_one(res1, "$OSNAME", uts.sysname, true);
res3 = origin_subst_one(res2, "$OSREL", uts.release, true); res3 = origin_subst_one(res2, "$OSREL", uts.release, true);
res4 = origin_subst_one(res3, "$PLATFORM", uts.machine, true); res4 = origin_subst_one(res3, "$PLATFORM", uts.machine, true);
return (res4); return (res4);
} }
static void void
die(void) _rtld_die(void)
{ {
const char *msg = dlerror(); const char *msg = dlerror();
if (msg == NULL) if (msg == NULL)
msg = "Fatal error"; msg = "Fatal error";
rtld_fdputstr(STDERR_FILENO, msg); rtld_fdputstr(STDERR_FILENO, msg);
rtld_fdputchar(STDERR_FILENO, '\n'); rtld_fdputchar(STDERR_FILENO, '\n');
_exit(1); _exit(1);
▲ Show 20 Lines • Show All 333 Lines • ▼ Show 20 Lines
static void static void
digest_dynamic2(Obj_Entry *obj, const Elf_Dyn *dyn_rpath, digest_dynamic2(Obj_Entry *obj, const Elf_Dyn *dyn_rpath,
const Elf_Dyn *dyn_soname, const Elf_Dyn *dyn_runpath) const Elf_Dyn *dyn_soname, const Elf_Dyn *dyn_runpath)
{ {
if (obj->z_origin && obj->origin_path == NULL) { if (obj->z_origin && obj->origin_path == NULL) {
obj->origin_path = xmalloc(PATH_MAX); obj->origin_path = xmalloc(PATH_MAX);
if (rtld_dirname_abs(obj->path, obj->origin_path) == -1) if (rtld_dirname_abs(obj->path, obj->origin_path) == -1)
die(); _rtld_die();
} }
if (dyn_runpath != NULL) { if (dyn_runpath != NULL) {
obj->runpath = (char *)obj->strtab + dyn_runpath->d_un.d_val; obj->runpath = (char *)obj->strtab + dyn_runpath->d_un.d_val;
if (obj->z_origin) if (obj->z_origin)
obj->runpath = origin_subst(obj->runpath, obj->origin_path); obj->runpath = origin_subst(obj->runpath, obj->origin_path);
} }
else if (dyn_rpath != NULL) { else if (dyn_rpath != NULL) {
▲ Show 20 Lines • Show All 681 Lines • ▼ Show 20 Lines else {
} else { } else {
mib[0] = CTL_HW; mib[0] = CTL_HW;
mib[1] = HW_PAGESIZE; mib[1] = HW_PAGESIZE;
len = 2; len = 2;
} }
} }
if (sysctl(mib, len, psa, &size, NULL, 0) == -1) { if (sysctl(mib, len, psa, &size, NULL, 0) == -1) {
_rtld_error("sysctl for hw.pagesize(s) failed"); _rtld_error("sysctl for hw.pagesize(s) failed");
die(); _rtld_die();
} }
psa_filled: psa_filled:
pagesizes = psa; pagesizes = psa;
} }
npagesizes = size / sizeof(pagesizes[0]); npagesizes = size / sizeof(pagesizes[0]);
/* Discard any invalid entries at the end of the array. */ /* Discard any invalid entries at the end of the array. */
while (npagesizes > 0 && pagesizes[npagesizes - 1] == 0) while (npagesizes > 0 && pagesizes[npagesizes - 1] == 0)
npagesizes--; npagesizes--;
▲ Show 20 Lines • Show All 920 Lines • ▼ Show 20 Lines for (fdstr = strtok_r(envcopy, ":", &last_token); fdstr != NULL;
fd = __sys_openat(dirfd, name, O_RDONLY | O_CLOEXEC); fd = __sys_openat(dirfd, name, O_RDONLY | O_CLOEXEC);
if (fd >= 0) { if (fd >= 0) {
*fdp = fd; *fdp = fd;
len = strlen(fdstr) + strlen(name) + 3; len = strlen(fdstr) + strlen(name) + 3;
found = xmalloc(len); found = xmalloc(len);
if (rtld_snprintf(found, len, "#%d/%s", dirfd, name) < 0) { if (rtld_snprintf(found, len, "#%d/%s", dirfd, name) < 0) {
_rtld_error("error generating '%d/%s'", _rtld_error("error generating '%d/%s'",
dirfd, name); dirfd, name);
die(); _rtld_die();
} }
dbg("open('%s') => %d", found, fd); dbg("open('%s') => %d", found, fd);
break; break;
} }
} }
free(envcopy); free(envcopy);
return (found); return (found);
▲ Show 20 Lines • Show All 1,703 Lines • ▼ Show 20 Linesallocate_module_tls(int index)
char* p; char* p;
for (obj = obj_list; obj; obj = obj->next) { for (obj = obj_list; obj; obj = obj->next) {
if (obj->tlsindex == index) if (obj->tlsindex == index)
break; break;
} }
if (!obj) { if (!obj) {
_rtld_error("Can't find module with TLS index %d", index); _rtld_error("Can't find module with TLS index %d", index);
die(); _rtld_die();
} }
p = malloc_aligned(obj->tlssize, obj->tlsalign); p = malloc_aligned(obj->tlssize, obj->tlsalign);
memcpy(p, obj->tlsinit, obj->tlsinitsize); memcpy(p, obj->tlsinit, obj->tlsinitsize);
memset(p + obj->tlsinitsize, 0, obj->tlssize - obj->tlsinitsize); memset(p + obj->tlsinitsize, 0, obj->tlssize - obj->tlsinitsize);
return p; return p;
} }
▲ Show 20 Lines • Show All 124 Lines • ▼ Show 20 Lines (needed->obj != NULL && object_match_name(needed->obj, name))) {
* return NULL here. This is expected and handled * return NULL here. This is expected and handled
* properly by the caller. * properly by the caller.
*/ */
return (needed->obj); return (needed->obj);
} }
} }
_rtld_error("%s: Unexpected inconsistency: dependency %s not found", _rtld_error("%s: Unexpected inconsistency: dependency %s not found",
obj->path, name); obj->path, name);
die(); _rtld_die();
} }
static int static int
check_object_provided_version(Obj_Entry *refobj, const Obj_Entry *depobj, check_object_provided_version(Obj_Entry *refobj, const Obj_Entry *depobj,
const Elf_Vernaux *vna) const Elf_Vernaux *vna)
{ {
const Elf_Verdef *vd; const Elf_Verdef *vd;
const char *vername; const char *vername;
▲ Show 20 Lines • Show All 320 Lines • ▼ Show 20 Lines
{ {
} }
void void
__stack_chk_fail(void) __stack_chk_fail(void)
{ {
_rtld_error("stack overflow detected; terminated"); _rtld_error("stack overflow detected; terminated");
die(); _rtld_die();
} }
__weak_reference(__stack_chk_fail, __stack_chk_fail_local); __weak_reference(__stack_chk_fail, __stack_chk_fail_local);
void void
__chk_fail(void) __chk_fail(void)
{ {
_rtld_error("buffer overflow detected; terminated"); _rtld_error("buffer overflow detected; terminated");
die(); _rtld_die();
} }
const char * const char *
rtld_strerror(int errnum) rtld_strerror(int errnum)
{ {
if (errnum < 0 || errnum >= sys_nerr) if (errnum < 0 || errnum >= sys_nerr)
return ("Unknown error"); return ("Unknown error");
return (sys_errlist[errnum]); return (sys_errlist[errnum]);
} }