diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-08-15 22:50:13 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-08-15 22:50:13 +0000 |
| commit | b6eb8b9f80acfe383de3d10e5d84f3b7cf6b3590 (patch) | |
| tree | f87eb5fc76bfd24c173031062342162f28be255a /c/src/lib/libbsp/arm/gdbarmsim | |
| parent | Remove bogusly included files. (diff) | |
| download | rtems-b6eb8b9f80acfe383de3d10e5d84f3b7cf6b3590.tar.bz2 | |
2010-08-15 Joel Sherrill <joel.sherrilL@OARcorp.com>
* startup/syscalls.c:
Diffstat (limited to 'c/src/lib/libbsp/arm/gdbarmsim')
| -rw-r--r-- | c/src/lib/libbsp/arm/gdbarmsim/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c | 2 |
2 files changed, 6 insertions, 0 deletions
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 <joel.sherrilL@OARcorp.com> + + * startup/syscalls.c: + 2010-05-15 Joel Sherrill <joel.sherrilL@OARcorp.com> * 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 |