Update.

1998-03-02 17:55  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/add_n.S: Change to use ENTRY and END macro.
	* sysdeps/i386/addmul_1.S: Likewise.
	* sysdeps/i386/lshift.S: Likewise.
	* sysdeps/i386/mul_1.S: Likewise.
	* sysdeps/i386/rshift.S: Likewise.
	* sysdeps/i386/sub_n.S: Likewise.
	* sysdeps/i386/submul_1.S: Likewise.
	* sysdeps/i386/i586/add_n.S: Likewise.
	* sysdeps/i386/i586/addmul_1.S: Likewise.
	* sysdeps/i386/i586/lshift.S: Likewise.
	* sysdeps/i386/i586/mul_1.S: Likewise.
	* sysdeps/i386/i586/rshift.S: Likewise.
	* sysdeps/i386/i586/sub_n.S: Likewise.
	* sysdeps/i386/i586/submul_1.S: Likewise.

	* sysdeps/i386/sysdep.h: Extend last change.

	* sysdeps/unix/sysv/linux/i386/sysdep.h: Follow Intel's advice
	to have only one exit point for functions.

1998-03-02  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in: Fix msgfmt test.  Fix handling of //s in sysdeps
	search.

1998-03-02 13:28  Ulrich Drepper  <drepper@cygnus.com>

	* Makerules: Generate libc.so with absolute paths for the used
	shared objects.

	* config.make.in: Add MAKEINFO definition.

1998-03-02  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/sysdep.h (ASM_SIZE_DIRECTIVE): Add ; at the end.
	(ENTRY): Use STABS_FUN.
	(END): Use STABS_FUN_END.
	(STABS_FUN, STABS_FUN2, STABS_FUN_END): New macro to emit stabs info.

	* elf/Makefile: Add rules to build sprof program.
	* elf/sprof.c: New file.

1998-02-28  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* misc/syslog.c (openlog_internal): Insert missing closing brace.

1998-02-06  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* configure.in: Check for working msgfmt version (from GNU gettext
	0.10 or later).

1998-03-02  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in: Avoid //s in sysdirs.
	Patch by Roland McGrath.

	* stdlib/a64l.c (a64l): Rewrite by Joe Keane <jgk@jgk.org>.

1998-03-02 07:17  H.J. Lu  <hjl@gnu.org>

	* elf/dl-open.c (_dl_open): Update _dl_global_scope_end when
	setting _dl_global_scope for RTLD_GLOBAL.

1998-02-27  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/make-syscalls.sh: Fix last change so that all
	possible lists of object-suffixes are taken care of.

1998-03-02 10:16  Ulrich Drepper  <drepper@cygnus.com>

	* timezone/private.h: Update from tzcode1998c.
	* timezone/zic.c: Likewise.
	* timezone/antarctica: Updated from tzdata1998c.
	* timezone/asia: Likewise.
	* timezone/australasia: Likewise.
	* timezone/europe: Likewise.
	* timezone/southamerica: Likewise.

1998-03-02  Ulrich Drepper  <drepper@cygnus.com>

	* posix/glob.c (glob_in_dir): Add support for cases insensitive
	VMS.  Patch by John W. Eaton <jwe@bevo.che.wisc.edu>.

7 files changed, 158 insertions, 91 deletions

diff --git a/timezone/antarctica b/timezone/antarctica
index 1e6e73eff2..c4dc3e4180 100644
--- a/timezone/antarctica
+++ b/timezone/antarctica
@@ -1,4 +1,4 @@
-# @(#)antarctica	7.12
+# @(#)antarctica	7.13
 
 # From Paul Eggert (1997-03-28):
 # To keep things manageable, we list only locations occupied year-round;
@@ -51,10 +51,10 @@ Zone Antarctica/Mawson	0	-	___	1954 Feb 13
 			6:00	-	MAWT	# Mawson Time
 # References:
 # <a href="http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html">
-# http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html (1996-07-15)
+# Casey Weather (1998-02-26)
 # </a>
 # <a href="http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html">
-# http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html (1996-04-19)
+# Mawson Station, Antarctica (1998-02-25)
 # </a>
 
 # Brazil - year-round base
@@ -104,7 +104,7 @@ Zone Antarctica/DumontDUrville 0 -	___	1947
 			10:00	-	DDUT	# Dumont-d'Urville Time
 # Reference:
 # <a href="http://www.icair.iac.org.nz/science/reports/fr/IFRTP.html">
-# Support and Development of Polar Research and Technology (1996-09-10)
+# Support and Development of Polar Research and Technology (1997-02-03)
 # </a>
 
 
@@ -212,9 +212,8 @@ Zone Antarctica/McMurdo	0	-	___	1956
 # at that time (1957).  (Source: Siple's book 90 degrees SOUTH.)
 #
 # From Susan Smith
-# <a href="http://www.cybertours.com/whs/pole10.html">
-# http://www.cybertours.com/whs/pole10.html (1995-11-13 16:24:56 +1300):
-# </a>
+# http://www.cybertours.com/whs/pole10.html
+# (1995-11-13 16:24:56 +1300, no longer available):
 # We use the same time as McMurdo does.
 # And they use the same time as Christchurch, NZ does....
 # One last quirk about South Pole time.
diff --git a/timezone/asia b/timezone/asia
index c7180eb408..de1a379846 100644
--- a/timezone/asia
+++ b/timezone/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.35
+# @(#)asia	7.36
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -154,7 +154,7 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
 			8:00	-	ICT	1931 May
 			7:00	-	ICT
 
-# People's Republic of China
+# China
 
 # From Guy Harris:
 # People's Republic of China.  Yes, they really have only one time zone.
@@ -237,7 +237,7 @@ Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
 
 ###############################################################################
 
-# Republic of China
+# Taiwan
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Taiwan	1945	1951	-	May	1	0:00	1:00	D
@@ -354,7 +354,7 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 # From Paul Eggert (1996-12-17), following up a suggestion by Rich Wales:
 # Ahmea Alavi in
 # <a href="http://tehran.stanford.edu/Iran_Lib/Calendar/taghveem.txt">
-# http://tehran.stanford.edu/Iran_Lib/Calendar/taghveem.txt (1993-08-04)
+# TAGHVEEM (1993-08-04)
 # </a>
 # writes ``Daylight saving time in Iran starts from the first day
 # of Farvardin and ends the first day of Mehr.''  This disagrees with the SSIM:
@@ -677,7 +677,7 @@ Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
 
 ###############################################################################
 
-# Korea
+# Korea (North and South)
 
 # From Guy Harris:
 # According to someone at the Korean Times in San Francisco,
@@ -779,9 +779,9 @@ Zone	Indian/Maldives	4:54:00 -	LMT	1880	# Male
 			5:00	-	MVT		# Maldives Time
 
 # Mongolia
-# Shanks says that Mongolia has three time zones, but usno1995 and
-# <a href="http://www.odci.gov/cia/publications/95fact/802389h.gif">
-# http://www.odci.gov/cia/publications/95fact/802389h.gif (1995)
+# Shanks says that Mongolia has three time zones, but usno1995 and the CIA map
+# <a href="http://www.odci.gov/cia/publications/nsolo/rmap-pdf/802483.pdf">
+# Standard Time Zones of the World (1997-01)
 # </a>
 # both say that it has just one.
 # Let's comment out the western and eastern Mongolian time zones
@@ -827,6 +827,61 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:00	-	PKT	# Pakistan Time
 
 # Palestine
+
+# From Amos Shapir <amos@nsof.co.il> (1998-02-15):
+#
+# From 1917 until 1948-05-15, all of Palestine, including the parts now
+# known as the Gaza Strip and the West Bank, was under British rule.
+# Therefore the rules given for Israel for that period, apply there too...
+#
+# The Gaza Strip was under Egyptian rule between 1948-05-15 until 1967-06-05
+# (except a short occupation by Israel from 1956-11 till 1957-03, but no
+# time zone was affected then).  It was never formally annexed to Egypt,
+# though.
+#
+# The rest of Palestine was under Jordanian rule at that time, formally
+# annexed in 1950 as the West Bank (and the word "Trans" was dropped from
+# the country's previous name of "the Hashemite Kingdom of the
+# Trans-Jordan").  So the rules for Jordan for that time apply.  Major
+# towns in that area are Nablus (Shchem), El-Halil (Hebron), Ramallah, and
+# East Jerusalem.
+#
+# Both areas were occupied by Israel in June 1967, but not annexed (except
+# for East Jerusalem).  They were on Israel time since then; there might
+# have been a Military Governor's order about time zones, but I'm not aware
+# of any (such orders may have been issued semi-annually whenever summer
+# time was in effect, but maybe the legal aspect of time was just neglected).
+#
+# The Palestinian Authority was established in 1993, and got hold of most
+# towns in the West Bank and Gaza by 1995.  I know that in order to
+# demonstrate...independence, they have been switching to
+# summer time and back on a different schedule than Israel's, but I don't
+# know when this was started, or what algorithm is used (most likely the
+# Jordanian one).
+#
+# To summarize, the table should probably look something like that:
+#
+# Area \ when | 1918-1947 | 1948-1967 | 1967-1995 | 1996-
+# ------------+-----------+-----------+-----------+-----------
+# Israel      | Zion      | Zion      | Zion      | Zion
+# West bank   | Zion      | Jordan    | Zion      | Jordan
+# Gaza        | Zion      | Egypt     | Zion      | Jordan
+#
+# I guess more info may be available from the PA's web page (if/when they
+# have one).
+
+# From Paul Eggert (1998-02-25):
+# Shanks writes that Gaza did not observe DST until 1957, but we'll go
+# with Shapir and assume that it observed DST from 1940 through 1947,
+# and that it used Jordanian rules starting in 1996.
+# We don't yet need a separate entry for the West Bank, since
+# the only differences between it and Gaza that we know about
+# occurred before our cutoff date of 1970.
+# However, as we get more information, we may need to add entries
+# for parts of the West Bank as they transitioned from Israel's rules
+# to Palestine's rules.  If you have more info about this, please
+# send it to tz@elsie.nci.nih.gov for incorporation into future editions.
+
 # These rules for Egypt are stolen from the `africa' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
@@ -837,9 +892,10 @@ Rule EgyptAsia	1959	1965	-	Sep	30	3:00	0	-
 Rule EgyptAsia	1966	only	-	Oct	 1	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-			2:00	-	EET	1957 May 10
-			2:00 EgyptAsia	EE%sT	1967 Jun 30
-			2:00	Zion	I%sT
+			2:00	Zion	EET	1948 May 15
+			2:00 EgyptAsia	EE%sT	1967 Jun  5
+			2:00	Zion	I%sT	1996
+			2:00	Jordan	EE%sT
 
 # Paracel Is
 # no information
@@ -890,17 +946,17 @@ Zone	Asia/Singapore	6:55:24 -	LMT	1880
 # Sri Lanka
 # From Paul Eggert (1996-09-03):
 # <a href="http://www.virtual-pc.com/lankaweb/news/items/240596-2.html">
-# http://www.virtual-pc.com/lankaweb/news/items/240596-2.html (1996-05-24)
+# Sri Lanka advances clock by an hour to avoid blackout (1996-05-24)
 # </a>
 # reported ``the country's standard time will be put forward by one hour at
 # midnight Friday (1830 GMT) `in the light of the present power crisis'.''
 # Transitions before 1996 are from Shanks (1991).
 #
 # From Dharmasiri Senanayake, Sri Lanka Media Minister (1996-10-24), as quoted
-# in
+# by Shamindra in
 # <a href="news:54rka5$m5h@mtinsc01-mgt.ops.worldnet.att.net">
-# news:54rka5$m5h@mtinsc01-mgt.ops.worldnet.att.net (1996-10-26):
-# </a>
+# Daily News - Hot News Section (1996-10-26)
+# </a>:
 # With effect from 12.30 a.m. on 26th October 1996
 # Sri Lanka will be six (06) hours ahead of GMT.
 
@@ -990,14 +1046,6 @@ Zone	Asia/Tashkent	4:37:12 -	LMT	1924 May  2
 			5:00	-	UZT		    # Uzbekistan Time
 # Shanks has Tashkent using DST after 1991, but usno1995 says they don't.
 # Guess no DST after 1991.
-# <a href="http://www.odci.gov/cia/publications/95fact/802389h.gif">
-# http://www.odci.gov/cia/publications/95fact/802389h.gif (1995)
-# </a>
-# says that Uzbekistan has two time zones, but a cable
-# <a href="http://www.itaiep.doc.gov/bisnis/cables/960510uz.html">
-# http://www.itaiep.doc.gov/bisnis/cables/960510uz.html (1996-05-10)
-# </a>
-# from the American Embassy in Tashkent implies that they have just one.
 
 # Vietnam
 # From Paul Eggert <eggert@twinsun.com> (1993-11-18):
diff --git a/timezone/australasia b/timezone/australasia
index 5121cd32fd..2bb3a0a771 100644
--- a/timezone/australasia
+++ b/timezone/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	7.39
+# @(#)australasia	7.40
 # This file also includes Pacific islands.
 
 # Notes are at the end of this file
@@ -213,21 +213,6 @@ Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct	# Papeete
 Zone	Pacific/Guam	 9:39:00 -	LMT	1901		# Agana
 			10:00	-	GST
 
-# Howland, Baker
-# uninhabited since World War II
-# no information; was probably like Pacific/Pago_Pago
-
-# Jarvis
-# uninhabited since 1958
-# no information; was probably like Pacific/Kiritimati
-
-# Johnston
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Johnston	-10:00	-	HST
-
-# Kingman
-# uninhabited
-
 # Kiribati
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Tarawa	 11:32:04 -	LMT	1901		# Bairiki
@@ -352,9 +337,6 @@ Zone	Pacific/Norfolk	11:11:52 -	LMT	1901		# Kingston
 Zone Pacific/Palau	8:57:56 -	LMT	1901		# Koror
 			9:00	-	PWT	# Palau Time
 
-# Palmyra
-# uninhabited since World War II; was probably like Pacific/Kiritimati
-
 # Papua New Guinea
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
@@ -402,6 +384,33 @@ Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
 Zone Pacific/Funafuti	11:56:52 -	LMT	1901
 			12:00	-	TVT	# Tuvalu Time
 
+
+# US minor outlying islands
+
+# Howland, Baker
+# uninhabited since World War II
+# no information; was probably like Pacific/Pago_Pago
+
+# Jarvis
+# uninhabited since 1958
+# no information; was probably like Pacific/Kiritimati
+
+# Johnston
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Johnston	-10:00	-	HST
+
+# Kingman
+# uninhabited
+
+# Palmyra
+# uninhabited since World War II; was probably like Pacific/Kiritimati
+
+# Wake
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Pacific/Wake	11:06:28 -	LMT	1901
+			12:00	-	WAKT	# Wake Time
+
+
 # Vanuatu
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Vanuatu	1983	only	-	Sep	25	0:00	1:00	S
@@ -414,11 +423,6 @@ Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	S
 Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13		# Vila
 			11:00	Vanuatu	VU%sT	# Vanuatu Time
 
-# Wake
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Wake	11:06:28 -	LMT	1901
-			12:00	-	WAKT	# Wake Time
-
 # Wallis and Futuna
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Wallis	12:15:20 -	LMT	1901
@@ -517,16 +521,15 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # 
 # NSW (including LHI and Broken Hill):
 # <a href="http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html">
-# http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html
+# Standard Time Act 1987 (updated 1995-04-04)
 # </a>
 # ACT
-# <a href="http://www.austlii.edu.au/au/legis/act/consol_act/consol_act/stasta1972279/i">
-# http://www.austlii.edu.au/au/legis/act/consol_act/consol_act/stasta1972279/i
+# <a href="http://www.austlii.edu.au/au/legis/act/consol_act/consol_act/stasta1972279/index.html">
+# Standard Time and Summer Time Act 1972
 # </a>
-# ndex.html
 # SA
 # <a href="http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html">
-# http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html
+# Standard Time Act, 1898
 # </a>
 
 # Northern Territory
diff --git a/timezone/europe b/timezone/europe
index dbaa01f2f4..0df00f3a69 100644
--- a/timezone/europe
+++ b/timezone/europe
@@ -1,4 +1,4 @@
-# @(#)europe	7.52
+# @(#)europe	7.53
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -65,7 +65,7 @@
 
 ###############################################################################
 
-# United Kingdom
+# Britain (United Kingdom) and Ireland (Eire)
 # The UK and its colonies adopted the Gregorian calendar on 1752-09-14.
 
 # From Peter Ilieve <peter@memex.co.uk> (1994-07-06):
@@ -1132,7 +1132,7 @@ Zone	Europe/Prague	0:57:44 -	LMT	1850
 			1:00	Czech	CE%sT	1979
 			1:00	EU	CE%sT
 
-# Denmark
+# Denmark, Faeroe Islands, and Greenland
 # Gregorian calendar adopted 1700-03-01.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Denmark	1916	only	-	May	14	23:00	1:00	S
@@ -1464,7 +1464,7 @@ Zone Atlantic/Reykjavik	-1:27:24 -	LMT	1837
 # From Paul Eggert (1996-05-06):
 # For Italian DST we have three sources: Shanks, Whitman, and F. Pollastri
 # <a href="http://pisolo.cstv.to.cnr.it/toi/uk/ienitlt.html">
-# http://pisolo.cstv.to.cnr.it/toi/uk/ienitlt.html (1996-03-14)
+# Day-light Saving Time in Italy (1996-03-14)
 # </a>
 # (`FP' below), taken from an Italian National Electrotechnical Institute
 # publication. When the three sources disagree, guess who's right, as follows:
@@ -1712,11 +1712,9 @@ Zone	Europe/Oslo	0:43:00 -	LMT	1895
 			1:00	C-Eur	CE%sT	1945 Apr  2  2:00
 			1:00	Norway	CE%sT	1980
 			1:00	EU	CE%sT
-#
-# Svalbard
+
+# Svalbard & Jan Mayen
 Link	Europe/Oslo	Arctic/Longyearbyen
-#
-# Jan Mayen
 # From Whitman:
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Jan_Mayen	-1:00	-	EGT
@@ -2084,9 +2082,10 @@ Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
 # Sweden
 
 # From: msb@sq.com (Mark Brader)
-# <a href=news:1996Jul6.012937.29190@sq.com>
-# news:1996Jul6.012937.29190@sq.com
-# </a>:
+# <a href="news:1996Jul6.012937.29190@sq.com">
+# Subject: Re: Gregorian reform -- a part of locale?
+# </a>
+# Date: 1996-07-06
 #
 # In 1700, Denmark made the transition from Julian to Gregorian.  Sweden
 # decided to *start* a transition in 1700 as well, but rather than have one of
diff --git a/timezone/private.h b/timezone/private.h
index 7f98a67391..f36541c19f 100644
--- a/timezone/private.h
+++ b/timezone/private.h
@@ -21,7 +21,7 @@
 
 #ifndef lint
 #ifndef NOID
-static char	privatehid[] = "@(#)private.h	7.46";
+static char	privatehid[] = "@(#)private.h	7.47";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -46,6 +46,10 @@ static char	privatehid[] = "@(#)private.h	7.46";
 #define HAVE_STRERROR		0
 #endif /* !defined HAVE_STRERROR */
 
+#ifndef HAVE_SYMLINK
+#define HAVE_SYMLINK		1
+#endif /* !defined HAVE_SYMLINK */
+
 #ifndef HAVE_UNISTD_H
 #define HAVE_UNISTD_H		1
 #endif /* !defined HAVE_UNISTD_H */
diff --git a/timezone/southamerica b/timezone/southamerica
index f53355c4c0..f2bf217063 100644
--- a/timezone/southamerica
+++ b/timezone/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica	7.22
+# @(#)southamerica	7.23
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -274,8 +274,25 @@ Rule	Brazil	1992	only	-	Feb	 9	 0:00	0	S
 Rule	Brazil	1993	1995	-	Oct	Sun>=11	 0:00	1:00	D
 Rule	Brazil	1993	only	-	Jan	31	 0:00	0	S
 Rule	Brazil	1994	1995	-	Feb	Sun>=15	 0:00	0	S
-Rule	Brazil	1996	max	-	Feb	Sun>=11	 0:00	0	S
-Rule	Brazil	1996	max	-	Oct	Sun>=1	 0:00	1:00	D
+Rule	Brazil	1996	only	-	Feb	Sun>=11	 0:00	0	S
+Rule	Brazil	1996	only	-	Oct	Sun>=1	 0:00	1:00	D
+# From Daniel C. Sobral <dcs@gns.com.br> (1998-02-12):
+# In 1997, the DS began on October 6. The stated reason was that
+# because international television networks ignored Brazil's policy on DS,
+# they bought the wrong times on satellite for coverage of Pope's visit.
+# This year, the ending date of DS was postponed to March 1
+# to help dealing with the shortages of electric power.
+#
+# From Paul Eggert (1998-02-25):
+# Reference for 1997-10-06 change:
+# <a href="http://churchnet.ucsm.ac.uk/news/files2/news165.htm">
+# Brazil Prepares for Papal Visit
+# </a>,
+# Church Net UK (1997-10-02).
+Rule	Brazil	1997	only	-	Oct	 6	 0:00	1:00	D
+Rule	Brazil	1998	only	-	Mar	 1	 0:00	0	S
+Rule	Brazil	1998	max	-	Oct	Sun>=1	 0:00	1:00	D
+Rule	Brazil	1999	max	-	Feb	Sun>=11	 0:00	0	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
diff --git a/timezone/zic.c b/timezone/zic.c
index adec622672..2397a7841e 100644
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] = "@(#)zic.c	7.93";
+static char	elsieid[] = "@(#)zic.c	7.94";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -601,23 +601,20 @@ const char * const	tofile;
 	if (!itsdir(toname))
 		(void) remove(toname);
 	if (link(fromname, toname) != 0) {
-		int failure = errno;
-		if (failure == ENOENT)
-			if (mkdirs(toname) != 0)
-				failure = errno;
-			else if (link(fromname, toname) == 0)
-				failure = 0;
-			else
-				failure = errno;
-#ifndef MISSING_SYMLINK
-		if (failure == EXDEV)
-			if (symlink(fromname, toname) != 0)
-				failure = errno;
-			else
-				failure = 0;
+		int	result;
+
+		if (mkdirs(toname) != 0)
+			(void) exit(EXIT_FAILURE);
+		result = link(fromname, toname);
+#if (HAVE_SYMLINK - 0) 
+		if (result != 0) {
+			result = symlink(fromname, toname);
+			if (result == 0)
+warning(_("hard link failed, symbolic link used"));
+		}
 #endif
-		if (failure) {
-			const char *e = strerror(failure);
+		if (result != 0) {
+			const char *e = strerror(errno);
 
 			(void) fprintf(stderr,
 				_("%s: Can't link from %s to %s: %s\n"),