--- source/CMakeLists.txt.orig  2015-04-28 21:43:18.585528552 +0200

+++ source/CMakeLists.txt   2015-04-28 21:47:14.995334232 +0200

@@ -50,10 +50,18 @@

         set(X64 1)

         add_definitions(-DX86_64=1)

     endif()

+elseif(${SYSPROC} MATCHES "armv5.*")

+    message(STATUS "Detected ARMV5 system processor")

+    set(ARMV5 1)

+    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=0 -DHAVE_NEON=0)

 elseif(${SYSPROC} STREQUAL "armv6l")

-    message(STATUS "Detected ARM target processor")

-    set(ARM 1)

-    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)

+    message(STATUS "Detected ARMV6 system processor")

+    set(ARMV6 1)

+    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

+elseif(${SYSPROC} STREQUAL "armv7l")

+    message(STATUS "Detected ARMV7 system processor")

+    set(ARMV7 1)

+    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1 -DHAVE_NEON=0)

 else()

     message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")

     message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")

@@ -155,8 +163,8 @@

     elseif(X86 AND NOT X64)

         add_definitions(-march=i686)

     endif()

-    if(ARM)

-        add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)

+    if(ARMV7)

+        add_definitions(-fPIC)

     endif()

     if(FPROFILE_GENERATE)

         if(INTEL_CXX)

--- source/common/cpu.cpp.orig  2015-04-28 21:47:44.634923269 +0200

+++ source/common/cpu.cpp   2015-04-28 21:49:50.305468867 +0200

@@ -37,7 +37,7 @@

 #include <machine/cpu.h>

 #endif

-#if X265_ARCH_ARM && !defined(HAVE_NEON)

+#if X265_ARCH_ARM && (!defined(HAVE_NEON) || HAVE_NEON==0)

 #include <signal.h>

 #include <setjmp.h>

 static sigjmp_buf jmpbuf;

@@ -340,7 +340,6 @@

     }

     canjump = 1;

-    x265_cpu_neon_test();

     canjump = 0;

     signal(SIGILL, oldsig);

 #endif // if !HAVE_NEON

@@ -356,7 +355,7 @@

     // which may result in incorrect detection and the counters stuck enabled.

     // right now Apple does not seem to support performance counters for this test

 #ifndef __MACH__

-    flags |= x265_cpu_fast_neon_mrc_test() ? X265_CPU_FAST_NEON_MRC : 0;

+    //flags |= x265_cpu_fast_neon_mrc_test() ? X265_CPU_FAST_NEON_MRC : 0;

 #endif

     // TODO: write dual issue test? currently it's A8 (dual issue) vs. A9 (fast mrc)

 #endif // if HAVE_ARMV6

​