diff options
| -rw-r--r-- | newlib/ChangeLog | 10 | ||||
| -rw-r--r-- | newlib/libc/machine/powerpc/Makefile.am | 2 | ||||
| -rw-r--r-- | newlib/libc/machine/powerpc/Makefile.in | 4 | ||||
| -rw-r--r-- | newlib/libc/machine/powerpc/times.c (renamed from newlib/libc/machine/powerpc/time.c) | 0 |
4 files changed, 11 insertions, 5 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 6d62683f6..828361f53 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,4 +1,11 @@ -2002-07-19 Aldy Hernandez <aldyh@redhat.com> +2002-07-22 Jeff Johnston <jjohnstn@redhat.com> + + * libc/machine/powerpc/time.c: Removed..renamed to times.c. + * libc/machine/powerpc/times.c: New file. + * libc/machine/powerpc/Makefile.am: Change time.c to times.c. + * libc/machine/powerpc/Makefile.in: Regenerated. + +2002-07-22 Aldy Hernandez <aldyh@redhat.com> * libc/machine/powerpc/time.c: New file. * libc/machine/powerpc/Makefile.am (lib_a_SOURCES): Add @@ -13,7 +20,6 @@ * README: Change docs URL to http://sources.redhat.com/newlib/docs.html. ->>>>>>> 1.389 2002-07-19 Jeff Johnston <jjohnstn@redhat.com> * libc/sys/linux/Makefile.am: Add pathconf.c and fpathconf.c. diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am index fd8a6530a..94962c73c 100644 --- a/newlib/libc/machine/powerpc/Makefile.am +++ b/newlib/libc/machine/powerpc/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) noinst_LIBRARIES = lib.a -lib_a_SOURCES = setjmp.S time.c +lib_a_SOURCES = setjmp.S times.c lib_a_LIBADD = @extra_objs@ EXTRA_lib_a_SOURCES = @extra_sources@ lib_a_DEPENDENCIES = @extra_objs@ diff --git a/newlib/libc/machine/powerpc/Makefile.in b/newlib/libc/machine/powerpc/Makefile.in index 0f1d7c8ef..bb9a15b9c 100644 --- a/newlib/libc/machine/powerpc/Makefile.in +++ b/newlib/libc/machine/powerpc/Makefile.in @@ -91,7 +91,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) noinst_LIBRARIES = lib.a -lib_a_SOURCES = setjmp.S time.c +lib_a_SOURCES = setjmp.S times.c lib_a_LIBADD = @extra_objs@ EXTRA_lib_a_SOURCES = @extra_sources@ lib_a_DEPENDENCIES = @extra_objs@ @@ -110,7 +110,7 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_OBJECTS = setjmp.o time.o +lib_a_OBJECTS = setjmp.o times.o CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) diff --git a/newlib/libc/machine/powerpc/time.c b/newlib/libc/machine/powerpc/times.c index 64f4ddcb8..64f4ddcb8 100644 --- a/newlib/libc/machine/powerpc/time.c +++ b/newlib/libc/machine/powerpc/times.c |