Tue Jul 23 02:49:58 1996 Ulrich Drepper <drepper@cygnus.com>

	* locale/iso-4217.def: Add India to comment for symbol "INR ".
	Reported by Raja R Harinath  <harinath@cs.umn.edu>.

Sat Jul 20 14:03:45 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/dl-machine.h (elf_machine_rela): Remove bogus
	#undef RESOLVE.

	* time/tzset.c: Include <libc-lock.h>.
	(__tzset_lock): New lock variable.
	(tzset): New function (weak defn), no longer weak alias for __tzset.
	Call __tzset while holding __tzset_lock.
	* time/localtime.c: Include <libc-lock.h>.
	(__localtime_r): Hold __tzset_lock while doing the work.

5 files changed, 61 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 206f074057..bc4f32b235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
+Tue Jul 23 02:49:58 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locale/iso-4217.def: Add India to comment for symbol "INR ".
+	Reported by Raja R Harinath  <harinath@cs.umn.edu>.
+
+Sat Jul 20 14:03:45 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/m68k/dl-machine.h (elf_machine_rela): Remove bogus
+	#undef RESOLVE.
+
 Sun Jul 21 06:48:38 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* time/tzset.c: Include <libc-lock.h>.
+	(__tzset_lock): New lock variable.
+	(tzset): New function (weak defn), no longer weak alias for __tzset.
+	Call __tzset while holding __tzset_lock.
+	* time/localtime.c: Include <libc-lock.h>.
+	(__localtime_r): Hold __tzset_lock while doing the work.
+
 	* sysdeps/generic/setenv.c (__environ): Change conditional for #define
 	from [!HAVE_GNU_LD] to [!_LIBC].
 	[_LIBC]: Include <libc-lock.h> and define a lock.
diff --git a/locale/iso-4217.def b/locale/iso-4217.def
index 67802b31f3..095ccdf311 100644
--- a/locale/iso-4217.def
+++ b/locale/iso-4217.def
@@ -70,7 +70,7 @@ DEFINE_INT_CURR("HUF ")		/* Hungary  */
 DEFINE_INT_CURR("IDR ")		/* Indonesia  */
 DEFINE_INT_CURR("IEP ")		/* Ireland  */
 DEFINE_INT_CURR("ILS ")		/* Israel  */
-DEFINE_INT_CURR("INR ")		/* Bhutan  */
+DEFINE_INT_CURR("INR ")		/* India, Bhutan  */
 DEFINE_INT_CURR("IQD ")		/* Iraq  */
 DEFINE_INT_CURR("IRR ")		/* Iran  */
 DEFINE_INT_CURR("ISK ")		/* Iceland  */
diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h
index 0cb0b34f35..4642f00c63 100644
--- a/sysdeps/m68k/dl-machine.h
+++ b/sysdeps/m68k/dl-machine.h
@@ -255,8 +255,6 @@ elf_machine_rela (struct link_map *map,
       assert (! "unexpected dynamic reloc type");
       break;
     }
-
-#undef RESOLVE
 }
 
 static inline void
diff --git a/time/localtime.c b/time/localtime.c
index 4c68ab22dc..9dff89ce74 100644
--- a/time/localtime.c
+++ b/time/localtime.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991, 1992, 1993, 1995 Free Software Foundation, Inc.
+/* localtime -- convert `time_t' to `struct tm' in local time zone
+Copyright (C) 1991, 92, 93, 95, 96 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -18,6 +19,7 @@ Cambridge, MA 02139, USA.  */
 
 #include <errno.h>
 #include <time.h>
+#include <libc-lock.h>
 
 /* The C Standard says that localtime and gmtime return the same pointer.  */
 struct tm _tmbuf;
@@ -35,7 +37,11 @@ __localtime_r (timer, tp)
      const time_t *timer;
      struct tm *tp;
 {
-  extern int __use_tzfile;
+  /* This lock is defined in tzset.c and locks all the data defined there
+     and in tzfile.c; the internal functions do no locking themselves.
+     This lock is only taken here and in `tzset'.  */
+  __libc_lock_define (extern, __tzset_lock);
+  extern int __tzset_run, __use_tzfile;
   extern int __tz_compute __P ((time_t timer, struct tm *tp));
   extern int __tzfile_compute __P ((time_t timer,
 				    long int *leap_correct, int *leap_hit));
@@ -48,36 +54,37 @@ __localtime_r (timer, tp)
       return NULL;
     }
 
-  {
-    /* Make sure the database is initialized.  */
-    extern int __tzset_run;
-    if (! __tzset_run)
-      __tzset ();
-  }
+  __libc_lock_lock (__tzset_lock);
+
+  /* Make sure the database is initialized.  */
+  if (! __tzset_run)
+    __tzset ();
 
   if (__use_tzfile)
     {
       if (! __tzfile_compute (*timer, &leap_correction, &leap_extra_secs))
-	return NULL;
+	tp = NULL;
     }
   else
     {
-      struct tm *gmtp = __gmtime_r (timer, tp);
-      if (gmtp == NULL)
-	return NULL;
-
-      if (! __tz_compute (*timer, gmtp))
-	return NULL;
-
+      tp = __gmtime_r (timer, tp);
+      if (tp && ! __tz_compute (*timer, tp))
+	tp = NULL;
       leap_correction = 0L;
       leap_extra_secs = 0;
     }
 
-  __offtime (timer, __timezone - leap_correction, tp);
-  tp->tm_sec += leap_extra_secs;
-  tp->tm_isdst = __daylight;
-  tp->tm_gmtoff = __timezone;
-  tp->tm_zone = __tzname[__daylight];
+  if (tp)
+    {
+      __offtime (timer, __timezone - leap_correction, tp);
+      tp->tm_sec += leap_extra_secs;
+      tp->tm_isdst = __daylight;
+      tp->tm_gmtoff = __timezone;
+      tp->tm_zone = __tzname[__daylight];
+    }
+
+  __libc_lock_unlock (__tzset_lock);
+
   return tp;
 }
 weak_alias (__localtime_r, localtime_r)
diff --git a/time/tzset.c b/time/tzset.c
index d3a33dc1ce..a4fa8e358b 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -483,5 +483,19 @@ DEFUN(__tz_compute, (timer, tm),
 
   return 1;
 }
+
+#include <libc-lock.h>
+
+/* This locks all the state variables in tzfile.c and this file.  */
+__libc_lock_define (, __tzset_lock)
+
+/* Reinterpret the TZ environment variable and set `tzname'.  */
 
-weak_alias (__tzset, tzset)
+weak_symbol (tzset)
+void
+tzset (void)
+{
+  __libc_lock_lock (__tzset_lock);
+  __tzset ();
+  __libc_lock_unlock (__tzset_lock);
+}