Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass -latomic for architectures that need it #372

Merged
merged 1 commit into from
Jun 29, 2020
Merged

Conversation

legoktm
Copy link
Member

@legoktm legoktm commented Jun 29, 2020

Some architectures, specifically armel, mipsel, m68k & powerpc in
Debian, need to explicitly link to atomic.

Use meson to see if the target's CPU family is one of those, and if so,
pass -latomic to the linker.

Tested on armel and mipsel machines to verify passing -latomic works, and
on armhf and amd64 to ensure normal builds aren't broken.

Fixes #371.

Some architectures, specifically armel, mipsel, m68k & powerpc in
Debian, need to explicitly link to atomic.

Use meson to see if the target's CPU family is one of those, and if so,
pass -latomic to the linker.

Tested on armel and mipsel machines to verify passing -latomic works, and
on armhf and amd64 to ensure normal builds aren't broken.

Fixes #371.
@codecov
Copy link

codecov bot commented Jun 29, 2020

Codecov Report

Merging #372 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #372      +/-   ##
==========================================
- Coverage   57.41%   57.38%   -0.03%     
==========================================
  Files          48       48              
  Lines        3614     3614              
  Branches     1815     1809       -6     
==========================================
- Hits         2075     2074       -1     
- Misses       1536     1537       +1     
  Partials        3        3              
Impacted Files Coverage Δ
src/tools/stringTools.cpp 60.78% <0.00%> (-0.50%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c986290...fb79cde. Read the comment docs.

@mgautierfr mgautierfr merged commit 7146269 into master Jun 29, 2020
@mgautierfr mgautierfr deleted the link-atomic branch June 29, 2020 12:43
@mgautierfr
Copy link
Member

Nothing to say :)

legoktm added a commit that referenced this pull request Jul 15, 2020
Same as #372.

I originally missed this because meson didn't know about sh4 until
recently (c.f. mesonbuild/meson#7359), but
this should work fine on older meson versions too.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing link to atomic on some architectures
2 participants