--- Libc/Libc-262.2.12/sys/gettimeofday.c
+++ Libc/Libc-391/sys/gettimeofday.c
@@ -2,8 +2,6 @@
  * Copyright (c) 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
@@ -39,17 +37,6 @@
 #include <machine/cpu_capabilities.h>
 #undef	__APPLE_API_PRIVATE
 
-#ifdef __ppc__
-#define	expand(arg)	strgfy(arg)
-#define	strgfy(arg)	#arg
-
-static __attribute__ ((noinline))
-int	commpage_gettimeofday(struct timeval *tp)
-{
-    asm volatile("ba " expand(_COMM_PAGE_GETTIMEOFDAY) );
-    return 1;
-}
-#endif /* __ppc__ */
 
 int gettimeofday (struct timeval *tp, struct timezone *tzp)
 {
@@ -58,14 +45,17 @@
         struct timeval localtv;
   
         if (tp == NULL) {
+            if (tzp == NULL)
+                return	(0);
             tp = &localtv;
         }
 
-#ifdef __ppc__
+#if defined(__ppc__) || defined(__ppc64__)
         {
             extern int __ppc_gettimeofday(struct timeval *, struct timezone *);
+            extern int __commpage_gettimeofday(struct timeval *);
     
-            if (commpage_gettimeofday(tp)) {		/* first try commpage */
+            if (__commpage_gettimeofday(tp)) {		/* first try commpage */
                 if (__ppc_gettimeofday(tp,tzp)) {	/* if it fails, use syscall */
                     return (-1);
                 }