--- Libc/Libc-262.3.2/mach/mach_init.c
+++ Libc/Libc-391/mach/mach_init.c
@@ -2,8 +2,6 @@
  * Copyright (c) 1999 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
@@ -62,6 +60,8 @@
 __private_extern__ kern_return_t _host_mach_msg_trap_return_;
 
 vm_size_t	vm_page_size;
+vm_size_t	vm_page_mask;
+int		vm_page_shift;
 
 /*
  * Forward internal declarations for automatic mach_init during
@@ -73,9 +73,11 @@
 static void mach_atfork_child_routine(void);
 static boolean_t first = TRUE;
 static void (*previous_atfork_child_routine)(void);
+static boolean_t mach_init_inited = FALSE;
 extern int mach_init(void);
 extern void _pthread_set_self(void *);
 extern void cthread_set_self(void *);
+extern void other_libc_init(void);
 
 
 static void mach_atfork_child_routine(void)
@@ -92,6 +94,7 @@
 	if (previous_atfork_child_routine) {
 		(*previous_atfork_child_routine)();
 	}
+	mach_init_inited = FALSE;
 	mach_init();
 }
 
@@ -103,7 +106,6 @@
 
 int mach_init_doit(int forkchild)
 {
-	mach_msg_type_number_t host_info_size;
 	host_t host;
 
 	/*
@@ -140,15 +142,25 @@
 	 *	Cache some other valuable system constants
 	 */
 
-#ifdef HOST_MACH_MSG_TRAP	
-	host_info_size = 0;
-        _host_mach_msg_trap_return_ = host_info(host,
-                                           HOST_MACH_MSG_TRAP,
-                                           0,
-                                           &host_info_size);
+#if defined(__ppc64__) /* NGK hack for now */
+	vm_page_size = 4096;
+#else
+	(void)host_page_size(host, &vm_page_size);
 #endif
-
-	(void)host_page_size(host, &vm_page_size);
+	vm_page_mask = vm_page_size - 1;
+	if (vm_page_size == 0) {
+		/* guard against unlikely craziness */
+		vm_page_shift = 0;
+	} else {
+		/*
+		 * Unfortunately there's no kernel interface to get the
+		 * vm_page_shift, but it's easy enough to calculate.
+		 */
+		for (vm_page_shift = 0;
+		     (vm_page_size & (1 << vm_page_shift)) == 0;
+		     vm_page_shift++)
+			continue;
+	}
 
 	mach_port_deallocate(mach_task_self_, host);
 
@@ -200,12 +212,35 @@
 			     VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
 		/* ignore result, we don't care if it failed */
 	}
+
 	return(0);
 }
 
+#ifdef __DYNAMIC__
+/* libc_initializer is the dyld initializer for libc (3760827) */
+static void libc_initializer() __attribute__((constructor));
+static void
+libc_initializer()
+{
+	mach_init();
+}
+#endif /* __DYNAMIC__ */
+
+/* mach_init may get called from the initializer and from crt.c, but only
+ * call mach_init_doit() once */
 int mach_init(void)
 {
-        return(mach_init_doit(0));
+	int ret;
+
+	if (mach_init_inited)
+		return(0);
+	mach_init_inited = TRUE;
+	ret = mach_init_doit(0);
+
+	/* Do other Libc initialization */
+	other_libc_init();
+
+	return ret;
 }
 
 int	(*mach_init_routine)(void) = mach_init;