aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-08-10 15:53:27 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-08-10 15:53:27 +0000
commit121dce05fe25ed878088fa7351c840a303182c65 (patch)
treeb67c4ee7205ad5e59068608df8fd21a08d6ea3de /ports
parent77480c6ba52e49a70f37c6f49d59f2f72501aca0 (diff)
downloadglibc-121dce05fe25ed878088fa7351c840a303182c65.tar
glibc-121dce05fe25ed878088fa7351c840a303182c65.tar.gz
glibc-121dce05fe25ed878088fa7351c840a303182c65.tar.bz2
glibc-121dce05fe25ed878088fa7351c840a303182c65.zip
Move Linux kernel version conditionals to kernel-features.h.
Diffstat (limited to 'ports')
-rw-r--r--ports/ChangeLog.ia647
-rw-r--r--ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h6
2 files changed, 9 insertions, 4 deletions
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index 933ac23c2d..943df8d66b 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,10 @@
+2012-08-10 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
+ (_dl_discover_osversion): Do not condition on
+ __LINUX_KERNEL_VERSION < 0x020617.
+ (HAVE_DL_DISCOVER_OSVERSION): Likewise.
+
2012-08-03 Mike Frysinger <vapier@gentoo.org>
[BZ #12194]
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h b/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
index e30e33d2bc..0962129b1f 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
+++ b/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
@@ -1,5 +1,5 @@
/* System-specific settings for dynamic linker code. IA-64 version.
- Copyright (C) 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2003-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
@@ -65,9 +65,7 @@ extern int _dl_sysinfo_break attribute_hidden;
#define DL_ARGV_NOT_RELRO 1
-/* 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