lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Move Linux kernel version conditionals to kernel-features.h.

Browse Source
This commit is contained in:
Joseph Myers
2012-08-10 15:53:27 +00:00
parent 77480c6ba5
commit 121dce05fe
5 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2012-08-10 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/kernel-features.h
(__LINUX_ARG_MAX_STACK_BASED_MIN_KERNEL): Define.
[__LINUX_KERNEL_VERSION >= __LINUX_ARG_MAX_STACK_BASED_MIN_KERNEL]
(__ASSUME_ARG_MAX_STACK_BASED): Define.
* sysdeps/unix/sysv/linux/sysconf.c (__sysconf)
[__LINUX_KERNEL_VERSION < 0x020617]: Change condition to
!__ASSUME_ARG_MAX_STACK_BASED. Compare version with
__LINUX_ARG_MAX_STACK_BASED_MIN_KERNEL.
2012-08-09 Jeff Law <law@redhat.com> 2012-08-09 Jeff Law <law@redhat.com>
[BZ #13939] [BZ #13939]

7
ports/ChangeLog.ia64
View File

@ -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> 2012-08-03 Mike Frysinger <vapier@gentoo.org>
[BZ #12194] [BZ #12194]

6
ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
View File

@ -1,5 +1,5 @@
/* System-specific settings for dynamic linker code. IA-64 version. /* 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. 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
@ -65,9 +65,7 @@ extern int _dl_sysinfo_break attribute_hidden;
#define DL_ARGV_NOT_RELRO 1 #define DL_ARGV_NOT_RELRO 1
/* 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

7
sysdeps/unix/sysv/linux/kernel-features.h
View File

@ -210,6 +210,13 @@
# define __ASSUME_O_CLOEXEC 1 # define __ASSUME_O_CLOEXEC 1
#endif #endif
/* From 2.6.23 onwards the value of ARG_MAX depends on the stack
size. */
#define __LINUX_ARG_MAX_STACK_BASED_MIN_KERNEL 0x020617
#if __LINUX_KERNEL_VERSION >= __LINUX_ARG_MAX_STACK_BASED_MIN_KERNEL
# define __ASSUME_ARG_MAX_STACK_BASED 1
#endif
/* Support for ADJ_OFFSET_SS_READ was added in 2.6.24. */ /* Support for ADJ_OFFSET_SS_READ was added in 2.6.24. */
#if __LINUX_KERNEL_VERSION >= 0x020618 #if __LINUX_KERNEL_VERSION >= 0x020618
# define __ASSUME_ADJ_OFFSET_SS_READ 1 # define __ASSUME_ADJ_OFFSET_SS_READ 1

12
sysdeps/unix/sysv/linux/sysconf.c
View File

@ -1,5 +1,5 @@
/* Get file-specific information about a file. Linux version. /* Get file-specific information about a file. Linux version.
Copyright (C) 2003,2004,2006 2008,2009,2011 Free Software Foundation, Inc. Copyright (C) 2003-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
@ -88,11 +88,11 @@ __sysconf (int name)
return HAS_CPUCLOCK (name); return HAS_CPUCLOCK (name);
case _SC_ARG_MAX: case _SC_ARG_MAX:
#if __LINUX_KERNEL_VERSION < 0x020617 #if !__ASSUME_ARG_MAX_STACK_BASED
/* Determine whether this is a kernel 2.6.23 or later. Only /* Determine whether this is a kernel with an argument limit
then do we have an argument limit determined by the stack determined by the stack size. */
size. */ if (GLRO(dl_discover_osversion) ()
if (GLRO(dl_discover_osversion) () >= 0x020617) >= __LINUX_ARG_MAX_STACK_BASED_MIN_KERNEL)
#endif #endif
/* Use getrlimit to get the stack limit. */ /* Use getrlimit to get the stack limit. */
if (__getrlimit (RLIMIT_STACK, &rlimit) == 0) if (__getrlimit (RLIMIT_STACK, &rlimit) == 0)