Libc-391.5.18.tar.gz

[apple/libc.git] / sys / gettimeofday.c

diff --git a/sys/gettimeofday.c b/sys/gettimeofday.c
index eb5bca75eac0c0cca8936283e9a0b7cbf5e2869f..959bbf5999903c622a642d3c4afd6e654adb2aba 100644 (file)
--- a/sys/gettimeofday.c
+++ b/sys/gettimeofday.c
@@ -1,10 +1,8 @@
 /*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2005 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
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -39,43 +37,27 @@
 #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)
 {
+               extern int __gettimeofday(struct timeval *, struct timezone *);
+               extern int __commpage_gettimeofday(struct timeval *);
         static int validtz = 0;
         static struct timezone cached_tz = {0};
-        struct timeval localtv;
+        struct timeval atv;
   
         if (tp == NULL) {
-            tp = &localtv;
+            if (tzp == NULL)
+                return (0);
+            tp = &atv;
         }
 
-#ifdef __ppc__
-        {
-            extern int __ppc_gettimeofday(struct timeval *, struct timezone *);
-    
-            if (commpage_gettimeofday(tp)) {           /* first try commpage */
-                if (__ppc_gettimeofday(tp,tzp)) {      /* if it fails, use syscall */
-                    return (-1);
-                }
-            }
-        }
-#else
-        if (syscall (SYS_gettimeofday, tp, tzp) < 0) {
-                return (-1);
-        }
-#endif
+               if (__commpage_gettimeofday(tp)) {              /* first try commpage */
+                       if (__gettimeofday(tp, tzp) < 0) {      /* if it fails, use syscall */
+                               return (-1);
+                       }
+               }
+
         if (tzp) {
             if (validtz == 0)  {
                 struct tm *localtm = localtime ((time_t *)&tp->tv_sec);