--- Libc/Libc-391/pthreads/thread_setup.c
+++ Libc/Libc-763.11/pthreads/thread_setup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2003, 2008 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -51,6 +51,8 @@
 
 #if defined(__ppc__) || defined(__ppc64__)
 #include <architecture/ppc/cframe.h>
+#elif defined(__arm__)
+#include <architecture/arm/cframe.h>
 #endif
 
 #include "pthread_internals.h"
@@ -156,6 +158,95 @@
 			r);
 	}
 
+#elif defined(__x86_64__)
+        x86_thread_state64_t state = {0};
+        x86_thread_state64_t *ts = &state;
+        uintptr_t *sp = vsp;
+
+        /*
+         * Set up x86-64 registers & function call.
+         */
+        count = x86_THREAD_STATE64_COUNT;
+	if (suspended) {
+	        PTHREAD_MACH_CALL(thread_get_state(thread->kernel_thread,
+					   x86_THREAD_STATE64,
+					   (thread_state_t) &state,
+					   &count),
+			  r);
+	}
+        ts->rip = (uintptr_t) routine;
+
+        /*
+        ** We need to simulate a 16-byte aligned stack frame as if we had
+        ** executed a call instruction. The stack should already be aligned
+		** before it comes to us and we don't need to push any arguments,
+		** so we shouldn't need to change it.
+        */
+
+		ts->rdi = (uintptr_t) thread;	/* argument to function */
+        *--sp = 0;            /* fake return address */
+        ts->rsp = (uintptr_t) sp;   /* set stack pointer */
+	/* Incase of needresume, suspend is always set */
+        if (suspended) {
+		PTHREAD_MACH_CALL(thread_set_state(thread->kernel_thread,
+					   x86_THREAD_STATE64,
+					   (thread_state_t) &state,
+					   x86_THREAD_STATE64_COUNT),
+			  r);
+		if (needresume)
+			PTHREAD_MACH_CALL(thread_resume(thread->kernel_thread),
+				r);
+	} else {
+		PTHREAD_MACH_CALL(thread_create_running(mach_task_self(),
+					x86_THREAD_STATE64,
+					(thread_state_t) ts,
+					x86_THREAD_STATE64_COUNT,
+					&thread->kernel_thread),
+			r);
+	}
+
+#elif defined(__arm__)
+	arm_thread_state_t state = {0};
+	arm_thread_state_t *ts = &state;
+	thread_state_flavor_t flavor = ARM_THREAD_STATE;
+	count = ARM_THREAD_STATE_COUNT;
+
+	if (suspended) {
+		PTHREAD_MACH_CALL(thread_get_state(thread->kernel_thread,
+					   flavor,
+					   (thread_state_t) &state,
+					   &count),
+			  r);
+	}
+
+	ts->pc = (uintptr_t)routine;
+
+	if (ts->pc & 1) {
+	    ts->pc &= ~1;
+	    ts->cpsr |= 0x20; /* PSR_THUMB */
+	}
+	
+        ts->sp = (uintptr_t)vsp - C_ARGSAVE_LEN - C_RED_ZONE;
+	ts->r[0] = (uintptr_t)thread;
+
+	/* Incase of needresume, suspend is always set */
+	if (suspended) {
+		PTHREAD_MACH_CALL(thread_set_state(thread->kernel_thread,
+					   flavor,
+					   (thread_state_t) &state,
+					   count),
+			  r);
+		if (needresume)
+			PTHREAD_MACH_CALL(thread_resume(thread->kernel_thread),
+				r);
+	} else {
+		PTHREAD_MACH_CALL(thread_create_running(mach_task_self(),
+					flavor,
+					(thread_state_t) ts,
+					count,
+					&thread->kernel_thread),
+			r);
+	}
 #else
 #error _pthread_setup not defined for this architecture
 #endif