# HG changeset patch
# User Bertrand Jacquin <bertrand@jacquin.bzh>
# Date 1444431941 -3600
# Node ID 5c6d2a6f2f9a0534933cc999b3845be4344e1af0
# Parent  b6156a08b1def3584647f26096866c1a0c11e54a
build: Disable -march selection from CMakeLists.txt

x32 arch as defined on https://sites.google.com/site/x32abi is neither
X86 nor X64, then forcing -march=i686 leads to build failure as wrong
-march is used.

Forcing -march, -mfloat-abi and -mfpu for ARM is also wrong

As a global sanity sake, disable all forced -march in CMakeLists

Backported from upstream pull request:
https://bitbucket.org/multicoreware/x265/pull-requests/21

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

diff -r 58dddcf01b7d source/CMakeLists.txt
--- a/source/CMakeLists.txt	Mon Jan 23 09:50:33 2017 +0530
+++ b/source/CMakeLists.txt	Mon Jan 23 21:03:10 2017 +0100
@@ -194,28 +194,6 @@
     if(NATIVE_BUILD)
         if(INTEL_CXX)
             add_definitions(-xhost)
-        else()
-            add_definitions(-march=native)
-        endif()
-    elseif(X86 AND NOT X64)
-        string(FIND "${CMAKE_CXX_FLAGS}" "-march" marchPos)
-        if(marchPos LESS "0")
-            add_definitions(-march=i686)
-            if(WIN32 AND NOT INTEL_CXX AND NOT CLANG AND
-               CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
-                add_definitions(-mpreferred-stack-boundary=2)
-            endif()
-        endif()
-    endif()
-    if(ARM AND CROSS_COMPILE_ARM)
-        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 -fPIC)
-            add_definitions(-DHAVE_NEON)
-        else()
-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
         endif()
     endif()
     add_definitions(${ARM_ARGS})