Skip to content

[CodeView] Add pragma push/pop_macro for ARM64_FPSR to enum header #101

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

Merged
merged 1 commit into from
Nov 2, 2019

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Nov 1, 2019

This fixes (one aspect of) compilation of LLDB with MSVC for ARM64.

LLDB source files include intrin.h, and the MSVC intrin.h transitively
includes arm64intr.h, which has an ARM64_FPSR define, which clashes
with the enum declaration.

Differential Revision: https://reviews.llvm.org/D67864

llvm-svn: 372481
(cherry picked from commit 1bfdab5)

This fixes (one aspect of) compilation of LLDB with MSVC for ARM64.

LLDB source files include intrin.h, and the MSVC intrin.h transitively
includes arm64intr.h, which has an ARM64_FPSR define, which clashes
with the enum declaration.

Differential Revision: https://reviews.llvm.org/D67864

llvm-svn: 372481
(cherry picked from commit 1bfdab5)
@compnerd
Copy link
Member Author

compnerd commented Nov 1, 2019

@compnerd
Copy link
Member Author

compnerd commented Nov 1, 2019

This is needed for the Windows ARM64 support

@compnerd
Copy link
Member Author

compnerd commented Nov 1, 2019

@swift-ci please smoke test

@shahmishal
Copy link
Member

@swift-ci please test

@hyp
Copy link

hyp commented Nov 1, 2019

@shahmishal

llvm-lit: /Users/buildnode/jenkins/workspace/apple-llvm-project-pr-macos/llvm-project/llvm/utils/lit/lit/LitConfig.py:109: fatal: Setting a timeout per test not supported. Requires the Python psutil module but it could not be found. Try installing it via pip or via your operating system's package manager.

@shahmishal
Copy link
Member

@shahmishal

llvm-lit: /Users/buildnode/jenkins/workspace/apple-llvm-project-pr-macos/llvm-project/llvm/utils/lit/lit/LitConfig.py:109: fatal: Setting a timeout per test not supported. Requires the Python psutil module but it could not be found. Try installing it via pip or via your operating system's package manager.

I will double check why this node does not have this package installed.

@shahmishal shahmishal merged commit 1183af5 into swiftlang:apple/stable/20190619 Nov 2, 2019
@compnerd compnerd deleted the r372481 branch November 2, 2019 21:41
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.

4 participants