about summary refs log tree commit diff
path: root/nptl/sysdeps/unix
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-05-17 20:17:53 +0200
committerAndreas Jaeger <aj@suse.de>2012-05-17 20:17:53 +0200
commitde7f5ce7c595f4741029f7e63429826f8e82b340 (patch)
tree938153911d3a516e2744b99c831d9501fe1c6ba5 /nptl/sysdeps/unix
parent286abc3dea5e43835a1a77a3a8128c8ac14ca12d (diff)
downloadglibc-de7f5ce7c595f4741029f7e63429826f8e82b340.tar.gz
glibc-de7f5ce7c595f4741029f7e63429826f8e82b340.tar.xz
glibc-de7f5ce7c595f4741029f7e63429826f8e82b340.zip
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]
Diffstat (limited to 'nptl/sysdeps/unix')
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h6
1 files changed, 2 insertions, 4 deletions
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