[x265] [PATCH] arm: Fix build.Does not fix output change caused by <a5362b9>

[ramya at multicorewareinc.com]

# HG changeset patch
# User Ramya Sriraman
# Date 1467270238 -19800
#      Thu Jun 30 12:33:58 2016 +0530
# Node ID d85b7f78d34f6ded86dc1e1d9e35e341eb321899
# Parent  626fcbac7ffba723dabd3a9f0507c4c80f3e7bc9
arm: Fix build.Does not fix output change caused by <a5362b9>

diff -r 626fcbac7ffb -r d85b7f78d34f source/CMakeLists.txt
--- a/source/CMakeLists.txt	Thu Jun 16 12:57:38 2016 +0530
+++ b/source/CMakeLists.txt	Thu Jun 30 12:33:58 2016 +0530
@@ -187,11 +187,11 @@
         endif()
     endif()
     if(ARM AND CROSS_COMPILE_ARM)
-        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm)
+        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
     elseif(ARM)
         find_package(Neon)
         if(CPU_HAS_NEON)
-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm)
+            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
             add_definitions(-DHAVE_NEON)
         else()
             set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
diff -r 626fcbac7ffb -r d85b7f78d34f source/common/primitives.cpp
--- a/source/common/primitives.cpp	Thu Jun 16 12:57:38 2016 +0530
+++ b/source/common/primitives.cpp	Thu Jun 30 12:33:58 2016 +0530
@@ -261,7 +261,7 @@
 void PFX(cpu_cpuid)(uint32_t, uint32_t *eax, uint32_t *, uint32_t *, uint32_t *) { *eax = 0; }
 void PFX(cpu_xgetbv)(uint32_t, uint32_t *, uint32_t *) {}
 
-#if X265_ARCH_ARM
+#if X265_ARCH_ARM == 0
 void PFX(cpu_neon_test)(void) {}
 int PFX(cpu_fast_neon_mrc_test)(void) { return 0; }
 #endif // X265_ARCH_ARM