OS X PowerPC fixes (thanks Cameron Kaiser)

This commit is contained in:
Russ Cox 2011-10-23 17:55:23 -04:00
parent a2deaac4b1
commit 813b3eea8b
6 changed files with 9 additions and 2 deletions

View file

@ -76,6 +76,10 @@ if [ `uname` = Darwin ]; then
echo " i386 found." echo " i386 found."
echo "OBJTYPE=386" >>$PLAN9/config echo "OBJTYPE=386" >>$PLAN9/config
;; ;;
*ppc*)
echo " power found."
echo "OBJTYPE=power" >>$PLAN9/config
;;
esac esac
rm -f ./a.out rm -f ./a.out
fi fi

1
dist/buildmk vendored
View file

@ -10,6 +10,7 @@ OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed '
s;.*armv.*;arm;g; s;.*armv.*;arm;g;
s;.*powerpc.*;power;g; s;.*powerpc.*;power;g;
s;.*PowerMacintosh.*;power;g; s;.*PowerMacintosh.*;power;g;
s;.*Power.Macintosh.*;power;g;
s;.*macppc.*;power;g; s;.*macppc.*;power;g;
s;.*ppc64.*;power;g; s;.*ppc64.*;power;g;
s;.*ppc.*;power;g; s;.*ppc.*;power;g;

View file

@ -2,6 +2,7 @@
#define Rect OSXRect #define Rect OSXRect
#define Cursor OSXCursor #define Cursor OSXCursor
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#import <Foundation/Foundation.h>
#ifdef MULTITOUCH #ifdef MULTITOUCH
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <IOKit/hidsystem/IOHIDShared.h> #include <IOKit/hidsystem/IOHIDShared.h>

View file

@ -14,7 +14,7 @@ case "$tag" in
*-NetBSD-*) *-NetBSD-*)
echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME.o 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 echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME-${OBJTYPE}.o pthread.o
;; ;;
*-OpenBSD-*) *-OpenBSD-*)

View file

@ -42,7 +42,7 @@ extern void makecontext(ucontext_t*, void(*)(), int, ...);
# include "386-ucontext.h" # include "386-ucontext.h"
# elif defined(__x86_64__) # elif defined(__x86_64__)
# include "x86_64-ucontext.h" # include "x86_64-ucontext.h"
# elif defined(__power__) # elif defined(__ppc__) || defined(__power__)
# include "power-ucontext.h" # include "power-ucontext.h"
# else # else
# error "unknown architecture" # error "unknown architecture"

View file

@ -8,6 +8,7 @@ OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed '
s;.*armv.*;arm;g; s;.*armv.*;arm;g;
s;.*powerpc.*;power;g; s;.*powerpc.*;power;g;
s;.*PowerMacintosh.*;power;g; s;.*PowerMacintosh.*;power;g;
s;.*Power.Macintosh.*;power;g;
s;.*macppc.*;power;g; s;.*macppc.*;power;g;
s;.*ppc64.*;power;g; s;.*ppc64.*;power;g;
s;.*ppc.*;power;g; s;.*ppc.*;power;g;