Skip to content

Commit 7d06d41

Browse files
gchateletgchatelet
authored
Merge pull request google#382 from google/add_armv7
[bazel] Add armv7 and use alias for cpus
2 parents 5cfee57 + 91c50b6 commit 7d06d41

File tree

1 file changed

+48
-36
lines changed

1 file changed

+48
-36
lines changed

‎BUILD.bazel‎

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@ C99_FLAGS = select({
2727
],
2828
})
2929

30+
PLATFORM_CPU_X86 = ("@platforms//cpu:x86_32", "@platforms//cpu:x86_64")
31+
32+
PLATFORM_CPU_ARM = ("@platforms//cpu:arm", "@platforms//cpu:armv7")
33+
34+
PLATFORM_CPU_ARM64 = "@platforms//cpu:arm64"
35+
36+
PLATFORM_CPU_MIPS = "@platforms//cpu:mips64"
37+
38+
PLATFORM_CPU_PPC = "@platforms//cpu:ppc"
39+
40+
PLATFORM_CPU_RISCV = ("@platforms//cpu:riscv32", "@platforms//cpu:riscv64")
41+
3042
cc_library(
3143
name = "cpu_features_macros",
3244
copts = C99_FLAGS,
@@ -218,38 +230,38 @@ cc_library(
218230
cc_library(
219231
name = "cpuinfo",
220232
srcs = selects.with_or({
221-
("@platforms//cpu:x86_32", "@platforms//cpu:x86_64"): [
233+
PLATFORM_CPU_X86: [
222234
"src/impl_x86_freebsd.c",
223235
"src/impl_x86_linux_or_android.c",
224236
"src/impl_x86_macos.c",
225237
"src/impl_x86_windows.c",
226238
],
227-
"@platforms//cpu:arm": ["src/impl_arm_linux_or_android.c"],
228-
"@platforms//cpu:arm64": [
239+
PLATFORM_CPU_ARM: ["src/impl_arm_linux_or_android.c"],
240+
PLATFORM_CPU_ARM64: [
229241
"src/impl_aarch64_cpuid.c",
230242
"src/impl_aarch64_linux_or_android.c",
231243
"src/impl_aarch64_macos_or_iphone.c",
232244
"src/impl_aarch64_windows.c",
233245
"src/impl_aarch64_freebsd_or_openbsd.c",
234246
],
235-
"@platforms//cpu:mips64": ["src/impl_mips_linux_or_android.c"],
236-
"@platforms//cpu:ppc": ["src/impl_ppc_linux.c"],
237-
("@platforms//cpu:riscv32", "@platforms//cpu:riscv64"): ["src/impl_riscv_linux.c"],
247+
PLATFORM_CPU_MIPS: ["src/impl_mips_linux_or_android.c"],
248+
PLATFORM_CPU_PPC: ["src/impl_ppc_linux.c"],
249+
PLATFORM_CPU_RISCV: ["src/impl_riscv_linux.c"],
238250
}),
239251
hdrs = selects.with_or({
240-
("@platforms//cpu:x86_32", "@platforms//cpu:x86_64"): [
252+
PLATFORM_CPU_X86: [
241253
"include/cpuinfo_x86.h",
242254
"include/internal/cpuid_x86.h",
243255
"include/internal/windows_utils.h",
244256
],
245-
"@platforms//cpu:arm": ["include/cpuinfo_arm.h"],
246-
"@platforms//cpu:arm64": [
257+
PLATFORM_CPU_ARM: ["include/cpuinfo_arm.h"],
258+
PLATFORM_CPU_ARM64: [
247259
"include/cpuinfo_aarch64.h",
248260
"include/internal/cpuid_aarch64.h",
249261
],
250-
"@platforms//cpu:mips64": ["include/cpuinfo_mips.h"],
251-
"@platforms//cpu:ppc": ["include/cpuinfo_ppc.h"],
252-
("@platforms//cpu:riscv32", "@platforms//cpu:riscv64"): ["include/cpuinfo_riscv.h"],
262+
PLATFORM_CPU_MIPS: ["include/cpuinfo_mips.h"],
263+
PLATFORM_CPU_PPC: ["include/cpuinfo_ppc.h"],
264+
PLATFORM_CPU_RISCV: ["include/cpuinfo_riscv.h"],
253265
}),
254266
copts = C99_FLAGS,
255267
defines = selects.with_or({
@@ -258,8 +270,8 @@ cc_library(
258270
}),
259271
includes = INCLUDES,
260272
textual_hdrs = selects.with_or({
261-
("@platforms//cpu:x86_32", "@platforms//cpu:x86_64"): ["src/impl_x86__base_implementation.inl"],
262-
"@platforms//cpu:arm64": ["src/impl_aarch64__base_implementation.inl"],
273+
PLATFORM_CPU_X86: ["src/impl_x86__base_implementation.inl"],
274+
PLATFORM_CPU_ARM64: ["src/impl_aarch64__base_implementation.inl"],
263275
"//conditions:default": [],
264276
}) + [
265277
"src/define_introspection.inl",
@@ -281,43 +293,43 @@ cc_library(
281293
name = "cpuinfo_for_testing",
282294
testonly = 1,
283295
srcs = selects.with_or({
284-
("@platforms//cpu:x86_32", "@platforms//cpu:x86_64"): [
296+
PLATFORM_CPU_X86: [
285297
"src/impl_x86_freebsd.c",
286298
"src/impl_x86_linux_or_android.c",
287299
"src/impl_x86_macos.c",
288300
"src/impl_x86_windows.c",
289301
],
290-
"@platforms//cpu:arm": ["src/impl_arm_linux_or_android.c"],
291-
"@platforms//cpu:arm64": [
302+
PLATFORM_CPU_ARM: ["src/impl_arm_linux_or_android.c"],
303+
PLATFORM_CPU_ARM64: [
292304
"src/impl_aarch64_cpuid.c",
293305
"src/impl_aarch64_linux_or_android.c",
294306
"src/impl_aarch64_macos_or_iphone.c",
295307
"src/impl_aarch64_windows.c",
296308
"src/impl_aarch64_freebsd_or_openbsd.c",
297309
],
298-
"@platforms//cpu:mips64": ["src/impl_mips_linux_or_android.c"],
299-
"@platforms//cpu:ppc": ["src/impl_ppc_linux.c"],
300-
("@platforms//cpu:riscv32", "@platforms//cpu:riscv64"): ["src/impl_riscv_linux.c"],
310+
PLATFORM_CPU_MIPS: ["src/impl_mips_linux_or_android.c"],
311+
PLATFORM_CPU_PPC: ["src/impl_ppc_linux.c"],
312+
PLATFORM_CPU_RISCV: ["src/impl_riscv_linux.c"],
301313
}),
302314
hdrs = selects.with_or({
303-
("@platforms//cpu:x86_32", "@platforms//cpu:x86_64"): [
315+
PLATFORM_CPU_X86: [
304316
"include/cpuinfo_x86.h",
305317
"include/internal/cpuid_x86.h",
306318
"include/internal/windows_utils.h",
307319
],
308-
"@platforms//cpu:arm": ["include/cpuinfo_arm.h"],
309-
"@platforms//cpu:arm64": [
320+
PLATFORM_CPU_ARM: ["include/cpuinfo_arm.h"],
321+
PLATFORM_CPU_ARM64: [
310322
"include/cpuinfo_aarch64.h",
311323
"include/internal/cpuid_aarch64.h",
312324
],
313-
"@platforms//cpu:mips64": ["include/cpuinfo_mips.h"],
314-
"@platforms//cpu:ppc": ["include/cpuinfo_ppc.h"],
315-
("@platforms//cpu:riscv32", "@platforms//cpu:riscv64"): ["include/cpuinfo_riscv.h"],
325+
PLATFORM_CPU_MIPS: ["include/cpuinfo_mips.h"],
326+
PLATFORM_CPU_PPC: ["include/cpuinfo_ppc.h"],
327+
PLATFORM_CPU_RISCV: ["include/cpuinfo_riscv.h"],
316328
}),
317329
copts = C99_FLAGS,
318330
defines = selects.with_or({
319-
("@platforms//cpu:x86_32", "@platforms//cpu:x86_64"): ["CPU_FEATURES_MOCK_CPUID_X86"],
320-
"@platforms//cpu:arm64": [
331+
PLATFORM_CPU_X86: ["CPU_FEATURES_MOCK_CPUID_X86"],
332+
PLATFORM_CPU_ARM64: [
321333
"CPU_FEATURES_MOCK_CPUID_AARCH64",
322334
"CPU_FEATURES_MOCK_SYSCTL_AARCH64",
323335
],
@@ -328,8 +340,8 @@ cc_library(
328340
}),
329341
includes = INCLUDES,
330342
textual_hdrs = selects.with_or({
331-
("@platforms//cpu:x86_32", "@platforms//cpu:x86_64"): ["src/impl_x86__base_implementation.inl"],
332-
"@platforms//cpu:arm64": ["src/impl_aarch64__base_implementation.inl"],
343+
PLATFORM_CPU_X86: ["src/impl_x86__base_implementation.inl"],
344+
PLATFORM_CPU_ARM64: ["src/impl_aarch64__base_implementation.inl"],
333345
"//conditions:default": [],
334346
}) + [
335347
"src/define_introspection.inl",
@@ -350,12 +362,12 @@ cc_library(
350362
cc_test(
351363
name = "cpuinfo_test",
352364
srcs = selects.with_or({
353-
"@platforms//cpu:arm64": ["test/cpuinfo_aarch64_test.cc"],
354-
"@platforms//cpu:arm": ["test/cpuinfo_arm_test.cc"],
355-
"@platforms//cpu:mips64": ["test/cpuinfo_mips_test.cc"],
356-
"@platforms//cpu:ppc": ["test/cpuinfo_ppc_test.cc"],
357-
("@platforms//cpu:riscv32", "@platforms//cpu:riscv64"): ["test/cpuinfo_riscv_test.cc"],
358-
("@platforms//cpu:x86_32", "@platforms//cpu:x86_64"): ["test/cpuinfo_x86_test.cc"],
365+
PLATFORM_CPU_ARM64: ["test/cpuinfo_aarch64_test.cc"],
366+
PLATFORM_CPU_ARM: ["test/cpuinfo_arm_test.cc"],
367+
PLATFORM_CPU_MIPS: ["test/cpuinfo_mips_test.cc"],
368+
PLATFORM_CPU_PPC: ["test/cpuinfo_ppc_test.cc"],
369+
PLATFORM_CPU_RISCV: ["test/cpuinfo_riscv_test.cc"],
370+
PLATFORM_CPU_X86: ["test/cpuinfo_x86_test.cc"],
359371
}),
360372
includes = INCLUDES,
361373
deps = [

0 commit comments

Comments
 (0)