--- Libc/Libc-498/pthreads/thread_setup.c
+++ Libc/Libc-320/pthreads/thread_setup.c
@@ -2,6 +2,8 @@
  * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -49,7 +51,7 @@
  * Machine specific support for thread initialization
  */
 
-#if defined(__ppc__) || defined(__ppc64__)
+#if defined(__ppc__)
 #include <architecture/ppc/cframe.h>
 #endif
 
@@ -66,46 +68,39 @@
 {
         kern_return_t r;
         unsigned int count;
-#if defined(__ppc__) || defined(__ppc64__)
 #if defined(__ppc__)
-        ppc_thread_state_t state = {0};
-	ppc_thread_state_t *ts = &state;
-	thread_state_flavor_t flavor = PPC_THREAD_STATE;
-	count = PPC_THREAD_STATE_COUNT;
-#elif defined(__ppc64__)
-        ppc_thread_state64_t state = {0};
-	ppc_thread_state64_t *ts = &state;
-	thread_state_flavor_t flavor = PPC_THREAD_STATE64;
-	count = PPC_THREAD_STATE64_COUNT;
-#endif
+        struct ppc_thread_state state = {0};
+	struct ppc_thread_state *ts = &state;
+
 	/*
 	 * Set up PowerPC registers.
 	 */
+	count = PPC_THREAD_STATE_COUNT;
 	if (suspended) {
 		PTHREAD_MACH_CALL(thread_get_state(thread->kernel_thread,
-					   flavor,
+					   PPC_THREAD_STATE,
 					   (thread_state_t) &state,
 					   &count),
 			  r);
 	}
-	ts->srr0 = (uintptr_t)routine;
+	ts->srr0 = (int) routine;
         ts->r1 = (uintptr_t)vsp - C_ARGSAVE_LEN - C_RED_ZONE;
-	ts->r3 = (uintptr_t)thread;
+	ts->r3 = (int)thread;
 	/* Incase of needresume, suspend is always set */
 	if (suspended) {
 		PTHREAD_MACH_CALL(thread_set_state(thread->kernel_thread,
-					   flavor,
+					   PPC_THREAD_STATE,
 					   (thread_state_t) &state,
-					   count),
+					   PPC_THREAD_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,
+					PPC_THREAD_STATE,
 					(thread_state_t) ts,
-					count,
+					PPC_THREAD_STATE_COUNT,
 					&thread->kernel_thread),
 			r);
 	}
@@ -126,17 +121,9 @@
 			  r);
 	}
         ts->eip = (int) routine;
-
-        /*
-        ** We need to simulate a 16-byte aligned stack frame as if we had
-        ** executed a call instruction. Since we're "pushing" one argument,
-        ** we need to adjust the pointer by 12 bytes (3 * sizeof (int *))
-        */
-
-        sp -= 3;              /* make sure stack is aligned */
-        *--sp = (int) thread; /* argument to function */
-        *--sp = 0;            /* fake return address */
-        ts->esp = (int) sp;   /* set stack pointer */
+        *--sp = (int) thread;	/* argument to function */
+        *--sp = 0;		/* fake return address */
+        ts->esp = (int) sp;	/* set stack pointer */
 	/* Incase of needresume, suspend is always set */
         if (suspended) {
 		PTHREAD_MACH_CALL(thread_set_state(thread->kernel_thread,
@@ -156,53 +143,6 @@
 			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);
-	}
-
 #else
 #error _pthread_setup not defined for this architecture
 #endif