[Scummvm-cvs-logs] scummvm master -> 762e2ca69be7f4bba789ed7decad39e241dd03c5

[clone2727]

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:
e10512c8b9 CONFIGURE: Use "powerpc" instead of "ppc" as config.guess outputs
762e2ca69b CONFIGURE: Use -mlongcall on Mac PPC builds


Commit: e10512c8b94d2a83ad67d5f854e1f5149bc41f13
    https://github.com/scummvm/scummvm/commit/e10512c8b94d2a83ad67d5f854e1f5149bc41f13
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-01-18T16:58:03-05:00

Commit Message:
CONFIGURE: Use "powerpc" instead of "ppc" as config.guess outputs

powerpc-* targets get detected properly again now

Changed paths:
    configure



diff --git a/configure b/configure
index 5f73d77..dbb36c3 100755
--- a/configure
+++ b/configure
@@ -1318,7 +1318,7 @@ ds)
 	;;
 gamecube)
 	_host_os=gamecube
-	_host_cpu=ppc
+	_host_cpu=powerpc
 	_host_alias=powerpc-eabi
 	;;
 gp2x)
@@ -1386,7 +1386,7 @@ openpandora)
 	;;
 ppc-amigaos)
 	_host_os=amigaos
-	_host_cpu=ppc
+	_host_cpu=powerpc
 	;;
 ps2)
 	_host_os=ps2
@@ -1398,7 +1398,7 @@ ps2)
 	;;
 ps3)
 	_host_os=ps3
-	_host_cpu=ppc
+	_host_cpu=powerpc
 	_host_alias=powerpc64-ps3-elf
 
 	# The prefix is always the same on PS3 so we hardcode the default
@@ -1444,7 +1444,7 @@ webos)
 	;;
 wii)
 	_host_os=wii
-	_host_cpu=ppc
+	_host_cpu=powerpc
 	_host_alias=powerpc-eabi
 	;;
 wince)
@@ -2004,7 +2004,7 @@ cc_check_clean tmp_find_type_with_size.cpp
 # for the smaller sizes.
 echo_n "Alignment required... "
 case $_host_cpu in
-	i[3-6]86 | amd64 | x86_64 | ppc*)
+	i[3-6]86 | amd64 | x86_64 | powerpc*)
 		# Unaligned access should work
 		_need_memalign=no
 		;;
@@ -2047,7 +2047,7 @@ case $_host_cpu in
 		echo "MIPS"
 		DEFINES="$DEFINES -DMIPS_TARGET"
 		;;
-	ppc*)
+	powerpc*)
 		echo "PowerPC"
 		DEFINES="$DEFINES -DPPC_TARGET"
 		;;


Commit: 762e2ca69be7f4bba789ed7decad39e241dd03c5
    https://github.com/scummvm/scummvm/commit/762e2ca69be7f4bba789ed7decad39e241dd03c5
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-01-18T17:00:51-05:00

Commit Message:
CONFIGURE: Use -mlongcall on Mac PPC builds

Calls larger than 32MB away should no longer cause linker errors, provided libraries are rebuilt with that too

Changed paths:
    configure



diff --git a/configure b/configure
index dbb36c3..61e82f1 100755
--- a/configure
+++ b/configure
@@ -2181,6 +2181,17 @@ case $_host_os in
 		exit 1
 		;;
 	darwin*)
+		# Pass -mlongcall to gcc so that it emits long calls
+		# which will allow for calls larger than 32MB. The linker
+		# will discard the calls if they are not needed, but we
+		# need to ensure the compiler emits them in the first place.
+		case $_host_cpu in
+		powerpc*)
+			CFLAGS="$CFLAGS -mlongcall"
+			CXXFLAGS="$CXXFLAGS -mlongcall"
+			;;
+		esac
+
 		DEFINES="$DEFINES -DMACOSX"
 		LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
 		add_line_to_config_mk 'MACOSX = 1'