5 files changed, 14 insertions, 1 deletions
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)