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

Fix build on ARM64EC #2858

Merged
merged 3 commits into from
Apr 19, 2024
Merged

Conversation

AgostonSzepessy
Copy link
Contributor

Fixes build break due to #pragma intrinsic( _umul128 ) on ARM64EC. This intrinsic only exists on x64. However, ARM64EC builds also define _M_X64 so the #pragma intrinsic needs to be excluded on those.

Copy link

codecov bot commented Apr 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.10%. Comparing base (53ddf37) to head (e561a0f).
Report is 1 commits behind head on devel.

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #2858      +/-   ##
==========================================
+ Coverage   91.09%   91.10%   +0.01%     
==========================================
  Files         197      197              
  Lines        8382     8382              
==========================================
+ Hits         7635     7636       +1     
+ Misses        747      746       -1     

@horenmar
Copy link
Member

I played around with the pragma a bit on compiler explorer, and I think that the best solution is to just remove it completely.

Agoston Szepessy added 2 commits April 18, 2024 13:51
This reverts commit 7a4f6d7.
Remove `#pragma intrinsic(_umul128)` because it doesn't work on
ARM64EC and x64 works without it.
@AgostonSzepessy
Copy link
Contributor Author

I removed the pragma bit.

@horenmar horenmar merged commit f232072 into catchorg:devel Apr 19, 2024
81 checks passed
@AgostonSzepessy AgostonSzepessy deleted the msvc-umul-arm64ec branch April 22, 2024 21:42
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.

None yet

2 participants