hexagon: Make fma label local to avoid symbol collision#1066
hexagon: Make fma label local to avoid symbol collision#1066tgross35 merged 1 commit intorust-lang:mainfrom
fma label local to avoid symbol collision#1066Conversation
tgross35
left a comment
tgross35
left a comment
There was a problem hiding this comment.
I've run into this with build-std on the target before and meant to ask but never actually did. Thanks!
I feel like I probably encountered it and was so convinced of my prowess w/ the original fix I just told myself "hmm - some echoes of that old bug. it'll come out when the crate gets updated ... " |
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
The `fma:` label in dffma.s was being exported as a global symbol causing a "symbol 'fma' is already defined" error when linking with libm's `fma` function. Unfortunately rust-lang#682 removed `.global fma` but didn't address the implicit global export of the label itself. --- old.txt 2026-01-30 20:31:37.265844316 -0600 +++ new.txt 2026-01-30 20:31:46.531950264 -0600 @@ -1,4 +1,3 @@ -00000000 t fma 00000000 T __hexagon_fmadf4 00000000 T __hexagon_fmadf5 00000000 T __qdsp_fmadf5
|
(pushed with a change to canonicalize the issue number in the commit message, since triagebot will yell about that soon #1065) |
|
@tgross35 how do I propagate this fix to mitigate the CI issue we see in stdarch? c-b needs to be updated in rust-src? Is that something I can do or something I request from some project role? |
|
I have a sync in progress (unfortunately they can be a bit tricky), will try to wrap it up today |
Oh thanks so much. No hurry on my account, just wanted to know if I could shepherd it through. Good to hear you're on it. |
|
That took longer than expected but this was synced back in rust-lang/rust#152420 |
compiler-builtins has been fixed such that this is no longer needed. This reverts commit 5a9e1db. Link: rust-lang/compiler-builtins#1066
compiler-builtins has been fixed such that this is no longer needed. This reverts commit 5a9e1db. Link: rust-lang/compiler-builtins#1066
compiler-builtins has been fixed such that this is no longer needed. This reverts commit 5a9e1db. Link: rust-lang/compiler-builtins#1066
compiler-builtins has been fixed such that this is no longer needed. This reverts commit 5a9e1db. Link: rust-lang/compiler-builtins#1066 (backport <rust-lang#4971>) (cherry picked from commit e79f46e)
compiler-builtins has been fixed such that this is no longer needed. This reverts commit 5a9e1db. Link: rust-lang/compiler-builtins#1066 (backport <#4971>) (cherry picked from commit e79f46e)
3 participants
The
fma:label in dffma.s was being exported as a global symbol causing a "symbol 'fma' is already defined" error when linking with libm'sfmafunction.Unfortunately #682 removed
.global fmabut didn't address the implicit global export of the label itself.