Request 1037 (accepted)

Overview

Request 1037 (accepted)

Fix ARM build

Created by guillaume over 10 years ago
In state accepted

Submit x265

Submit package home:guillaume:branches:Essentials / x265 to package Essentials / x265

x265.changes Changed

x265.spec Changed

arm.patch Added

@@ -0,0 +1,65 @@
+diff -urN a/source/CMakeLists.txt b/source/CMakeLists.txt
+--- a/source/CMakeLists.txt	2014-04-03 00:00:44.000000000 -0600
++++ b/source/CMakeLists.txt	2014-04-10 07:32:36.022010974 -0600
+@@ -39,10 +39,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 system 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}")
+@@ -122,8 +130,8 @@
+     if(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()
+ endif(GCC)
+ 
+diff -urN a/source/common/cpu.cpp b/source/common/cpu.cpp
+--- a/source/common/cpu.cpp	2014-04-03 00:00:44.000000000 -0600
++++ b/source/common/cpu.cpp	2014-04-10 07:28:51.937129997 -0600
+@@ -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

Build Results
RPM Lint

Refresh

Comments for request 1037 0

Request History

guillaume created request over 10 years ago

Fix ARM build

jsjhb accepted request over 10 years ago