Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update timezone code from tzcode 2015g.
This patch updates the timezone code from tzcode 2015g.  The Makefile
and README changes are based on those in Paul's patch
<https://sourceware.org/ml/libc-alpha/2015-05/msg00553.html>.

Tested for x86_64 and x86.

2016-01-06  Paul Eggert  <eggert@cs.ucla.edu>
	    Joseph Myers  <joseph@codesourcery.com>

	* timezone/private.h: Update from tzcode 2015g.
	* timezone/tzfile.h: Likewise.
	* timezone/tzselect.ksh: Likewise.
	* timezone/zdump.c: Likewise.
	* timezone/zic.c: Likewise.
	* timezone/ialloc.c: Remove file.
	* timezone/scheck.c: Likewise.
	* timezone/Makefile (extra-objs): Remove variable.
	($(objpfx)zic): Do not depend on scheck.o and ialloc.o.
	(tz-cflags): Add -DHAVE_GETTEXT -DUSE_LTZ=0
	-Wno-maybe-uninitialized.
	(CFLAGS-zdump.c): Remove -fwrapv -DNOID -DHAVE_GETTEXT.
	(CFLAGS-zic.c): Remove -DNOID -DHAVE_GETTEXT.
	(CFLAGS-ialloc.c): Remove variable.
	(CFLAGS-scheck.c): Likewise.
	* timezone/README: Update list of files from tzcode.
  • Loading branch information
Paul Eggert authored and Joseph Myers committed Jan 7, 2016
1 parent 45c4f36 commit 670a687
Show file tree
Hide file tree
Showing 10 changed files with 1,476 additions and 918 deletions.
20 changes: 20 additions & 0 deletions ChangeLog
@@ -1,3 +1,23 @@
2016-01-06 Paul Eggert <eggert@cs.ucla.edu>
Joseph Myers <joseph@codesourcery.com>

* timezone/private.h: Update from tzcode 2015g.
* timezone/tzfile.h: Likewise.
* timezone/tzselect.ksh: Likewise.
* timezone/zdump.c: Likewise.
* timezone/zic.c: Likewise.
* timezone/ialloc.c: Remove file.
* timezone/scheck.c: Likewise.
* timezone/Makefile (extra-objs): Remove variable.
($(objpfx)zic): Do not depend on scheck.o and ialloc.o.
(tz-cflags): Add -DHAVE_GETTEXT -DUSE_LTZ=0
-Wno-maybe-uninitialized.
(CFLAGS-zdump.c): Remove -fwrapv -DNOID -DHAVE_GETTEXT.
(CFLAGS-zic.c): Remove -DNOID -DHAVE_GETTEXT.
(CFLAGS-ialloc.c): Remove variable.
(CFLAGS-scheck.c): Likewise.
* timezone/README: Update list of files from tzcode.

2016-01-07 Khem Raj <raj.khem@gmail.com>

* argp/argp-fmtstream.c (__argp_fmtstream_free): Use fwrite_unlocked
Expand Down
13 changes: 4 additions & 9 deletions timezone/Makefile
Expand Up @@ -22,8 +22,6 @@ subdir := timezone

include ../Makeconfig

extra-objs := scheck.o ialloc.o

others := zdump zic
tests := test-tz tst-timezone tst-tzset

Expand All @@ -49,8 +47,6 @@ endif
include ../Rules


$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o

$(objpfx)zic.o $(objpfx)zdump.o: $(objpfx)version.h

$(objpfx)version.h: $(common-objpfx)config.make
Expand All @@ -61,15 +57,14 @@ $(objpfx)version.h: $(common-objpfx)config.make
tz-cflags = -DTZDIR='"$(zonedir)"' \
-DTZDEFAULT='"$(localtime-file)"' \
-DTZDEFRULES='"$(posixrules-file)"' \
-DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone
-DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone \
-DHAVE_GETTEXT -DUSE_LTZ=0 -Wno-maybe-uninitialized

# The -Wno-unused-variable flag is used to prevent GCC 6
# from warning about time_t_min and time_t_max which are
# defined in private.h but not used.
CFLAGS-zdump.c = -fwrapv -DNOID $(tz-cflags) -DHAVE_GETTEXT
CFLAGS-zic.c = -DNOID $(tz-cflags) -DHAVE_GETTEXT -Wno-unused-variable
CFLAGS-ialloc.c = -DNOID -DHAVE_GETTEXT -Wno-unused-variable
CFLAGS-scheck.c = -DNOID -DHAVE_GETTEXT -Wno-unused-variable
CFLAGS-zdump.c = $(tz-cflags)
CFLAGS-zic.c = $(tz-cflags) -Wno-unused-variable

# We have to make sure the data for testing the tz functions is available.
# Don't add leapseconds here since test-tz made checks that work only without
Expand Down
2 changes: 1 addition & 1 deletion timezone/README
@@ -1,5 +1,5 @@
The files
zic.c zdump.c ialloc.c scheck.c tzfile.h
zic.c zdump.c tzfile.h
private.h tzselect.ksh checktab.awk
come from the tzcode package by Arthur David Olson et.al.

Expand Down
32 changes: 0 additions & 32 deletions timezone/ialloc.c

This file was deleted.

0 comments on commit 670a687

Please sign in to comment.