diff options
| author | Guillaume Chatelet <gchatelet@google.com> | 2023-08-28 13:14:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-28 15:14:27 +0200 |
| commit | f8e3af98439803e03fe124f6d177481700633e59 (patch) | |
| tree | 29a9c7f99ba3d2ef30f59849fa9555883cebd8c6 | |
| parent | c5ece5e8ccd64f0da935fceb14f9ab8a3e2eefa0 (diff) | |
| download | cpu_features-f8e3af98439803e03fe124f6d177481700633e59.tar.gz | |
Fix bazel for aarch64 (#320)
* Remove unused function
* Fix bazel build for aarch64
| -rw-r--r-- | BUILD.bazel | 22 | ||||
| -rw-r--r-- | test/cpuinfo_aarch64_test.cc | 2 |
2 files changed, 18 insertions, 6 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index e232261..cadf0d6 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -213,7 +213,11 @@ cc_library( "src/impl_x86_windows.c", ], PLATFORM_CPU_ARM: ["src/impl_arm_linux_or_android.c"], - PLATFORM_CPU_ARM64: ["src/impl_aarch64_linux_or_android.c"], + PLATFORM_CPU_ARM64: [ + "src/impl_aarch64_linux_or_android.c", + "src/impl_aarch64_macos_or_iphone.c", + "src/impl_aarch64_windows.c", + ], PLATFORM_CPU_MIPS: ["src/impl_mips_linux_or_android.c"], PLATFORM_CPU_PPC: ["src/impl_ppc_linux.c"], PLATFORM_CPU_RISCV32: ["src/impl_riscv_linux.c"], @@ -229,7 +233,10 @@ cc_library( "include/internal/windows_utils.h", ], PLATFORM_CPU_ARM: ["include/cpuinfo_arm.h"], - PLATFORM_CPU_ARM64: ["include/cpuinfo_aarch64.h"], + PLATFORM_CPU_ARM64: [ + "src/impl_aarch64__base_implementation.inl", + "include/cpuinfo_aarch64.h", + ], PLATFORM_CPU_MIPS: ["include/cpuinfo_mips.h"], PLATFORM_CPU_PPC: ["include/cpuinfo_ppc.h"], PLATFORM_CPU_RISCV32: ["include/cpuinfo_riscv.h"], @@ -261,7 +268,11 @@ cc_library( "src/impl_x86_windows.c", ], PLATFORM_CPU_ARM: ["src/impl_arm_linux_or_android.c"], - PLATFORM_CPU_ARM64: ["src/impl_aarch64_linux_or_android.c"], + PLATFORM_CPU_ARM64: [ + "src/impl_aarch64_linux_or_android.c", + "src/impl_aarch64_macos_or_iphone.c", + "src/impl_aarch64_windows.c", + ], PLATFORM_CPU_MIPS: ["src/impl_mips_linux_or_android.c"], PLATFORM_CPU_PPC: ["src/impl_ppc_linux.c"], PLATFORM_CPU_RISCV32: ["src/impl_riscv_linux.c"], @@ -274,7 +285,10 @@ cc_library( "include/internal/windows_utils.h", ], PLATFORM_CPU_ARM: ["include/cpuinfo_arm.h"], - PLATFORM_CPU_ARM64: ["include/cpuinfo_aarch64.h"], + PLATFORM_CPU_ARM64: [ + "src/impl_aarch64__base_implementation.inl", + "include/cpuinfo_aarch64.h", + ], PLATFORM_CPU_MIPS: ["include/cpuinfo_mips.h"], PLATFORM_CPU_PPC: ["include/cpuinfo_ppc.h"], PLATFORM_CPU_RISCV32: ["include/cpuinfo_riscv.h"], diff --git a/test/cpuinfo_aarch64_test.cc b/test/cpuinfo_aarch64_test.cc index 1305381..6aefa6b 100644 --- a/test/cpuinfo_aarch64_test.cc +++ b/test/cpuinfo_aarch64_test.cc @@ -129,8 +129,6 @@ TEST_F(CpuidAarch64Test, Aarch64FeaturesEnum) { // OS dependent tests #if defined(CPU_FEATURES_OS_LINUX) -void DisableHardwareCapabilities() { SetHardwareCapabilities(0, 0); } - TEST_F(CpuidAarch64Test, FromHardwareCap) { ResetHwcaps(); SetHardwareCapabilities(AARCH64_HWCAP_FP | AARCH64_HWCAP_AES, 0); |