aboutsummaryrefslogtreecommitdiff
path: root/BUILD.bazel
diff options
context:
space:
mode:
authorCole Faust <colefaust@google.com>2022-08-22 14:32:19 -0700
committerCole Faust <colefaust@google.com>2022-08-25 18:00:42 -0700
commit39fe7d81bb9e1d7e43886bc7905393acc1147f65 (patch)
treecc5887730cffb831faaccc6119bc089dae34df16 /BUILD.bazel
parentbf66969572c8462b88e6a1f34b339ffc60380c35 (diff)
downloadlinux-x86-39fe7d81bb9e1d7e43886bc7905393acc1147f65.tar.gz
Add instruction set features
To enable/disable certain flags based on the desired instruction set. Bug: 215719349 Test: Manually Change-Id: I2fdba85e94561fb05ad105d55066b4e9e2735c81
Diffstat (limited to 'BUILD.bazel')
-rw-r--r--BUILD.bazel8
1 files changed, 5 insertions, 3 deletions
diff --git a/BUILD.bazel b/BUILD.bazel
index 6c7e57851..e711dd0e2 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -22,9 +22,9 @@ load(
"arch_to_variants",
"arches",
"arm_extra_ldflags",
- "enabled_features",
"device_compatibility_flags_non_darwin",
"device_compatibility_flags_non_windows",
+ "enabled_features",
"generated_constants",
"variant_constraints",
"variant_name",
@@ -112,7 +112,8 @@ _LIBCLANG_RT_PREBUILT_MAP = {
[],
) + generated_constants.Arm64Lldflags,
target_arch = arches.Arm64,
- target_flags = generated_constants.Arm64ArchVariantCflags[variant.arch_variant] +
+ target_flags = generated_constants.Arm64Cflags +
+ generated_constants.Arm64ArchVariantCflags[variant.arch_variant] +
generated_constants.Arm64CpuVariantCflags.get(
variant.cpu_variant,
[],
@@ -132,7 +133,8 @@ _LIBCLANG_RT_PREBUILT_MAP = {
libclang_rt_builtin = _LIBCLANG_RT_PREBUILT_MAP["//build/bazel/platforms/os_arch:android_arm"],
linker_flags = generated_constants.ArmLldflags + arm_extra_ldflags(variant),
target_arch = arches.Arm,
- target_flags = generated_constants.ArmToolchainCflags +
+ target_flags = generated_constants.ArmCflags +
+ generated_constants.ArmToolchainCflags +
generated_constants.ArmArchVariantCflags[variant.arch_variant] +
generated_constants.ArmCpuVariantCflags.get(
variant.cpu_variant,