[Scummvm-cvs-logs] scummvm master -> 89986edf4d012422124f7e7478844d3100206158

dhewg dhewg at wiibrew.org
Wed Feb 23 19:29:00 CET 2011


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

Summary:
0032db14ab ANDROID: Sync toolchain flags with NDK r5b.
89986edf4d HAIKU: Remove -fhuge-objects.


Commit: 0032db14aba32ea9507ddda9002334f29d700f86
    https://github.com/scummvm/scummvm/commit/0032db14aba32ea9507ddda9002334f29d700f86
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-23T10:27:14-08:00

Commit Message:
ANDROID: Sync toolchain flags with NDK r5b.

Changed paths:
    configure



diff --git a/configure b/configure
index 7144041..1ad6ebc 100755
--- a/configure
+++ b/configure
@@ -1505,12 +1505,21 @@ case $_host_os in
 		;;
 	android)
 		CXXFLAGS="$CXXFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
-		CXXFLAGS="$CXXFLAGS -Os -mandroid -msoft-float -mthumb-interwork"
-		CXXFLAGS="$CXXFLAGS -march=armv5te -mtune=xscale"
+		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"
+		else
+			CXXFLAGS="$CXXFLAGS	-fno-omit-frame-pointer -fno-strict-aliasing"
+		fi
+		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__"
 		# supress 'mangling of 'va_list' has changed in GCC 4.4'
 		CXXFLAGS="$CXXFLAGS -Wno-psabi"
 		LDFLAGS="$LDFLAGS --sysroot=$ANDROID_NDK/platforms/android-4/arch-arm"
-		LDFLAGS="$LDFLAGS -mandroid -mthumb-interwork"
+		LDFLAGS="$LDFLAGS -mthumb-interwork"
 		add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
 		_unix=yes
 		_seq_midi=no
@@ -2956,6 +2965,10 @@ fi
 #
 case $_backend in
 	android)
+		# ssp at this point so the cxxtests link
+		CXXFLAGS="$CXXFLAGS -fstack-protector -Wa,--noexecstack"
+		LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
+
 		static_libs=''
 		system_libs=''
 		for lib in $LIBS; do
@@ -2974,7 +2987,7 @@ case $_backend in
 		# than pick up anything unhygenic from the Android libs.
 		LIBS="-Wl,-Bstatic $static_libs"
 		LIBS="$LIBS -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM"
-		DEFINES="$DEFINES -D__ANDROID__ -DREDUCE_MEMORY_USAGE"
+		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
 		;;
 	dc)
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'


Commit: 89986edf4d012422124f7e7478844d3100206158
    https://github.com/scummvm/scummvm/commit/89986edf4d012422124f7e7478844d3100206158
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-23T10:27:23-08:00

Commit Message:
HAIKU: Remove -fhuge-objects.

Not required anymore, patch by Begasus

Changed paths:
    configure



diff --git a/configure b/configure
index 1ad6ebc..5c291dd 100755
--- a/configure
+++ b/configure
@@ -1589,7 +1589,6 @@ case $_host_os in
 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lnetwork for the timidity MIDI driver
 		LIBS="$LIBS -lnetwork"
-		CXXFLAGS="$CXXFLAGS -fhuge-objects"
 		_unix=yes
 		_seq_midi=no
 		;;






More information about the Scummvm-git-logs mailing list