Page MenuHomeFreeBSD

rtld: clean up Makefile.
ClosedPublic

Authored by kib on Jan 8 2020, 9:55 AM.
Tags
None
Referenced Files
F103248677: D23083.diff
Fri, Nov 22, 3:08 PM
Unknown Object (File)
Oct 1 2024, 2:21 PM
Unknown Object (File)
Sep 25 2024, 11:00 PM
Unknown Object (File)
Sep 17 2024, 5:51 AM
Unknown Object (File)
Sep 17 2024, 5:51 AM
Unknown Object (File)
Sep 17 2024, 5:51 AM
Unknown Object (File)
Sep 17 2024, 5:51 AM
Unknown Object (File)
Sep 17 2024, 5:51 AM
Subscribers

Details

Summary

Move all MD statements into $MACHINE_ARCH/Makefile.inc.
Unconditionally apply version script to rtld, it is not functional without it for long time.

Test Plan

So far a limited testing was done. Tinderbox is due, at least.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

This looks good, part from the one question I had.

libexec/rtld-elf/Makefile
84 ↗(On Diff #66481)

Is removing the non-symbol versioning support intentional?

libexec/rtld-elf/Makefile
44 ↗(On Diff #66481)

-nostdlib seems like it should be here not duplicated. I'd be tempted to make this:

LDFLAGS+=	-nostdlib -e ${RTLD_ENTRY}
...
.sinclude "${RTLD_ELF_DIR}/${RTLD_ARCH}/Makefile.inc"
RTLD_ENTRY?=.rtld_start

with an overriding in the powerpc file(s).

59 ↗(On Diff #66481)

Given that sparc64 is heading for the dumpster, I'd be tempted to add -fpic below and a CFLAGS:=${CFLAGS:S/-fpic/-fPIC} in sparc64/Makefile.inc.

kib marked 3 inline comments as done.

brooks' suggestions.

Looks good to me other than the minor issue on sparc64.

libexec/rtld-elf/sparc64/Makefile.inc
3 ↗(On Diff #66517)

I think there's a missing / at the end.

This revision is now accepted and ready to land.Jan 8 2020, 11:16 PM
This revision now requires review to proceed.Jan 9 2020, 6:12 AM
emaste added inline comments.
libexec/rtld-elf/arm/Makefile.inc
4–5 ↗(On Diff #66534)

this "placed first" comment seems confusing in that I don't see what's supposed to ensure that it's placed first. but it doesn't appear to be new in your change.

This revision is now accepted and ready to land.Jan 9 2020, 3:54 PM
This revision was automatically updated to reflect the committed changes.