diff options
Diffstat (limited to 'newlib/libc/time')
| -rw-r--r-- | newlib/libc/time/Makefile.am | 3 | ||||
| -rw-r--r-- | newlib/libc/time/Makefile.in | 6 | ||||
| -rw-r--r-- | newlib/libc/time/strptime.c | 11 | ||||
| -rw-r--r-- | newlib/libc/time/tzlock.c | 2 | ||||
| -rw-r--r-- | newlib/libc/time/tzset_r.c | 5 | ||||
| -rw-r--r-- | newlib/libc/time/tzvars.c | 10 |
6 files changed, 13 insertions, 24 deletions
diff --git a/newlib/libc/time/Makefile.am b/newlib/libc/time/Makefile.am index f5c9a02a7..3e0ae571a 100644 --- a/newlib/libc/time/Makefile.am +++ b/newlib/libc/time/Makefile.am @@ -23,8 +23,7 @@ LIB_SOURCES = \ time.c \ tzlock.c \ tzset.c \ - tzset_r.c \ - tzvars.c + tzset_r.c libtime_la_LDFLAGS = -Xcompiler -nostdlib diff --git a/newlib/libc/time/Makefile.in b/newlib/libc/time/Makefile.in index abdfc6530..c56c998ad 100644 --- a/newlib/libc/time/Makefile.in +++ b/newlib/libc/time/Makefile.in @@ -110,7 +110,7 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = asctime.c asctime_r.c clock.c ctime.c ctime_r.c difftime.c gettzinfo.c gmtime.c gmtime_r.c lcltime.c lcltime_r.c mktime.c mktm_r.c strftime.c strptime.c time.c tzlock.c tzset.c tzset_r.c tzvars.c +LIB_SOURCES = asctime.c asctime_r.c clock.c ctime.c ctime_r.c difftime.c gettzinfo.c gmtime.c gmtime_r.c lcltime.c lcltime_r.c mktime.c mktm_r.c strftime.c strptime.c time.c tzlock.c tzset.c tzset_r.c libtime_la_LDFLAGS = -Xcompiler -nostdlib @@ -149,7 +149,7 @@ lib_a_LIBADD = @USE_LIBTOOL_FALSE@lcltime_r.$(OBJEXT) mktime.$(OBJEXT) \ @USE_LIBTOOL_FALSE@mktm_r.$(OBJEXT) strftime.$(OBJEXT) \ @USE_LIBTOOL_FALSE@strptime.$(OBJEXT) time.$(OBJEXT) tzlock.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@tzset.$(OBJEXT) tzset_r.$(OBJEXT) tzvars.$(OBJEXT) +@USE_LIBTOOL_FALSE@tzset.$(OBJEXT) tzset_r.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) libtime_la_LIBADD = @@ -157,7 +157,7 @@ libtime_la_LIBADD = @USE_LIBTOOL_TRUE@ctime.lo ctime_r.lo difftime.lo gettzinfo.lo \ @USE_LIBTOOL_TRUE@gmtime.lo gmtime_r.lo lcltime.lo lcltime_r.lo \ @USE_LIBTOOL_TRUE@mktime.lo mktm_r.lo strftime.lo strptime.lo time.lo \ -@USE_LIBTOOL_TRUE@tzlock.lo tzset.lo tzset_r.lo tzvars.lo +@USE_LIBTOOL_TRUE@tzlock.lo tzset.lo tzset_r.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/time/strptime.c b/newlib/libc/time/strptime.c index 127772460..1d625d61e 100644 --- a/newlib/libc/time/strptime.c +++ b/newlib/libc/time/strptime.c @@ -249,12 +249,8 @@ _DEFUN (strptime, (buf, format, timeptr), timeptr->tm_year = (ret * 100) - tm_year_base; buf = s; break; - case 'c' : /* %a %b %e %H:%M:%S %Y */ - s = strptime (buf, "%a %b %e %H:%M:%S %Y", timeptr); - if (s == NULL) - return NULL; - buf = s; - break; + case 'c' : + abort (); case 'D' : /* %m/%d/%y */ s = strptime (buf, "%m/%d/%y", timeptr); if (s == NULL) @@ -416,8 +412,7 @@ _DEFUN (strptime, (buf, format, timeptr), buf = s; break; case 'Z' : - /* Unsupported. Just ignore. */ - break; + abort (); case '\0' : --format; /* FALLTHROUGH */ diff --git a/newlib/libc/time/tzlock.c b/newlib/libc/time/tzlock.c index ccfef7891..f3c289620 100644 --- a/newlib/libc/time/tzlock.c +++ b/newlib/libc/time/tzlock.c @@ -1,6 +1,6 @@ /* FUNCTION -<<__tz_lock>>, <<__tz_unlock>>---lock time zone global variables +<<__tz_lock>>, <<__tz_unlock>>--lock time zone global variables INDEX __tz_lock diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c index 36b87d7b2..49e519de5 100644 --- a/newlib/libc/time/tzset_r.c +++ b/newlib/libc/time/tzset_r.c @@ -11,6 +11,11 @@ static char __tzname_std[11]; static char __tzname_dst[11]; static char *prev_tzenv = NULL; +/* default to GMT */ +char *_tzname[2] = {"GMT", "GMT"}; +int _daylight = 0; +long _timezone = 0; + _VOID _DEFUN (_tzset_r, (reent_ptr), struct _reent *reent_ptr) diff --git a/newlib/libc/time/tzvars.c b/newlib/libc/time/tzvars.c deleted file mode 100644 index d1f17649b..000000000 --- a/newlib/libc/time/tzvars.c +++ /dev/null @@ -1,10 +0,0 @@ -#include <time.h> - -/* Global timezone variables. */ - -/* Default timezone to GMT */ -char *_tzname[2] = {"GMT", "GMT"}; -int _daylight = 0; -long _timezone = 0; - - |