View | Details | Raw Unified | Return to bug 186395
Collapse All | Expand All

(-)freerdp/files/patch-config.h.in (+10 lines)
Line 0 Link Here
1 
--- config.h.in.orig	2014-01-30 10:24:02.141682858 +0000
2 
+++ config.h.in	2014-01-30 10:24:22.330677704 +0000
3 
@@ -36,7 +36,6 @@
4 
 /* Options */
5 
 #cmakedefine WITH_PROFILER
6 
 #cmakedefine WITH_SSE2
7 
-#cmakedefine WITH_NEON
8 
 #cmakedefine WITH_IPP
9 
 #cmakedefine WITH_NATIVE_SSPI
10 
 #cmakedefine WITH_JPEG
(-)freerdp/files/patch-noneon (+48 lines)
Line 0 Link Here
1 
diff -ruN ../FreeRDP-FreeRDP-780d451.orig/cmake/AndroidToolchain.cmake ./cmake/AndroidToolchain.cmake
2 
--- ../FreeRDP-FreeRDP-780d451.orig/cmake/AndroidToolchain.cmake	2013-07-10 09:00:21.000000000 +0100
3 
+++ ./cmake/AndroidToolchain.cmake	2014-01-30 11:12:22.989675950 +0000
4 
@@ -1196,7 +1196,7 @@
5 
 if( ARMEABI_V7A )
6 
  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a -mfloat-abi=softfp" )
7 
  if( NEON )
8 
-  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=neon" )
9 
+  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS}" )
10 
  elseif( VFPV3 )
11 
   set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3" )
12 
  else()
13 
diff -ruN ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/codec/CMakeLists.txt ./libfreerdp/codec/CMakeLists.txt
14 
--- ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/codec/CMakeLists.txt	2013-07-10 09:00:21.000000000 +0100
15 
+++ ./libfreerdp/codec/CMakeLists.txt	2014-01-30 11:13:18.167681417 +0000
16 
@@ -71,7 +71,7 @@
17
18 
 if(WITH_NEON)
19 
 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_NEON_SRCS})
20 
-	set_source_files_properties(${${MODULE_PREFIX}_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -mfloat-abi=${ARM_FP_ABI} -Wno-unused-variable")
21 
+	set_source_files_properties(${${MODULE_PREFIX}_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable")
22 
 endif()
23
24 
 if(WITH_JPEG)
25 
diff -ruN ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/primitives/CMakeLists.txt ./libfreerdp/primitives/CMakeLists.txt
26 
--- ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/primitives/CMakeLists.txt	2013-07-10 09:00:21.000000000 +0100
27 
+++ ./libfreerdp/primitives/CMakeLists.txt	2014-01-30 11:14:11.661680959 +0000
28 
@@ -58,7 +58,7 @@
29 
 	endif()
30 
 elseif(WITH_NEON)
31 
 	if(CMAKE_COMPILER_IS_GNUCC)
32 
-	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon -mfloat-abi=${ARM_FP_ABI}")
33 
+	    set(OPTIMIZATION "${OPTIMIZATION}")
34 
 	endif()
35 
 	# TODO: Add MSVC equivalent
36 
 endif()
37 
diff -ruN ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/primitives/test/CMakeLists.txt ./libfreerdp/primitives/test/CMakeLists.txt
38 
--- ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/primitives/test/CMakeLists.txt	2013-07-10 09:00:21.000000000 +0100
39 
+++ ./libfreerdp/primitives/test/CMakeLists.txt	2014-01-30 11:13:51.405675967 +0000
40 
@@ -92,7 +92,7 @@
41 
 	endif()
42 
 elseif(WITH_NEON)
43 
 	if(CMAKE_COMPILER_IS_GNUCC)
44 
-	    set(OPTFLAGS "${OPTFLAGS} -mfpu=neon -mfloat-abi=${ARM_FP_ABI} -O2")
45 
+	    set(OPTFLAGS "${OPTFLAGS} -O2")
46 
 	endif()
47 
 	# TODO: Add MSVC equivalent
48 
 endif()

Return to bug 186395