Skip to content

Commit 07da480

Browse files
authored
[win][arm64ec] More fixes for building and testing Arm64EC Windows (#151409)
* `tools/llvm-objcopy/MachO/update-section-object.test` was failing on Windows since the input file (`macho_sections.s`) might be checked out with the wrong line ending, resulting in difference in the size of sections being checked. * Removed the check for Windows in `AArch64Arm64ECCallLowering`: when `llc` is run without an explicit target, the module's target triple is unknown so this assert fires. * Expect `llvm/test/CodeGen/Generic/allow-check.ll` to fail for Arm64EC: Global ISel is not supported.
1 parent 81ed756 commit 07da480

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

llvm/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ test/tools/split-file/basic.test text eol=lf
3232
test/tools/split-file/Inputs/basic-*.txt eol=lf
3333
test/tools/split-file/basic.crlf.test text eol=crlf
3434
test/tools/split-file/Inputs/basic-*.crlf eol=crlf
35+
test/tools/llvm-objcopy/MachO/Inputs/macho_sections.s text eol=lf

llvm/lib/Target/AArch64/AArch64Arm64ECCallLowering.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -735,9 +735,6 @@ AArch64Arm64ECCallLowering::buildPatchableThunk(GlobalAlias *UnmangledAlias,
735735

736736
// Lower an indirect call with inline code.
737737
void AArch64Arm64ECCallLowering::lowerCall(CallBase *CB) {
738-
assert(CB->getModule()->getTargetTriple().isOSWindows() &&
739-
"Only applicable for Windows targets");
740-
741738
IRBuilder<> B(CB);
742739
Value *CalledOperand = CB->getCalledOperand();
743740

llvm/test/CodeGen/Generic/allow-check.ll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
; XFAIL: target=nvptx{{.*}}
77
; XFAIL: target=sparc{{.*}}
88
; XFAIL: target=hexagon-{{.*}}
9+
; XFAIL: target=arm64ec-{{.*}}
910

1011
; RUN: llc < %s -O3 -global-isel=0 -fast-isel=0
1112
; RUN: llc < %s -O3 -global-isel=1 -fast-isel=0

0 commit comments

Comments
 (0)