[arm] Clean up unused ARMv7s / ARMv7k hwcap checks.

diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c
index 418c8ac90d4c0f78fb63919982b7bacda3e6d471..481c5870a7f7d81f01d2cff46d9345ca39358da9 100644 (file)
--- a/mono/mini/mini-arm.c
+++ b/mono/mini/mini-arm.c
@@ -970,8 +970,6 @@ mono_arch_init (void)
        v5_supported = mono_hwcap_arm_is_v5;
        v6_supported = mono_hwcap_arm_is_v6;
        v7_supported = mono_hwcap_arm_is_v7;
-       v7s_supported = mono_hwcap_arm_is_v7s;
-       v7k_supported = mono_hwcap_arm_is_v7k;
 
 #if defined(__APPLE__)
        /* iOS is special-cased here because we don't yet

diff --git a/mono/utils/mono-hwcap-arm.c b/mono/utils/mono-hwcap-arm.c
index fa10217839aa90a9a15b73115d127c3eeab6069f..2df530d824e4e7759288e2c089ab942e1cb681da 100644 (file)
--- a/mono/utils/mono-hwcap-arm.c
+++ b/mono/utils/mono-hwcap-arm.c
@@ -33,8 +33,6 @@
 gboolean mono_hwcap_arm_is_v5 = FALSE;
 gboolean mono_hwcap_arm_is_v6 = FALSE;
 gboolean mono_hwcap_arm_is_v7 = FALSE;
-gboolean mono_hwcap_arm_is_v7s = FALSE;
-gboolean mono_hwcap_arm_is_v7k = FALSE;
 gboolean mono_hwcap_arm_has_vfp = FALSE;
 gboolean mono_hwcap_arm_has_vfp3 = FALSE;
 gboolean mono_hwcap_arm_has_vfp3_d16 = FALSE;
@@ -162,8 +160,6 @@ mono_hwcap_print(FILE *f)
        g_fprintf (f, "mono_hwcap_arm_is_v5 = %i\n", mono_hwcap_arm_is_v5);
        g_fprintf (f, "mono_hwcap_arm_is_v6 = %i\n", mono_hwcap_arm_is_v6);
        g_fprintf (f, "mono_hwcap_arm_is_v7 = %i\n", mono_hwcap_arm_is_v7);
-       g_fprintf (f, "mono_hwcap_arm_is_v7s = %i\n", mono_hwcap_arm_is_v7s);
-       g_fprintf (f, "mono_hwcap_arm_is_v7k = %i\n", mono_hwcap_arm_is_v7k);
        g_fprintf (f, "mono_hwcap_arm_has_vfp = %i\n", mono_hwcap_arm_has_vfp);
        g_fprintf (f, "mono_hwcap_arm_has_vfp3 = %i\n", mono_hwcap_arm_has_vfp3);
        g_fprintf (f, "mono_hwcap_arm_has_vfp3_d16 = %i\n", mono_hwcap_arm_has_vfp3_d16);

diff --git a/mono/utils/mono-hwcap-arm.h b/mono/utils/mono-hwcap-arm.h
index a4e9f53bd774d6dd9d781c77be835dc40eba6941..29adf7bb799e1ba4b7ef7e38fc32bb4508a5510e 100644 (file)
--- a/mono/utils/mono-hwcap-arm.h
+++ b/mono/utils/mono-hwcap-arm.h
@@ -6,8 +6,6 @@
 extern gboolean mono_hwcap_arm_is_v5;
 extern gboolean mono_hwcap_arm_is_v6;
 extern gboolean mono_hwcap_arm_is_v7;
-extern gboolean mono_hwcap_arm_is_v7s;
-extern gboolean mono_hwcap_arm_is_v7k;
 extern gboolean mono_hwcap_arm_has_vfp;
 extern gboolean mono_hwcap_arm_has_vfp3;
 extern gboolean mono_hwcap_arm_has_vfp3_d16;