commit 813b3eea8b469a6d603f13a51a8afb8e3dae3a32 from: Russ Cox date: Sun Oct 23 21:55:23 2011 UTC OS X PowerPC fixes (thanks Cameron Kaiser) commit - a2deaac4b1066df5de4774737ddc9f4b6edbaef9 commit + 813b3eea8b469a6d603f13a51a8afb8e3dae3a32 blob - c4ef316ffe44fd96f161d68b0c8061c0adc86b83 blob + 7625cc8078d562bd8f75763335543b6dcc48bc50 --- INSTALL +++ INSTALL @@ -76,6 +76,10 @@ if [ `uname` = Darwin ]; then echo " i386 found." echo "OBJTYPE=386" >>$PLAN9/config ;; + *ppc*) + echo " power found." + echo "OBJTYPE=power" >>$PLAN9/config + ;; esac rm -f ./a.out fi blob - cfb7826cc91002609211814625dba0893a75a58e blob + 379e9dc1127403aaa4c6e65f243704da0660a125 --- dist/buildmk +++ dist/buildmk @@ -10,6 +10,7 @@ OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed ' 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; blob - 93d58ce0c80d164ee0d3e125be1a3999315b177b blob + d41e9d10deef6b369588393e4e9eda063ee6592a --- src/cmd/devdraw/osx-screen-carbon.m +++ src/cmd/devdraw/osx-screen-carbon.m @@ -2,6 +2,7 @@ #define Rect OSXRect #define Cursor OSXCursor #include +#import #ifdef MULTITOUCH #include #include blob - 487750eaefcb3d3ace42e042ca1519731f0c5bdc blob + d4f852a4cf7756dd8063e7e8d6109d8ab143968c --- src/libthread/sysofiles.sh +++ src/libthread/sysofiles.sh @@ -14,7 +14,7 @@ case "$tag" in *-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-*) blob - e4220dbfd3be4dd99d7330065fa00a31deafe990 blob + 4397bac72762ca71c996334b739e50023e10b732 --- src/libthread/threadimpl.h +++ src/libthread/threadimpl.h @@ -42,7 +42,7 @@ extern void makecontext(ucontext_t*, void(*)(), int, # 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" blob - c7e9dddec175f0a3ba5a81df066aad9a2a5da772 blob + c03ec52f303068c412ba344555ad0cd6d5891f17 --- src/mkhdr +++ src/mkhdr @@ -8,6 +8,7 @@ OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed ' 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;