Remove armv7k watchOS support (#580)
This was removed from Xcode around Xcode 12 it looks like
diff --git a/configs/platforms.bzl b/configs/platforms.bzl
index 5232629..53b7a79 100644
--- a/configs/platforms.bzl
+++ b/configs/platforms.bzl
@@ -81,11 +81,6 @@
"@platforms//cpu:arm64_32",
"@build_bazel_apple_support//constraints:device",
],
- "watchos_armv7k": [
- "@platforms//os:watchos",
- "@platforms//cpu:armv7k",
- "@build_bazel_apple_support//constraints:device",
- ],
"watchos_x86_64": [
"@platforms//os:watchos",
"@platforms//cpu:x86_64",
@@ -108,7 +103,6 @@
"visionos_sim_arm64": "visionos_sim_arm64",
"watchos_arm64": "watchos_arm64",
"watchos_arm64_32": "watchos_arm64_32",
- "watchos_armv7k": "watchos_armv7k",
"watchos_device_arm64": "watchos_device_arm64",
"watchos_device_arm64e": "watchos_device_arm64e",
"watchos_x86_64": "watchos_x86_64",
diff --git a/crosstool/cc_toolchain_config.bzl b/crosstool/cc_toolchain_config.bzl
index 1cce1b5..51d7622 100644
--- a/crosstool/cc_toolchain_config.bzl
+++ b/crosstool/cc_toolchain_config.bzl
@@ -119,8 +119,6 @@
target_system_name = "arm64_32-apple-watchos{}".format(target_os_version)
elif (ctx.attr.cpu == "ios_arm64e"):
target_system_name = "arm64e-apple-ios{}".format(target_os_version)
- elif (ctx.attr.cpu == "watchos_armv7k"):
- target_system_name = "armv7k-apple-watchos{}".format(target_os_version)
elif (ctx.attr.cpu == "ios_x86_64"):
target_system_name = "x86_64-apple-ios{}-simulator".format(target_os_version)
is_simulator = True
@@ -509,7 +507,6 @@
ctx.attr.cpu == "watchos_arm64_32" or
ctx.attr.cpu == "watchos_device_arm64" or
ctx.attr.cpu == "watchos_device_arm64e" or
- ctx.attr.cpu == "watchos_armv7k" or
ctx.attr.cpu == "watchos_x86_64" or
ctx.attr.cpu == "watchos_arm64"):
apply_default_compiler_flags_feature = feature(
@@ -1206,7 +1203,6 @@
ctx.attr.cpu == "watchos_arm64_32" or
ctx.attr.cpu == "watchos_device_arm64" or
ctx.attr.cpu == "watchos_device_arm64e" or
- ctx.attr.cpu == "watchos_armv7k" or
ctx.attr.cpu == "watchos_x86_64" or
ctx.attr.cpu == "watchos_arm64"):
apply_implicit_frameworks_feature = feature(
diff --git a/lib/apple_support.bzl b/lib/apple_support.bzl
index f1fa0bd..e430705 100644
--- a/lib/apple_support.bzl
+++ b/lib/apple_support.bzl
@@ -273,9 +273,6 @@
"_arm64_32_constraint": attr.label(
default = Label("@platforms//cpu:arm64_32"),
),
- "_armv7k_constraint": attr.label(
- default = Label("@platforms//cpu:armv7k"),
- ),
"_x86_64_constraint": attr.label(
default = Label("@platforms//cpu:x86_64"),
),
@@ -478,7 +475,6 @@
arm64_constraint = ctx.attr._arm64_constraint[platform_common.ConstraintValueInfo]
arm64e_constraint = ctx.attr._arm64e_constraint[platform_common.ConstraintValueInfo]
arm64_32_constraint = ctx.attr._arm64_32_constraint[platform_common.ConstraintValueInfo]
- armv7k_constraint = ctx.attr._armv7k_constraint[platform_common.ConstraintValueInfo]
x86_64_constraint = ctx.attr._x86_64_constraint[platform_common.ConstraintValueInfo]
if ctx.target_platform_has_constraint(arm64_constraint):
@@ -487,8 +483,6 @@
return "arm64e"
elif ctx.target_platform_has_constraint(arm64_32_constraint):
return "arm64_32"
- elif ctx.target_platform_has_constraint(armv7k_constraint):
- return "armv7k"
elif ctx.target_platform_has_constraint(x86_64_constraint):
return "x86_64"
if not fail_on_missing_constraint:
diff --git a/test/cc_toolchain_forwarder.bzl b/test/cc_toolchain_forwarder.bzl
index 218afca..461f576 100644
--- a/test/cc_toolchain_forwarder.bzl
+++ b/test/cc_toolchain_forwarder.bzl
@@ -69,7 +69,6 @@
arm64_constraint = ctx.attr._arm64_constraint[platform_common.ConstraintValueInfo]
arm64e_constraint = ctx.attr._arm64e_constraint[platform_common.ConstraintValueInfo]
arm64_32_constraint = ctx.attr._arm64_32_constraint[platform_common.ConstraintValueInfo]
- armv7k_constraint = ctx.attr._armv7k_constraint[platform_common.ConstraintValueInfo]
x86_64_constraint = ctx.attr._x86_64_constraint[platform_common.ConstraintValueInfo]
if ctx.target_platform_has_constraint(arm64_constraint):
@@ -78,8 +77,6 @@
return "arm64e"
elif ctx.target_platform_has_constraint(arm64_32_constraint):
return "arm64_32"
- elif ctx.target_platform_has_constraint(armv7k_constraint):
- return "armv7k"
elif ctx.target_platform_has_constraint(x86_64_constraint):
return "x86_64"
fail("ERROR: A valid Apple cpu constraint could not be found from the resolved toolchain.")
@@ -135,9 +132,6 @@
"_arm64_32_constraint": attr.label(
default = Label("@platforms//cpu:arm64_32"),
),
- "_armv7k_constraint": attr.label(
- default = Label("@platforms//cpu:armv7k"),
- ),
"_x86_64_constraint": attr.label(
default = Label("@platforms//cpu:x86_64"),
),
diff --git a/test/rules/apple_verification_test.bzl b/test/rules/apple_verification_test.bzl
index 62f9b70..87390af 100644
--- a/test/rules/apple_verification_test.bzl
+++ b/test/rules/apple_verification_test.bzl
@@ -37,7 +37,7 @@
"//command_line_option:ios_multi_cpus": "arm64",
"//command_line_option:tvos_cpus": "arm64",
"//command_line_option:visionos_cpus": "arm64",
- "//command_line_option:watchos_cpus": "arm64_32,armv7k",
+ "//command_line_option:watchos_cpus": "arm64_32",
})
if hasattr(attr, "cpus"):
diff --git a/test/shell/verify_object_hashes.sh b/test/shell/verify_object_hashes.sh
index f8957ed..915ea50 100755
--- a/test/shell/verify_object_hashes.sh
+++ b/test/shell/verify_object_hashes.sh
@@ -6,17 +6,17 @@
output=$(ar t "$binary")
# NOTE: The first character of the transition hash is enough to verify they're unique
-if ! echo "$output" | grep -q "duplicate_f.*.o"; then
+if ! echo "$output" | grep -q "duplicate_9.*.o"; then
echo "error: missing expected object 1: $output" >&2
exit 1
fi
-if ! echo "$output" | grep -q "duplicate_3.*.o"; then
+if ! echo "$output" | grep -q "duplicate_a.*.o"; then
echo "error: missing expected object 2: $output" >&2
exit 1
fi
-if ! echo "$output" | grep -q "cc_lib_c.*.o"; then
+if ! echo "$output" | grep -q "cc_lib_6.*.o"; then
echo "error: missing expected object 3: $output" >&2
exit 1
fi
