libthr: filter rather than link with libsys
ClosedPublic
Actions

Authored by brooks on Feb 7 2024, 3:48 PM.

Details

Reviewers

kib
jrtc27

Commits

rG49d684369c66: libthr: filter rather than link with libsys

Summary

The allows gcc + GNU ld to link programs with -m32 -pthread without
erroring out due to _umtx_op_err being undefined (unless -lsys is added
to the link command.

We now always link _umtx_op_err into libthr (not just when it's static)
and filter it with libsys so we call that implementation. The dynamic
implementations (at least the assembly ones) should likely become stubs
as a further refinement.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

brooks created this revision.Feb 7 2024, 3:48 PM

Herald added a subscriber: imp. · View Herald TranscriptFeb 7 2024, 3:48 PM

brooks requested review of this revision.Feb 7 2024, 3:48 PM

Harbormaster completed remote builds in B55847: Diff 133968.Feb 7 2024, 3:48 PM

brooks added a parent revision: D43782: rescue: Don't explicitly link with libsys.Feb 7 2024, 3:48 PM

This fixes devel/gcc* with MULTILIBS enabled. If it turns out to be a binutils bug we might eventually be able to revert (assuming that's desirable), but it's its gcc we can't patch every version so we need this.

I've verified I can build gcc12 amd64 and R-cran-xml2 (since that exercises threading). libthr tests also pass.

It is not clear to me why the symbol is not resolved (or rather, why -lsys needs to be explicitly specified). But ok for now.

This revision is now accepted and ready to land.Feb 7 2024, 4:23 PM

Closed by commit rG49d684369c66: libthr: filter rather than link with libsys (authored by brooks). · Explain WhyFeb 7 2024, 7:51 PM

This revision was automatically updated to reflect the committed changes.

brooks added a commit: rG49d684369c66: libthr: filter rather than link with libsys.