GNU C Library master sources branch, master, updated. glibc-2.15-949-gde7f5ce

[aj at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  de7f5ce7c595f4741029f7e63429826f8e82b340 (commit)
      from  286abc3dea5e43835a1a77a3a8128c8ac14ca12d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=de7f5ce7c595f4741029f7e63429826f8e82b340

commit de7f5ce7c595f4741029f7e63429826f8e82b340
Author: Andreas Jaeger <aj@suse.de>
Date:   Thu May 17 20:17:53 2012 +0200

    Fix warnings on Linux/i686
    
    Fixes:
    ../sysdeps/i386/dl-machine.h:336:30: warning: unused variable â??refsymâ?? [-Wunused-variable]
    rtld.c:1435:3: warning: implicit declaration of function â??_dl_discover_osversionâ?? [-Wimplicit-function-declaration]

diff --git a/ChangeLog b/ChangeLog
index c32f27a..284adae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-17  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/i386/dl-machine.h (elf_machine_rel): Declare refsym only
+	when it is used.
+
 2012-05-17  Chris Metcalf  <cmetcalf@tilera.com>
 
 	* stdio-common/bug22.c (TIMEOUT): Bump up from 30 to 60.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b2443ed..efeebca 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-17  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
+	(HAVE_DL_DISCOVER_OSVERSION): Don't declare _dl_discover_osversion
+	only for older kernels.
+
 2012-05-15  Joseph Myers  <joseph@codesourcery.com>
 
 	* pthreadP.h [!__NR_set_robust_list] (__NR_set_robust_list): Do
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
index a2fa3ee..1253343 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
@@ -1,5 +1,5 @@
 /* System-specific settings for dynamic linker code.  IA-32 version.
-   Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2002-2012 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
@@ -58,9 +58,7 @@ extern void _dl_sysinfo_int80 (void) attribute_hidden;
 #endif
 
 
-/* The _dl_discover_osversion function is so far only needed in sysconf
-   to check for kernels later than 2.6.23.  */
-#if !defined __ASSEMBLER__ && __LINUX_KERNEL_VERSION < 0x020617
+#ifndef __ASSEMBLER__
 /* Get version of the OS.  */
 extern int _dl_discover_osversion (void) attribute_hidden;
 # define HAVE_DL_DISCOVER_OSVERSION	1
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index e20a961..33847f0 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation inline functions.  i386 version.
-   Copyright (C) 1995-2005, 2006, 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-2012 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
@@ -333,7 +333,9 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
   else
 # endif	/* !RTLD_BOOTSTRAP and have no -z combreloc */
     {
+# ifndef RTLD_BOOTSTRAP
       const Elf32_Sym *const refsym = sym;
+# endif
       struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
       Elf32_Addr value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value;
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |    5 +++++
 nptl/ChangeLog                                     |    6 ++++++
 nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h |    6 ++----
 sysdeps/i386/dl-machine.h                          |    4 +++-
 4 files changed, 16 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources