AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-31 15:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings on Linux/i686

Browse Source 
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]
This commit is contained in:
Andreas Jaeger 2012-05-17 20:17:53 +02:00
parent 286abc3dea
commit de7f5ce7c5
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2012-05-17 Chris Metcalf <cmetcalf@tilera.com>
* stdio-common/bug22.c (TIMEOUT): Bump up from 30 to 60. * stdio-common/bug22.c (TIMEOUT): Bump up from 30 to 60.

6
nptl/ChangeLog
View File

@ -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> 2012-05-15 Joseph Myers <joseph@codesourcery.com>
* pthreadP.h [!__NR_set_robust_list] (__NR_set_robust_list): Do * pthreadP.h [!__NR_set_robust_list] (__NR_set_robust_list): Do

6
nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
View File

@ -1,5 +1,5 @@
/* System-specific settings for dynamic linker code. IA-32 version. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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 #endif
/* The _dl_discover_osversion function is so far only needed in sysconf #ifndef __ASSEMBLER__
to check for kernels later than 2.6.23. */
#if !defined __ASSEMBLER__ && __LINUX_KERNEL_VERSION < 0x020617
/* Get version of the OS. */ /* Get version of the OS. */
extern int _dl_discover_osversion (void) attribute_hidden; extern int _dl_discover_osversion (void) attribute_hidden;
# define HAVE_DL_DISCOVER_OSVERSION 1 # define HAVE_DL_DISCOVER_OSVERSION 1

4
sysdeps/i386/dl-machine.h
View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. i386 version. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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 else
# endif /* !RTLD_BOOTSTRAP and have no -z combreloc */ # endif /* !RTLD_BOOTSTRAP and have no -z combreloc */
{ {
# ifndef RTLD_BOOTSTRAP
const Elf32_Sym *const refsym = sym; const Elf32_Sym *const refsym = sym;
# endif
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type); 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; Elf32_Addr value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value;