Revert "[android] add hardware specific workaround for Nexus9 in armv7 mode" (mono...

Revert "[android] add hardware specific workaround for Nexus9 in armv7 mode"

This reverts commit mono/mono@ee90fc601e762dc31eeb90fc61b6305246ad5275 (also see https://github.com/mono/mono/pull/4878 ).

The device was released November 2014.  I think it's fair to assume it isn't widely used anymore.

Commit migrated from https://github.com/mono/mono/commit/5eb67ac88a2b26f28091d4f4876720ba3dbd8674

diff --git a/src/mono/mono/mini/mini-generic-sharing.c b/src/mono/mono/mini/mini-generic-sharing.c
index f7b28a8..19b9dba 100644 (file)
--- a/src/mono/mono/mini/mini-generic-sharing.c
+++ b/src/mono/mono/mini/mini-generic-sharing.c
@@ -407,17 +407,7 @@ info_has_identity (MonoRgctxInfoType info_type)
 /*
  * LOCKING: loader lock
  */
-#if defined(HOST_ANDROID) && defined(TARGET_ARM)
-/* work around for HW bug on Nexus9 when running on armv7 */
-#ifdef __clang__
-static __attribute__ ((optnone)) void
-#else
-/* gcc */
-static __attribute__ ((optimize("O0"))) void
-#endif
-#else
 static void
-#endif
 rgctx_template_set_slot (MonoImage *image, MonoRuntimeGenericContextTemplate *template_, int type_argc,
        int slot, gpointer data, MonoRgctxInfoType info_type)
 {