Fix x64 crossbuild on macOS arm64 #91413
Conversation
|
Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas Issue DetailsThe cross build is failing due to the cpufeatures.c being compiled in. This file tries to extract cpu features using cpuid / getauxval that don't make sense to execute in the cross tools. This change disables compiling the cpufeatures.c for cross build and changes the
|
|
jitinterface should not have any target specific code. Why are we cross-compiling it with TARGET != HOST in the first place? |
It compiles that when building libjitinterface_arm64.dylib during cross components build. |
|
Isn't the problem more that cpufeatures.h/.c uses ILC/crossgen2 (that use this) are both crosscompilers. They already know not to call into this logic when TARGET != HOST. I would expect x64 version of crossgen2 that we built on arm64 to be able to detect CPU features on x64. |
The host doesn't help here. That was actually my first thought too. Extracting the features when TARGET != HOST doesn't seem to make sense. Say we have JIT targeting arm64 running on x64. Extracting x64 features is useless for the JIT isn't it? And vice versa. |
ILC/crossgen is a crosscompiler and what we're building is still a crosscompiler - one can just pass |
|
This is different for the clrjit itself. clrjit build is parametrized by both the host architecture and the target architecture. |
The cross build is failing due to the cpufeatures.c being compiled in. This file tries to extract cpu features using cpuid / getauxval that don't make sense to execute in the cross tools. This change disables compiling the cpufeatures.c for cross build and changes the `JitGetProcessorFeatures` to return zero in this case.
|
Conflicts... |
janvorli
force-pushed
the
fix-macos-crossbuild
branch
from
f94a2ae
to
d3c300e
Compare
|
Resolved |
|
Backport candidate? |
|
/backport to release/8.0 |
|
Started backporting to release/8.0: https://github.com/dotnet/runtime/actions/runs/6051186149 |
|
@janvorli backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix x64 crossbuild on macOS arm64
Applying: Reflect PR feedback
Using index info to reconstruct a base tree...
M src/native/minipal/cpufeatures.c
M src/native/minipal/cpufeatures.h
Falling back to patching base and 3-way merge...
Auto-merging src/native/minipal/cpufeatures.h
Auto-merging src/native/minipal/cpufeatures.c
CONFLICT (content): Merge conflict in src/native/minipal/cpufeatures.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Reflect PR feedback
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@janvorli an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
ghost
locked as resolved and limited conversation to collaborators
The cross build is failing due to the cpufeatures.c being compiled in. This file tries to extract cpu features using cpuid / getauxval that don't make sense to execute in the cross tools.
This change disables compiling the cpufeatures.c for cross build and changes the
JitGetProcessorFeaturesto return zero in this case.