diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/cmd/devdraw/osx-screen-carbon.m | 1 | ||||
-rw-r--r-- | src/libthread/sysofiles.sh | 2 | ||||
-rw-r--r-- | src/libthread/threadimpl.h | 2 | ||||
-rw-r--r-- | src/mkhdr | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/cmd/devdraw/osx-screen-carbon.m b/src/cmd/devdraw/osx-screen-carbon.m index 93d58ce0..d41e9d10 100644 --- a/src/cmd/devdraw/osx-screen-carbon.m +++ b/src/cmd/devdraw/osx-screen-carbon.m @@ -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 --git a/src/libthread/sysofiles.sh b/src/libthread/sysofiles.sh index 487750ea..d4f852a4 100644 --- a/src/libthread/sysofiles.sh +++ b/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-*) diff --git a/src/libthread/threadimpl.h b/src/libthread/threadimpl.h index e4220dbf..4397bac7 100644 --- a/src/libthread/threadimpl.h +++ b/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" @@ -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; |