Skip to content

Commit 3fb046c

Browse files
committed
Fix MSVC ARM64 build
1 parent 4592486 commit 3fb046c

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

cpp/src/arrow/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ set(ARROW_UTIL_SRCS
491491
util/bitmap_ops.cc
492492
util/bpacking.cc
493493
util/bpacking_scalar.cc
494-
util/bpacking_simd_default.cc
495494
util/byte_size.cc
496495
util/byte_stream_split_internal.cc
497496
util/cancel.cc
@@ -537,6 +536,9 @@ append_runtime_avx2_src(ARROW_UTIL_SRCS util/byte_stream_split_internal_avx2.cc)
537536

538537
append_runtime_avx2_src(ARROW_UTIL_SRCS util/bpacking_simd_avx2.cc)
539538
append_runtime_avx512_src(ARROW_UTIL_SRCS util/bpacking_simd_avx512.cc)
539+
if(ARROW_HAVE_NEON)
540+
list(APPEND ARROW_UTIL_SRCS util/bpacking_simd_neon.cc)
541+
endif()
540542

541543
if(ARROW_WITH_BROTLI)
542544
list(APPEND ARROW_UTIL_SRCS util/compression_brotli.cc)

cpp/src/arrow/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ arrow_util_srcs = [
176176
'util/bitmap_ops.cc',
177177
'util/bpacking.cc',
178178
'util/bpacking_scalar.cc',
179-
'util/bpacking_simd_default.cc',
180179
'util/byte_size.cc',
181180
'util/byte_stream_split_internal.cc',
182181
'util/cancel.cc',

cpp/src/arrow/util/bpacking_simd_default.cc renamed to cpp/src/arrow/util/bpacking_simd_neon.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
namespace arrow::internal {
2323

24-
#if defined(ARROW_HAVE_NEON)
25-
2624
template <typename Uint>
2725
int unpack_neon(const uint8_t* in, Uint* out, int batch_size, int num_bits) {
2826
return unpack_jump<Simd128UnpackerForWidth>(in, out, batch_size, num_bits);
@@ -34,6 +32,4 @@ template int unpack_neon<uint16_t>(const uint8_t*, uint16_t*, int, int);
3432
template int unpack_neon<uint32_t>(const uint8_t*, uint32_t*, int, int);
3533
template int unpack_neon<uint64_t>(const uint8_t*, uint64_t*, int, int);
3634

37-
#endif
38-
3935
} // namespace arrow::internal

0 commit comments

Comments
 (0)