From baa64155d31c9debf13ae1c6c96e3a6aa07b4238 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 12 May 2014 16:29:34 +0200 Subject: Revert "Revert "Revert "cpu-features: Support 32-bit ARM binaries running on an ARM64 kernel.""" There is something fishy in the kingdom of Denmark. Investigating... This reverts commit 4933fadc341c3452d4d2360e890697c37dcfeaa5. --- tests/device/test-cpufeatures/jni/test_cpufeatures.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'tests') diff --git a/tests/device/test-cpufeatures/jni/test_cpufeatures.c b/tests/device/test-cpufeatures/jni/test_cpufeatures.c index 861032a69..c5fe0c738 100644 --- a/tests/device/test-cpufeatures/jni/test_cpufeatures.c +++ b/tests/device/test-cpufeatures/jni/test_cpufeatures.c @@ -13,10 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#define __STDC_FORMAT_MACROS 1 - #include -#include #include int main(void) @@ -90,21 +87,7 @@ int main(void) #undef CHECK } - int result = 0; - - // Check that the CPU features mask is empty for anything that isn't - // 32-bit ARM or 32-bit x86. - if (family != ANDROID_CPU_FAMILY_ARM && - family != ANDROID_CPU_FAMILY_X86) { - uint64_t features = android_getCpuFeatures(); - if (features != 0) { - printf("ERROR: Unexpected CPU features mask: %016" PRIX64 "\n", - features); - result = 1; - } - } - int count = android_getCpuCount(); printf( "Number of CPU cores: %d\n", count); - return result; + return 0; } -- cgit v1.2.3