From 88d594a3d52cb5938521619bca0def8e5b040cf0 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 24 May 1995 21:39:42 +0000
Subject: Fully tested on all in-house targets

---
 cpukit/libcsupport/src/__brk.c    |  6 ++++-
 cpukit/libcsupport/src/__gettod.c | 51 +++++++++++++++++++++++++++------------
 cpukit/libcsupport/src/newlibc.c  | 10 ++++----
 3 files changed, 45 insertions(+), 22 deletions(-)

(limited to 'cpukit/libcsupport')

diff --git a/cpukit/libcsupport/src/__brk.c b/cpukit/libcsupport/src/__brk.c
index 6fb15342fe..7c43ffa32b 100644
--- a/cpukit/libcsupport/src/__brk.c
+++ b/cpukit/libcsupport/src/__brk.c
@@ -1,3 +1,5 @@
+#if !defined(RTEMS_UNIX)
+
 /*
  *  RTEMS "Broken" __brk/__sbrk Implementation
  *
@@ -12,7 +14,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  __brk.c,v 1.2 1995/05/09 20:24:28 joel Exp
  */
 
 #include <rtems.h>
@@ -38,3 +40,5 @@ int __brk( const void *endds )
   errno = EINVAL;
   return -1;
 }
+
+#endif
diff --git a/cpukit/libcsupport/src/__gettod.c b/cpukit/libcsupport/src/__gettod.c
index a1ab9776c8..6f8df8a65f 100644
--- a/cpukit/libcsupport/src/__gettod.c
+++ b/cpukit/libcsupport/src/__gettod.c
@@ -11,7 +11,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  $Id$
+ *  __gettod.c,v 1.2 1995/05/09 20:24:31 joel Exp
  */
 
 #include <rtems.h>
@@ -19,8 +19,10 @@
 #ifdef RTEMS_NEWLIB
 #include <sys/reent.h>
 #endif
+
 #include <time.h>
 #include <sys/time.h>
+
 #include <errno.h>
 #include <assert.h>
 
@@ -29,14 +31,14 @@
  */
 
 int gettimeofday(
-   struct timeval  *tp,
-   struct timezone *tzp
+  struct timeval  *tp,
+  struct timezone *tzp
 )
 {
   rtems_status_code      status;
   rtems_clock_time_value time;
 
-  if ( !tp || !tzp ) {
+  if ( !tp ) {
     errno = EFAULT;
     return -1;
   }
@@ -51,34 +53,51 @@ int gettimeofday(
   tp->tv_sec  = time.seconds;
   tp->tv_usec = time.microseconds;
 
-#if 0
-  tzp->minuteswest = timezone / 60; /* from seconds to minutes */
-  tzp->dsttime = daylight;
-#endif
-
   /*
    * newlib does not have timezone and daylight savings time
    * yet.  When it does this needs to be fixed.
    */
 
-  tzp->tz_minuteswest = 0;  /* at UTC */
-  tzp->tz_dsttime = 0;      /* no daylight savings */
+  if ( tzp ) {
+    tzp->tz_minuteswest = 0;  /* at UTC */
+    tzp->tz_dsttime = 0;      /* no daylight savings */
+#if 0
+  tzp->minuteswest = timezone / 60; /* from seconds to minutes */
+  tzp->dsttime = daylight;
+#endif
+  }
   return 0;
 }
 
+#if defined(RTEMS_NEWLIB) 
+
+#if 0
 /*
- *  "Reentrant" versions of the above routines implemented above.
+ *  "Reentrant" version
  */
 
-#if 0
 int _gettimeofday_r(
-   struct _reent   *ignored_reentrancy_stuff,
-   struct timeval  *tp,
-   struct timezone *tzp
+  struct _reent   *ignored_reentrancy_stuff,
+  struct timeval  *tp,
+  struct timezone *tzp
 )
 {
   return gettimeofday( tp, tzp );
 }
 #endif
 
+/*
+ *  "System call" version 
+ */
+
+int _gettimeofday(
+  struct timeval  *tp,
+  struct timezone *tzp
+)
+{
+  return gettimeofday( tp, tzp );
+}
+
+#endif /* defined(RTEMS_NEWLIB) */
+
 #endif
diff --git a/cpukit/libcsupport/src/newlibc.c b/cpukit/libcsupport/src/newlibc.c
index 3c5e58b67c..39dea67775 100644
--- a/cpukit/libcsupport/src/newlibc.c
+++ b/cpukit/libcsupport/src/newlibc.c
@@ -1,16 +1,16 @@
 /*
- *	@(#)newlibc.c	1.8 - 95/04/25
+ *	@(#)newlibc.c	1.9 - 95/05/16
  *	
  */
 
 #if defined(RTEMS_NEWLIB)
 
 /*
- *  File:	$RCSfile$
+ *  File:	newlibc.c,v
  *  Project:	PixelFlow
  *  Created:	94/12/7
- *  Revision:	$Revision$
- *  Last Mod:	$Date$
+ *  Revision:	1.2
+ *  Last Mod:	1995/05/09 20:24:37
  *
  *  COPYRIGHT (c) 1994 by Division Incorporated
  *
@@ -35,7 +35,7 @@
  *
  *  NOTE:
  *
- *  $Id$
+ *  newlibc.c,v 1.2 1995/05/09 20:24:37 joel Exp
  *
  */
 
-- 
cgit v1.2.3