JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2013-05-30 Jeff Johnston <jjohnstn@redhat.com>

Browse Source 
* libc/machine/powerpc/times.c: Moved to libgloss/rs6000.
        * libc/machine/powerpc/Makefile.am: Remove times.c.
        * libc/machine/powerpc/Makefile.in: Regenerated.
This commit is contained in:
Jeff Johnston 2013-05-30 22:44:41 +00:00
parent 6d28d61df0
commit d15bce48e7
4 changed files with 11 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
newlib/ChangeLog
View File

@ -1,4 +1,10 @@
2013-05-13 Joey Ye <joey.ye@arm.com> 2013-05-30 Jeff Johnston <jjohnstn@redhat.com>
* libc/machine/powerpc/times.c: Moved to libgloss/rs6000.
* libc/machine/powerpc/Makefile.am: Remove times.c.
* libc/machine/powerpc/Makefile.in: Regenerated.
2013-05-29 Joey Ye <joey.ye@arm.com>
Bin Cheng <bin.cheng@arm.com> Bin Cheng <bin.cheng@arm.com>
* configure.in (--enable-newlib-nano-malloc): New option. * configure.in (--enable-newlib-nano-malloc): New option.

2
newlib/libc/machine/powerpc/Makefile.am
View File

@ -10,7 +10,7 @@ noinst_LIBRARIES = lib.a
AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
lib_a_SOURCES = setjmp.S times.c lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS=$(AM_CCASFLAGS) lib_a_CCASFLAGS=$(AM_CCASFLAGS)
lib_a_CFLAGS=$(AM_CFLAGS) lib_a_CFLAGS=$(AM_CFLAGS)
lib_a_LIBADD = @extra_objs@ lib_a_LIBADD = @extra_objs@

18
newlib/libc/machine/powerpc/Makefile.in
View File

@ -68,7 +68,7 @@ CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES) LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru ARFLAGS = cru
lib_a_AR = $(AR) $(ARFLAGS) lib_a_AR = $(AR) $(ARFLAGS)
am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT) am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
lib_a_OBJECTS = $(am_lib_a_OBJECTS) lib_a_OBJECTS = $(am_lib_a_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = depcomp =
@ -197,7 +197,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
AM_CCASFLAGS = $(INCLUDES) AM_CCASFLAGS = $(INCLUDES)
noinst_LIBRARIES = lib.a noinst_LIBRARIES = lib.a
AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
lib_a_SOURCES = setjmp.S times.c lib_a_SOURCES = setjmp.S
lib_a_CCASFLAGS = $(AM_CCASFLAGS) lib_a_CCASFLAGS = $(AM_CCASFLAGS)
lib_a_CFLAGS = $(AM_CFLAGS) lib_a_CFLAGS = $(AM_CFLAGS)
lib_a_LIBADD = @extra_objs@ lib_a_LIBADD = @extra_objs@
@ -208,7 +208,7 @@ VEC_MALLOC_COMPILE = $(COMPILE) -DINTERNAL_NEWLIB
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .S .c .o .obj .SUFFIXES: .S .o .obj
am--refresh: Makefile am--refresh: Makefile
@: @:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@ -269,18 +269,6 @@ lib_a-setjmp.o: setjmp.S
lib_a-setjmp.obj: setjmp.S lib_a-setjmp.obj: setjmp.S
$(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi` $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi`
.c.o:
$(COMPILE) -c $<
.c.obj:
$(COMPILE) -c `$(CYGPATH_W) '$<'`
lib_a-times.o: times.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c
lib_a-times.obj: times.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \

36
newlib/libc/machine/powerpc/times.c
View File

@ -1,36 +0,0 @@
/* Time support routines for PowerPC.
*
* Written by Aldy Hernandez.
*/
#include <_ansi.h>
#include <reent.h>
#include <sys/time.h>
#include <sys/times.h>
#include <sys/resource.h>
clock_t
times (struct tms *tp)
{
struct rusage usage;
union {
struct rusage r;
/* Newlib's rusage has only 2 fields. We need to make room for
when we call the system's rusage. This should be enough. */
int filler[32];
} host_ru;
getrusage (RUSAGE_SELF, (void *)&host_ru);
if (tp)
{
tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000
+ host_ru.r.ru_utime.tv_usec;
tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000
+ host_ru.r.ru_stime.tv_usec;
tp->tms_cutime = 0; /* user time, children */
tp->tms_cstime = 0; /* system time, children */
}
return tp->tms_utime;
}