[Scummvm-cvs-logs] scummvm master -> a5a8af86ee43ead26f1fc73f48661da878603711

dhewg dhewg at wiibrew.org
Thu Mar 10 21:18:43 CET 2011


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bf62098dd5 CONFIGURE: Add support for Android's armeabi-v7a
fb0b9dd7b3 CONFIGURE: Fix some whitespaces
a5a8af86ee CONFIGURE: Change Android debug flags logic


Commit: bf62098dd5f114b6cd82342ce9042d6ff9305d36
    https://github.com/scummvm/scummvm/commit/bf62098dd5f114b6cd82342ce9042d6ff9305d36
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-10T12:17:59-08:00

Commit Message:
CONFIGURE: Add support for Android's armeabi-v7a

Extended ABI with Thumb-2 and VFP hardware FPU instructions

Changed paths:
    configure



diff --git a/configure b/configure
index eaf64c4..45956ee 100755
--- a/configure
+++ b/configure
@@ -976,7 +976,7 @@ get_system_exe_extension $guessed_host
 NATIVEEXEEXT=$_exeext
 
 case $_host in
-android)
+android | android-v7a)
 	_host_os=android
 	_host_cpu=arm
 	_host_alias=arm-linux-androideabi
@@ -1504,8 +1504,16 @@ case $_host_os in
 		add_line_to_config_mk 'AMIGAOS = 1'
 		;;
 	android)
+		case $_host in
+			android)
+				CXXFLAGS="$CXXFLAGS -march=armv5te -mtune=xscale -msoft-float"
+				;;
+			android-v7a)
+				CXXFLAGS="$CXXFLAGS -march=armv7-a -mfloat-abi=softfp -mfpu=vfp"
+				LDFLAGS="$LDFLAGS -Wl,--fix-cortex-a8"
+				;;
+		esac
 		CXXFLAGS="$CXXFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
-		CXXFLAGS="$CXXFLAGS -march=armv5te -mtune=xscale -msoft-float"
 		CXXFLAGS="$CXXFLAGS -fpic -ffunction-sections -funwind-tables"
 		if test "$_release_build" = yes; then
 			CXXFLAGS="$CXXFLAGS	-fomit-frame-pointer -fstrict-aliasing"
@@ -1668,7 +1676,7 @@ if test -n "$_host"; then
 	# Cross-compiling mode - add your target here if needed
 	echo "Cross-compiling to $_host"
 	case "$_host" in
-		android)
+		android | android-v7a)
 			_unix=yes
 			_need_memalign=yes
 			# we link a .so as default


Commit: fb0b9dd7b32ae668c16e92d756007764cacb7d15
    https://github.com/scummvm/scummvm/commit/fb0b9dd7b32ae668c16e92d756007764cacb7d15
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-10T12:17:59-08:00

Commit Message:
CONFIGURE: Fix some whitespaces

Changed paths:
    configure



diff --git a/configure b/configure
index 45956ee..90c6275 100755
--- a/configure
+++ b/configure
@@ -1516,11 +1516,11 @@ case $_host_os in
 		CXXFLAGS="$CXXFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
 		CXXFLAGS="$CXXFLAGS -fpic -ffunction-sections -funwind-tables"
 		if test "$_release_build" = yes; then
-			CXXFLAGS="$CXXFLAGS	-fomit-frame-pointer -fstrict-aliasing"
+			CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fstrict-aliasing"
 		else
-			CXXFLAGS="$CXXFLAGS	-fno-omit-frame-pointer -fno-strict-aliasing"
+			CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
 		fi
-		CXXFLAGS="$CXXFLAGS	-finline-limit=300"
+		CXXFLAGS="$CXXFLAGS -finline-limit=300"
 		CXXFLAGS="$CXXFLAGS -Os -mthumb-interwork"
 		CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__"
 		CXXFLAGS="$CXXFLAGS -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__"
@@ -1567,8 +1567,8 @@ case $_host_os in
 		CXXFLAGS="$CXXFLAGS -fuse-cxa-atexit"
 		LDFLAGS="$LDFLAGS -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt"
 		if test "$_dynamic_modules" = no ; then
-  			LDFLAGS="$LDFLAGS -Wl,--gc-sections"
- 		else
+			LDFLAGS="$LDFLAGS -Wl,--gc-sections"
+		else
 				LDFLAGS="$LDFLAGS -Wl,--no-gc-sections"
 				# TODO automate this required 2 step linking phase
 				# LDFLAGS="$LDFLAGS -Wl,--retain-symbols-file,ds.syms"
@@ -3060,8 +3060,8 @@ case $_backend in
 		DEFINES="$DEFINES -D_EE -DFORCE_RTL"
 		INCLUDES="$INCLUDES -I$PS2SDK/ee/include -I$PS2SDK/common/include -I$PS2SDK/ports/include"
 		if test "$_dynamic_modules" = no ; then
-  			LDFLAGS="$LDFLAGS -mno-crt0 $PS2SDK/ee/startup/crt0.o -T $PS2SDK/ee/startup/linkfile"
- 		fi
+			LDFLAGS="$LDFLAGS -mno-crt0 $PS2SDK/ee/startup/crt0.o -T $PS2SDK/ee/startup/linkfile"
+		fi
 		LDFLAGS="$LDFLAGS -L$PS2SDK/ee/lib -L$PS2SDK/ports/lib"
 		LIBS="$LIBS -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lm -lc -lfileXio -lkernel -lstdc++ "
 		;;


Commit: a5a8af86ee43ead26f1fc73f48661da878603711
    https://github.com/scummvm/scummvm/commit/a5a8af86ee43ead26f1fc73f48661da878603711
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-10T12:17:59-08:00

Commit Message:
CONFIGURE: Change Android debug flags logic

Use --enable-debug instead of not --enable-release

Changed paths:
    configure



diff --git a/configure b/configure
index 90c6275..eeafe93 100755
--- a/configure
+++ b/configure
@@ -1515,10 +1515,10 @@ case $_host_os in
 		esac
 		CXXFLAGS="$CXXFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
 		CXXFLAGS="$CXXFLAGS -fpic -ffunction-sections -funwind-tables"
-		if test "$_release_build" = yes; then
-			CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fstrict-aliasing"
-		else
+		if test "$_debug_build" = yes; then
 			CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
+		else
+			CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -fstrict-aliasing"
 		fi
 		CXXFLAGS="$CXXFLAGS -finline-limit=300"
 		CXXFLAGS="$CXXFLAGS -Os -mthumb-interwork"
@@ -2973,7 +2973,12 @@ fi
 case $_backend in
 	android)
 		# ssp at this point so the cxxtests link
-		CXXFLAGS="$CXXFLAGS -fstack-protector -Wa,--noexecstack"
+		if test "$_debug_build" = yes; then
+			CXXFLAGS="$CXXFLAGS -fstack-protector"
+		else
+			CXXFLAGS="$CXXFLAGS -fno-stack-protector"
+		fi
+		CXXFLAGS="$CXXFLAGS -Wa,--noexecstack"
 		LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
 
 		static_libs=''






More information about the Scummvm-git-logs mailing list