Update.

2001-02-09  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/setenv.c (unsetenv): Remove const from len.
	* sysdeps/sparc/fpu/bits/mathinline.h (sqrt, fdim): Don't define if
	__NO_MATH_INLINES.
	* sysdeps/i386/dl-machine.h (elf_machine_rel): Only declare refsym
	if not RTLD_BOOTSTRAP.
	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.

8 files changed, 38 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 487029f72a..1a4d1f1a67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/generic/setenv.c (unsetenv): Remove const from len.
+	* sysdeps/sparc/fpu/bits/mathinline.h (sqrt, fdim): Don't define if
+	__NO_MATH_INLINES.
+	* sysdeps/i386/dl-machine.h (elf_machine_rel): Only declare refsym
+	if not RTLD_BOOTSTRAP.
+	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
+	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
+
 2001-02-09  Ulrich Drepper  <drepper@redhat.com>
 
 	* locale/programs/linereader.c (get_ident): Stop loop if EOF.  Use
diff --git a/linuxthreads/sysdeps/pthread/pt-initfini.c b/linuxthreads/sysdeps/pthread/pt-initfini.c
index a86c967735..8694f7ba64 100644
--- a/linuxthreads/sysdeps/pthread/pt-initfini.c
+++ b/linuxthreads/sysdeps/pthread/pt-initfini.c
@@ -65,6 +65,8 @@ asm ("\n/*@_init_PROLOG_BEGINS*/");
 static void
 call_initialize_minimal (void)
 {
+  extern void __pthread_initialize_minimal (void);
+
   __pthread_initialize_minimal ();
 }
 
diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK
index f1d73bed24..8034398150 100644
--- a/localedata/locales/en_HK
+++ b/localedata/locales/en_HK
@@ -49,7 +49,7 @@ END LC_COLLATE
 LC_MONETARY
 % This is the POSIX Locale definition the LC_MONETARY category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale defintion file 
+% These are generated based on XML base Locale defintion file
 % for IBM Class for Unicode.
 %
 int_curr_symbol       "<U0048><U004B><U0044><U0020>"
@@ -84,7 +84,7 @@ END LC_NUMERIC
 LC_TIME
 % This is the POSIX Locale definition for the LC_TIME category
 % generated by IBM Basic CountryPack Transformer.
-% These are generated based on XML base Locale difintion file 
+% These are generated based on XML base Locale difintion file
 % for IBM Class for Unicode.
 %
 % Abbreviated weekday names (%a)
@@ -115,22 +115,22 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";"<U0046><U0065><
             "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";"<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/
             "<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";"<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
 %
-% Equivalent of AM PM 
+% Equivalent of AM PM
 am_pm       "<U0041><U004D>";"<U0050><U004D>"
 %
-% Appropriate date and time representation 
+% Appropriate date and time representation
 % %A, %B %d, %Y %I:%M:%S %Z
 d_t_fmt     "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0064><U002C><U0020><U0025><U0059><U0020><U0025><U0070><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
 %
-% Appropriate date representation 
+% Appropriate date representation
 % %A, %B %d, %Y
 d_fmt       "<U0025><U0041><U002C><U0020><U0025><U0042><U0020><U0025><U0064><U002C><U0020><U0025><U0059>"
 %
-% Appropriate time representation 
+% Appropriate time representation
 % %I:%M:%S %Z
 t_fmt       "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
 %
-% Appropriate 12 h time representation (%r) 
+% Appropriate 12 h time representation (%r)
 t_fmt_ampm  "<U0025><U0070><U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
 %
 END LC_TIME
@@ -145,14 +145,14 @@ LC_MESSAGES
 % ^[yY]
 yesexpr     "<U005E><U005B><U0079><U0059><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % yesexpr     "<U005E><U005B><U0079><U0059><U005D>"
 
 %
 % ^[nN]
 noexpr      "<U005E><U005B><U006E><U004E><U005D>"
 
-% Syntax on Unicode Regular Expression Guidelines TR#18 
+% Syntax on Unicode Regular Expression Guidelines TR#18
 % noexpr      "<U005E><U005B><U006E><U004E><U005D>"
 %
 
@@ -177,8 +177,8 @@ END LC_PAPER
 LC_NAME
 % This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
 % generated by IBM Basic CountryPack Transformer.
-% 
-% 
+%
+%
 name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0067><U0025><U0074><U0025><U006D><U0025><U0074><U0025><U0066>"
 name_gen    ""
 name_mr     "<U004D><U0072><U002E>"
@@ -210,4 +210,4 @@ LC_MEASUREMENT
 % category generated by IBM Basic CountryPack Transformer.
 measurement 1
 
-END LC_MEASUREMENT
\ No newline at end of file
+END LC_MEASUREMENT
diff --git a/sysdeps/generic/setenv.c b/sysdeps/generic/setenv.c
index 6f871a65c7..a7c1e167bd 100644
--- a/sysdeps/generic/setenv.c
+++ b/sysdeps/generic/setenv.c
@@ -267,7 +267,7 @@ int
 unsetenv (name)
      const char *name;
 {
-  const size_t len;
+  size_t len;
   char **ep;
 
   if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 8029469e9f..3f7a6a3028 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -319,7 +319,9 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
     }
   else if (ELF32_R_TYPE (reloc->r_info) != R_386_NONE)
     {
+#ifndef RTLD_BOOTSTRAP
       const Elf32_Sym *const refsym = sym;
+#endif
       Elf32_Addr value = RESOLVE (&sym, version, ELF32_R_TYPE (reloc->r_info));
       if (sym)
 	value += sym->st_value;
diff --git a/sysdeps/sparc/fpu/bits/mathinline.h b/sysdeps/sparc/fpu/bits/mathinline.h
index daf9273795..26ad40e79d 100644
--- a/sysdeps/sparc/fpu/bits/mathinline.h
+++ b/sysdeps/sparc/fpu/bits/mathinline.h
@@ -142,6 +142,8 @@ __signbitl (long double __x) __THROW
 
 #endif /* sparc64 */
 
+#ifndef __NO_MATH_INLINES
+
 __MATH_INLINE double
 sqrt(double __x) __THROW
 {
@@ -169,6 +171,8 @@ sqrtl(long double __x) __THROW
 }
 #endif /* sparc64 */
 
+#endif
+
 /* This code is used internally in the GNU libc.  */
 #ifdef __LIBC_INTERNAL_MATH_INLINES
 __MATH_INLINE double
@@ -202,6 +206,8 @@ __ieee754_sqrtl(long double __x)
 
 #ifdef __USE_ISOC99
 
+#ifndef __NO_MATH_INLINES
+
 __MATH_INLINE double fdim (double __x, double __y);
 __MATH_INLINE double
 fdim (double __x, double __y)
@@ -216,6 +222,7 @@ fdimf (float __x, float __y)
   return __x < __y ? 0 : __x - __y;
 }
 
+#endif /* !__NO_MATH_INLINES */
 #endif /* __USE_ISOC99 */
 #endif /* !__NO_MATH_INLINES && __OPTIMIZE__ */
 #endif /* __GNUC__ */
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h
index feec35e46d..c17e1abd4c 100644
--- a/sysdeps/sparc/sparc32/dl-machine.h
+++ b/sysdeps/sparc/sparc32/dl-machine.h
@@ -362,7 +362,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
     }
   else
     {
+#ifndef RTLD_BOOTSTRAP
       const Elf32_Sym *const refsym = sym;
+#endif
       Elf32_Addr value;
       if (sym->st_shndx != SHN_UNDEF &&
 	  ELF32_ST_BIND (sym->st_info) == STB_LOCAL)
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h
index aee5ba84b5..d7a5544d93 100644
--- a/sysdeps/sparc/sparc64/dl-machine.h
+++ b/sysdeps/sparc/sparc64/dl-machine.h
@@ -197,7 +197,9 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
     }
   else if (ELF64_R_TYPE_ID (reloc->r_info) != R_SPARC_NONE) /* Who is Wilbur? */
     {
+#ifndef RTLD_BOOTSTRAP
       const Elf64_Sym *const refsym = sym;
+#endif
       Elf64_Addr value;
       if (sym->st_shndx != SHN_UNDEF &&
 	  ELF64_ST_BIND (sym->st_info) == STB_LOCAL)