Page MenuHomeFreeBSD

elf-hints.h: Allow rtld_paths.h to be included before it
ClosedPublic

Authored by jrtc27 on Jul 7 2023, 11:57 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 8:18 AM
Unknown Object (File)
Mon, Apr 14, 3:52 AM
Unknown Object (File)
Sun, Apr 13, 9:11 PM
Unknown Object (File)
Sun, Apr 13, 9:07 PM
Unknown Object (File)
Mar 10 2025, 10:56 AM
Unknown Object (File)
Mar 10 2025, 9:44 AM
Unknown Object (File)
Mar 3 2025, 2:10 PM
Unknown Object (File)
Mar 3 2025, 8:22 AM
Subscribers

Details

Summary

Currently rtld_paths.h will #undef _PATH_ELF_HINTS in order to override
this to the right value if included afterwards, but the other way round
does not work as elf-hints.h tries to define an already-defined macro to
a potentially different value. Thus, guard the definition here so that
rtld_paths.h's definition continues to take precedence.

Note that, although all in-tree uses of _PATH_ELF_HINTS have included
rtld_paths.h already, pax-utils wants _PATH_ELF_HINTS from elf-hints.h
and so we cannot just drop the define. In-tree uses must just continue
to make sure that they include rtld_paths.h to get the right value for
libcompat builds as is already required.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable