--- a/Makefile	Sat Feb 25 16:57:17 2006 +0000
+++ b/Makefile	Sat Feb 25 18:11:11 2006 +0000
@@ -345,6 +345,9 @@
 ifdef OSX
 # these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
 BASECFLAGS += -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic
+ifdef IS_G5
+BASECFLAGS += -mtune=970 -mcpu=970 -mpowerpc-gpopt
+endif
 else
 ifdef MORPHOS
 BASECFLAGS += -I/gg/os-include -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/os/macosx/G5_detector.c	Sat Feb 25 18:11:11 2006 +0000
@@ -0,0 +1,29 @@
+/* $Id:$ */
+
+#include <mach/mach.h>
+#include <mach/mach_host.h>
+#include <mach/host_info.h>
+#include <mach/machine.h>
+#include <stdio.h>
+
+
+#ifndef CPU_SUBTYPE_POWERPC_970
+#define CPU_SUBTYPE_POWERPC_970 ((cpu_subtype_t) 100)
+#endif
+
+// this function is a lightly modified version of some code from Apple's developer homepage to detect G5 CPUs at runtime
+main()
+{
+	host_basic_info_data_t hostInfo;
+	mach_msg_type_number_t infoCount;
+	boolean_t is_G5;
+
+	infoCount = HOST_BASIC_INFO_COUNT;
+	host_info(mach_host_self(), HOST_BASIC_INFO,
+			  (host_info_t)&hostInfo, &infoCount);
+
+	 is_G5 = ((hostInfo.cpu_type == CPU_TYPE_POWERPC) &&
+			(hostInfo.cpu_subtype == CPU_SUBTYPE_POWERPC_970));
+	 if (is_G5)
+		 printf("1");
+}

--- a/os/macosx/Makefile.setup	Sat Feb 25 16:57:17 2006 +0000
+++ b/os/macosx/Makefile.setup	Sat Feb 25 18:11:11 2006 +0000
@@ -16,6 +16,16 @@
 endif
 endif
 
+ifndef FAT_BINARY
+ifndef JAGUAR
+ifeq ($(shell uname), Darwin)
+# it's a hardware mac, not crosscompiling
+$(Q)$(CC_HOST) os/macosx/G5_detector.c -o os/macosx/G5_detector
+IS_G5:=$(shell os/macosx/G5_detector)
+endif
+endif
+endif
+
 ifdef FAT_BINARY
 ifndef STATIC
 $(warning Compiling a universal binary, that is not static. Adding static flag)