diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h | 6 | ||||
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 4 |
4 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c32f27ac7f..284adae7ff 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 b2443edb97..efeebca2f3 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 a2fa3ee216..12533438c9 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 e20a961f98..33847f0ffc 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; |