change log for rtems (2010-08-15)

[rtems-vc at rtems.org]

 *joel*:
2010-08-15	Joel Sherrill <joel.sherrilL at OARcorp.com>

	* startup/syscalls.c:

M    1.8  c/src/lib/libbsp/arm/gdbarmsim/ChangeLog
M    1.4  c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c

diff -u rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog:1.7 rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog:1.8
--- rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog:1.7	Sat May 15 07:29:46 2010
+++ rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog	Sun Aug 15 17:50:13 2010
@@ -1,3 +1,7 @@
+2010-08-15	Joel Sherrill <joel.sherrilL at OARcorp.com>
+
+	* startup/syscalls.c:
+
 2010-05-15	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	* startup/syscalls.c: Rename to avoid conflict with newlib.

diff -u rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c:1.3 rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c:1.4
--- rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c:1.3	Sat May 15 07:29:46 2010
+++ rtems/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c	Sun Aug 15 17:50:13 2010
@@ -760,6 +760,7 @@
   return timeval;
 }
 
+#if !defined(__rtems__)
 /* Return a clock that ticks at 100Hz.  */
 clock_t
 _times (struct tms * tp)
@@ -776,6 +777,7 @@
 
   return timeval;
 };
+#endif
 
 
 int


 *joel*:
Add comment.

M    1.9  c/src/lib/libbsp/arm/gdbarmsim/ChangeLog

diff -u rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog:1.8 rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog:1.9
--- rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog:1.8	Sun Aug 15 17:50:13 2010
+++ rtems/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog	Sun Aug 15 17:51:01 2010
@@ -1,6 +1,8 @@
 2010-08-15	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
-	* startup/syscalls.c:
+	* startup/syscalls.c: ifdef out _times since it conflicts with
+	RTEMS internal one.  Besides we only use the simulator syscalls
+	for console IO.
 
 2010-05-15	Joel Sherrill <joel.sherrilL at OARcorp.com>
 



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100815/4f069101/attachment-0001.html>