# HG changeset patch
# User Russ Cox <rsc@swtch.com>
# Date 1319406923 14400
# Node ID 00e98f30e1f8076b24183b88f444b6b97314accd
# Parent  c797f1457a176c034bf4380145d23c0f0ef5d30d
OS X PowerPC fixes (thanks Cameron Kaiser)

diff -r c797f1457a176c034bf4380145d23c0f0ef5d30d -r 00e98f30e1f8076b24183b88f444b6b97314accd INSTALL
--- a/INSTALL	Fri Oct 14 00:08:50 2011 -0400
+++ b/INSTALL	Sun Oct 23 17:55:23 2011 -0400
@@ -76,6 +76,10 @@
 		echo "	i386 found."
 		echo "OBJTYPE=386" >>$PLAN9/config
 		;;
+	*ppc*)
+		echo "  power found."
+		echo "OBJTYPE=power" >>$PLAN9/config
+		;;
 	esac
 	rm -f ./a.out
 fi
diff -r c797f1457a176c034bf4380145d23c0f0ef5d30d -r 00e98f30e1f8076b24183b88f444b6b97314accd dist/buildmk
--- a/dist/buildmk	Fri Oct 14 00:08:50 2011 -0400
+++ b/dist/buildmk	Sun Oct 23 17:55:23 2011 -0400
@@ -10,6 +10,7 @@
 	s;.*armv.*;arm;g;
 	s;.*powerpc.*;power;g;
 	s;.*PowerMacintosh.*;power;g;
+	s;.*Power.Macintosh.*;power;g;
 	s;.*macppc.*;power;g;
 	s;.*ppc64.*;power;g;
 	s;.*ppc.*;power;g;
diff -r c797f1457a176c034bf4380145d23c0f0ef5d30d -r 00e98f30e1f8076b24183b88f444b6b97314accd src/cmd/devdraw/osx-screen-carbon.m
--- a/src/cmd/devdraw/osx-screen-carbon.m	Fri Oct 14 00:08:50 2011 -0400
+++ b/src/cmd/devdraw/osx-screen-carbon.m	Sun Oct 23 17:55:23 2011 -0400
@@ -2,6 +2,7 @@
 #define Rect OSXRect
 #define Cursor OSXCursor
 #include <Carbon/Carbon.h>
+#import <Foundation/Foundation.h>
 #ifdef MULTITOUCH
 #include <IOKit/IOKitLib.h>
 #include <IOKit/hidsystem/IOHIDShared.h>
diff -r c797f1457a176c034bf4380145d23c0f0ef5d30d -r 00e98f30e1f8076b24183b88f444b6b97314accd src/libthread/sysofiles.sh
--- a/src/libthread/sysofiles.sh	Fri Oct 14 00:08:50 2011 -0400
+++ b/src/libthread/sysofiles.sh	Sun Oct 23 17:55:23 2011 -0400
@@ -14,7 +14,7 @@
 *-NetBSD-*)
 	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME.o
 	;;
-*-Darwin-10.[5-6].* | *-Darwin-9.*)
+*-Darwin-10.[5-6].* | *-Darwin-[89].*)
 	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME-${OBJTYPE}.o pthread.o
 	;;
 *-OpenBSD-*)
diff -r c797f1457a176c034bf4380145d23c0f0ef5d30d -r 00e98f30e1f8076b24183b88f444b6b97314accd src/libthread/threadimpl.h
--- a/src/libthread/threadimpl.h	Fri Oct 14 00:08:50 2011 -0400
+++ b/src/libthread/threadimpl.h	Sun Oct 23 17:55:23 2011 -0400
@@ -42,7 +42,7 @@
 #		include "386-ucontext.h"
 #	elif defined(__x86_64__)
 #		include "x86_64-ucontext.h"
-#	elif defined(__power__)
+#	elif defined(__ppc__) || defined(__power__)
 #		include "power-ucontext.h"
 #	else
 #		error "unknown architecture"
diff -r c797f1457a176c034bf4380145d23c0f0ef5d30d -r 00e98f30e1f8076b24183b88f444b6b97314accd src/mkhdr
--- a/src/mkhdr	Fri Oct 14 00:08:50 2011 -0400
+++ b/src/mkhdr	Sun Oct 23 17:55:23 2011 -0400
@@ -8,6 +8,7 @@
 	s;.*armv.*;arm;g;
 	s;.*powerpc.*;power;g;
 	s;.*PowerMacintosh.*;power;g;
+	s;.*Power.Macintosh.*;power;g;
 	s;.*macppc.*;power;g;
 	s;.*ppc64.*;power;g;
 	s;.*ppc.*;power;g;