Allow bootstrapping elftoolchain on MacOS and Linux
ClosedPublic
Actions

Authored by arichardson on Aug 17 2018, 2:55 PM.

Details

Reviewers

emaste
jhb
brooks

Commits

rS349577: Allow bootstrapping elftoolchain on MacOS and Linux

Summary

This is required in order to build on non-FreeBSD systems without setting
all the XAR/XSTRINGS/etc. variables

Test Plan

Builds on Linux/Mac

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

arichardson created this revision.Aug 17 2018, 2:55 PM

Harbormaster completed remote builds in B18897: Diff 46841.Aug 17 2018, 2:55 PM

Generally looks fine to me.

lib/libelf/Makefile
84 ↗	(On Diff #46841)	Only style suggestion I have here is that a tab after the '+=' seems to be the style used in this file. I suspect Ed probably better understands if always using this on Linux is correct since he wrote the script, so I'll give him a chance to speak up before digging to understand why we only need this for Linux and not for other platforms.

Style fix

Harbormaster completed remote builds in B20567: Diff 49874.Nov 1 2018, 11:46 AM

emaste added subscribers: kaiw, jkoshy_users.sourceforge.net.Nov 1 2018, 5:15 PM

emaste added inline comments.

contrib/elftoolchain/common/_elftc.h
375–380 ↗	(On Diff #49874)	We will want to coordinate with upstream ELF Tool Chain for these - CC @kaiw and @jkoshy_users.sourceforge.net
lib/libelf/Makefile
84 ↗	(On Diff #46841)	For Apple, FreeBSD, etc. in _libelf_config.h we have a `#if defined(__amd64__)` ... `#elif defined(__aarch64__)` ... tree to #define `LIBELF_ARCH` and such. This is not done for Linux; I'm not sure why.

emaste added inline comments.Nov 1 2018, 5:32 PM

lib/libelf/Makefile
84 ↗	(On Diff #46841)	Actually, let's start fixing this in the in-tree FreeBSD headers and we can move this upstream after. There are only three variables that need to be set, and only three known architectures in native-elf-format so we should be able to use an `#if defined()` tree for Linux also with equivalent functionality.

jkoshy_users.sourceforge.net added inline comments.Nov 10 2018, 10:33 AM

lib/libelf/Makefile
81 ↗	(On Diff #49874)	Stock Elftoolchain sources should build out of the box on Linux though.

emaste added inline comments.Nov 10 2018, 1:20 PM

lib/libelf/Makefile
81 ↗	(On Diff #49874)	Indeed, but (as with all contrib software in FreeBSD) we have bespoke Makefiles and don't use the upstream build infrastructure. native-elf-format.h is only needed when building on Linux I believe, and other archs use `#ifdef (__x86_64__)` etc. I don't object to the change here but think it would be better to just avoid needing native-elf-format.h altogether.

jkoshy_users.sourceforge.net added inline comments.Nov 15 2018, 8:55 AM

lib/libelf/Makefile
81 ↗	(On Diff #49874)	I will look at moving to a #ifdef based scheme for Linux based hosts (elftoolchain ticket #563).

@arichardson I'm fine with this change in FreeBSD (if we end up with a different approach upstream we can just migrate to it on the next elftoolchain update).

This revision is now accepted and ready to land.Nov 23 2018, 1:56 AM

Closed by commit rS349577: Allow bootstrapping elftoolchain on MacOS and Linux (authored by arichardson). · Explain WhyJul 1 2019, 11:53 AM

This revision was automatically updated to reflect the committed changes.

arichardson added a commit: rS349577: Allow bootstrapping elftoolchain on MacOS and Linux.

Herald added a subscriber: imp. · View Herald TranscriptJul 1 2019, 11:53 AM

dim mentioned this in rS367466: Sync up elftoolchain with head, except for the capsicum-related commits,.Nov 7 2020, 11:58 PM