r13541 - in packages/trunk/yabause/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2012-05-05 15:15:13 +0000 (Sat, 05 May 2012)
New Revision: 13541

Added:
   packages/trunk/yabause/debian/patches/disable_dynarec_on_arm.patch
Modified:
   packages/trunk/yabause/debian/changelog
   packages/trunk/yabause/debian/patches/series
Log:
Disable dynarec on armel/armhf.

    Added patch: disable_dynarec_on_arm.patch
    Closes: #654615
    LP: #944749



Modified: packages/trunk/yabause/debian/changelog
===================================================================
--- packages/trunk/yabause/debian/changelog	2012-05-05 14:19:12 UTC (rev 13540)
+++ packages/trunk/yabause/debian/changelog	2012-05-05 15:15:13 UTC (rev 13541)
@@ -7,8 +7,12 @@
     Thanks: Simon Ruderich <simon at ruderich.org>
     Closes: #662969
     Added patch: use_dpkg_buildflags.patch
+  * Disable dynarec on armel/armhf.
+    Added patch: disable_dynarec_on_arm.patch
+    Closes: #654615
+    LP: #944749
 
- -- Evgeni Golov <evgeni at debian.org>  Tue, 01 May 2012 18:31:32 +0200
+ -- Evgeni Golov <evgeni at debian.org>  Sat, 05 May 2012 17:14:01 +0200
 
 yabause (0.9.11-1) unstable; urgency=low
 

Added: packages/trunk/yabause/debian/patches/disable_dynarec_on_arm.patch
===================================================================
--- packages/trunk/yabause/debian/patches/disable_dynarec_on_arm.patch	                        (rev 0)
+++ packages/trunk/yabause/debian/patches/disable_dynarec_on_arm.patch	2012-05-05 15:15:13 UTC (rev 13541)
@@ -0,0 +1,26 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0e0057b..448ec01 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -201,12 +201,6 @@ if (YAB_SH2_DYNAREC)
+ 				sh2_dynarec/sh2_dynarec.c sh2_dynarec/linkage_x64.s)
+ 			add_definitions(-DSH2_DYNAREC=1)
+ 		endif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+-		if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
+-			enable_language(ASM-ATT)
+-			set(yabause_SOURCES ${yabause_SOURCES}
+-				sh2_dynarec/sh2_dynarec.c sh2_dynarec/linkage_arm.s)
+-			add_definitions(-DSH2_DYNAREC=1)
+-		endif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
+ 	endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+ endif (YAB_SH2_DYNAREC)
+ 
+@@ -330,7 +324,7 @@ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+ 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
+ endif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
+-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=softfp")
++	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
+ endif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
+ 
+ add_definitions(-DPACKAGE=\"${YAB_PACKAGE}\")

Modified: packages/trunk/yabause/debian/patches/series
===================================================================
--- packages/trunk/yabause/debian/patches/series	2012-05-05 14:19:12 UTC (rev 13540)
+++ packages/trunk/yabause/debian/patches/series	2012-05-05 15:15:13 UTC (rev 13541)
@@ -1 +1,2 @@
 use_dpkg_buildflags.patch
+disable_dynarec_on_arm.patch