From b6eb8b9f80acfe383de3d10e5d84f3b7cf6b3590 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 15 Aug 2010 22:50:13 +0000 Subject: 2010-08-15 Joel Sherrill * startup/syscalls.c: --- c/src/lib/libbsp/arm/gdbarmsim/ChangeLog | 4 ++++ c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c | 2 ++ 2 files changed, 6 insertions(+) (limited to 'c/src') diff --git a/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog b/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog index 7fb3aca281..310590b349 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog +++ b/c/src/lib/libbsp/arm/gdbarmsim/ChangeLog @@ -1,3 +1,7 @@ +2010-08-15 Joel Sherrill + + * startup/syscalls.c: + 2010-05-15 Joel Sherrill * startup/syscalls.c: Rename to avoid conflict with newlib. diff --git a/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c b/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c index 0985e0ee81..5582e5f01a 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c +++ b/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c @@ -760,6 +760,7 @@ _clock (void) return timeval; } +#if !defined(__rtems__) /* Return a clock that ticks at 100Hz. */ clock_t _times (struct tms * tp) @@ -776,6 +777,7 @@ _times (struct tms * tp) return timeval; }; +#endif int -- cgit v1.2.3