[Scummvm-git-logs] scummvm master -> 7f9eaf0f12632bd58b35862f6e57fb7dc67f3f44

bgK bastien.bouclet at gmail.com
Sat May 11 20:35:36 CEST 2019 

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

Summary:
30c49838bb BUILD: Remove bad & outdated flags from Android builds
1267b72c38 ANDROID: Stop forcibly disabling MT-32 emulator
32b0c2cf2c ANDROID: Add support for building arm64 binaries
7f9eaf0f12 ANDROID: Fix building armv5te binaries with NDK r14b


Commit: 30c49838bbd8d8f51ae0c4c42a4b423b1572623c
    https://github.com/scummvm/scummvm/commit/30c49838bbd8d8f51ae0c4c42a4b423b1572623c
Author: Colin Snover (github.com at zetafleet.com)
Date: 2019-05-11T20:35:31+02:00

Commit Message:
BUILD: Remove bad & outdated flags from Android builds

Most of these flags don't work with modern Android NDKs. The ones
that may, like setting sysroot and include directories, don't work
properly with standalone toolchains. Users compiling for Android
should make sure that they properly set up include paths in their
environment CXXFLAGS/LDFLAGS as needed for the compiler to run,
instead of relying on configure to do it, since configure can't do
it in a toolchain-agnostic manner.

Changed paths:
    configure


diff --git a/configure b/configure
index a172338..408262a 100755
--- a/configure
+++ b/configure
@@ -2495,7 +2495,8 @@ case $_host_os in
 			android | android-arm)
 				append_var CXXFLAGS "-march=armv5te"
 				append_var CXXFLAGS "-mtune=xscale"
-				append_var CXXFLAGS "-msoft-float"
+				append_var CXXFLAGS "-mfloat-abi=softfp"
+				append_var LDFLAGS "-mthumb"
 				ABI="armeabi"
 				ANDROID_PLATFORM=9
 				ANDROID_PLATFORM_ARCH="arm"
@@ -2536,10 +2537,6 @@ case $_host_os in
 				;;
 		esac
 
-		# Setup platform version and arch
-		append_var CXXFLAGS "--sysroot=$ANDROID_NDK/platforms/android-$ANDROID_PLATFORM/arch-$ANDROID_PLATFORM_ARCH"
-		append_var LDFLAGS "--sysroot=$ANDROID_NDK/platforms/android-$ANDROID_PLATFORM/arch-$ANDROID_PLATFORM_ARCH"
-
 		append_var CXXFLAGS "-fpic"
 		append_var CXXFLAGS "-ffunction-sections"
 		append_var CXXFLAGS "-funwind-tables"
@@ -2550,36 +2547,9 @@ case $_host_os in
 			append_var CXXFLAGS "-fomit-frame-pointer"
 			append_var CXXFLAGS "-fstrict-aliasing"
 		fi
-		append_var CXXFLAGS "-finline-limit=300"
 		_optimization_level=-Os
 
-		if test "$_host" = android -o "$_host" = android-arm; then
-			append_var CXXFLAGS "-mthumb-interwork"
-			# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
-			append_var CXXFLAGS "-D__ARM_ARCH_5__"
-			append_var CXXFLAGS "-D__ARM_ARCH_5T__"
-			append_var CXXFLAGS "-D__ARM_ARCH_5E__"
-			append_var CXXFLAGS "-D__ARM_ARCH_5TE__"
-		fi
-
-		# surpress 'mangling of 'va_list' has changed in GCC 4.4' warning
-		append_var CXXFLAGS "-Wno-psabi"
-
-		if test "$_host" = android -o "$_host" = android-arm; then
-			append_var LDFLAGS "-mthumb-interwork"
-		fi
-
-		append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/include/"
-		append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/include/"
-		append_var LDFLAGS "-L$ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/"
-		append_var LIBS "-lsupc++"
 		add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
-		if test -d "$ANDROID_SDK"/build-tools; then
-			_build_tools_version=`cd "$ANDROID_SDK"/build-tools && ls -1 | sort -rn | head -1`
-			add_line_to_config_mk "ANDROID_BTOOLS = build-tools/$_build_tools_version"
-		else
-			add_line_to_config_mk "ANDROID_BTOOLS = platform-tools"
-		fi
 		_seq_midi=no
 		;;
 	beos*)


Commit: 1267b72c3820a4fecd182c617b9722e1067d8398
    https://github.com/scummvm/scummvm/commit/1267b72c3820a4fecd182c617b9722e1067d8398
Author: Colin Snover (github.com at zetafleet.com)
Date: 2019-05-11T20:35:31+02:00

Commit Message:
ANDROID: Stop forcibly disabling MT-32 emulator

Changed paths:
    configure


diff --git a/configure b/configure
index 408262a..d06ab40 100755
--- a/configure
+++ b/configure
@@ -2974,7 +2974,6 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/android/android.mk"
 			_build_scalers=no
 			_seq_midi=no
-			_mt32emu=no
 			_timidity=no
 			;;
 		androidsdl | androidsdl-armeabi | androidsdl-armeabi-v7a | androidsdl-mips | androidsdl-x86 | androidsdl-arm64-v8a | androidsdl-x86_64)


Commit: 32b0c2cf2cf1d230912d44322ddba919be5a7e12
    https://github.com/scummvm/scummvm/commit/32b0c2cf2cf1d230912d44322ddba919be5a7e12
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2019-05-11T20:35:31+02:00

Commit Message:
ANDROID: Add support for building arm64 binaries

Changed paths:
    configure


diff --git a/configure b/configure
index d06ab40..df69f49 100755
--- a/configure
+++ b/configure
@@ -1484,6 +1484,11 @@ android | android-arm | android-v7a | android-arm-v7a | ouya)
 	_host_cpu=arm
 	_host_alias=arm-linux-androideabi
 	;;
+android-arm64-v8a)
+	_host_os=android
+	_host_cpu=aarch64
+	_host_alias=aarch64-linux-android
+	;;
 android-mips)
 	_host_os=android
 	_host_cpu=mipsel
@@ -2498,8 +2503,6 @@ case $_host_os in
 				append_var CXXFLAGS "-mfloat-abi=softfp"
 				append_var LDFLAGS "-mthumb"
 				ABI="armeabi"
-				ANDROID_PLATFORM=9
-				ANDROID_PLATFORM_ARCH="arm"
 				;;
 			android-v7a | android-arm-v7a)
 				append_var CXXFLAGS "-march=armv7-a"
@@ -2507,24 +2510,21 @@ case $_host_os in
 				append_var CXXFLAGS "-mfpu=vfp"
 				append_var LDFLAGS "-Wl,--fix-cortex-a8"
 				ABI="armeabi-v7a"
-				ANDROID_PLATFORM=9
-				ANDROID_PLATFORM_ARCH="arm"
+				;;
+			android-arm64-v8a)
+				ABI="arm64-v8a"
 				;;
 			android-mips)
 				append_var CXXFLAGS "-march=mips32"
 				append_var CXXFLAGS "-mtune=mips32"
 				ABI="mips"
 				# Platform version 9 is needed as earlier versions of platform do not support this arch.
-				ANDROID_PLATFORM=9
-				ANDROID_PLATFORM_ARCH="mips"
 				;;
 			android-x86)
 				append_var CXXFLAGS "-march=i686"
 				append_var CXXFLAGS "-mtune=i686"
 				ABI="x86"
 				# Platform version 9 is needed as earlier versions of platform do not support this arch.
-				ANDROID_PLATFORM=9
-				ANDROID_PLATFORM_ARCH="x86"
 				;;
 			ouya)
 				append_var CXXFLAGS "-march=armv7-a"
@@ -2532,8 +2532,6 @@ case $_host_os in
 				append_var CXXFLAGS "-mfloat-abi=softfp"
 				append_var CXXFLAGS "-mfpu=neon"
 				ABI="armeabi-v7a"
-				ANDROID_PLATFORM=16
-				ANDROID_PLATFORM_ARCH="arm"
 				;;
 		esac
 
@@ -2964,7 +2962,7 @@ if test -n "$_host"; then
 			_vorbis=no
 			_port_mk="backends/platform/3ds/3ds.mk"
 			;;
-		android | android-arm | android-v7a | android-arm-v7a | android-mips | android-x86 | ouya)
+		android | android-arm | android-v7a | android-arm-v7a | android-arm64-v8a | android-mips | android-x86 | ouya)
 			# we link a .so as default
 			append_var LDFLAGS "-shared"
 			append_var LDFLAGS "-Wl,-Bsymbolic,--no-undefined"


Commit: 7f9eaf0f12632bd58b35862f6e57fb7dc67f3f44
    https://github.com/scummvm/scummvm/commit/7f9eaf0f12632bd58b35862f6e57fb7dc67f3f44
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2019-05-11T20:35:31+02:00

Commit Message:
ANDROID: Fix building armv5te binaries with NDK r14b

The mthumb linker flag was causing the libstdc++ library not to be found.

Changed paths:
    configure


diff --git a/configure b/configure
index df69f49..b4e8224 100755
--- a/configure
+++ b/configure
@@ -2501,7 +2501,6 @@ case $_host_os in
 				append_var CXXFLAGS "-march=armv5te"
 				append_var CXXFLAGS "-mtune=xscale"
 				append_var CXXFLAGS "-mfloat-abi=softfp"
-				append_var LDFLAGS "-mthumb"
 				ABI="armeabi"
 				;;
 			android-v7a | android-arm-v7a)

More information about the Scummvm-git-logs mailing list