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

Remove some pre-2.6.16 Linux kernel conditionals.

Browse Source
This commit is contained in:
Joseph Myers
2012-08-07 23:03:35 +00:00
parent a281decc87
commit 93df14eee8
7 changed files with 35 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,3 +1,24 @@
2012-08-07 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_PROT_GROWSUPDOWN): Remove.
(__ASSUME_NO_CLONE_DETACHED): Likewise.
(__ASSUME_GETDENTS32_D_TYPE): Likewise.
(__ASSUME_WAITID_SYSCALL): Likewise.
* sysdeps/unix/sysv/linux/dl-execstack.c
(_dl_make_stack_executable) [PROT_GROWSDOWN || PROT_GROWSUP]: Make
code unconditional.
(_dl_make_stack_executable) [!__ASSUME_PROT_GROWSUPDOWN]: Remove
conditional code.
* sysdeps/unix/sysv/linux/getdents.c (__GETDENTS)
[__ASSUME_GETDENTS32_D_TYPE]: Make code unconditional.
(__GETDENTS) [!__ASSUME_GETDENTS32_D_TYPE]: Remove conditional
code.
* sysdeps/unix/sysv/linux/waitid.c [__NR_waitid]: Make code
unconditional.
[__ASSUME_WAITID_SYSCALL]: Likewise.
[!__ASSUME_WAITID_SYSCALL]: Remove conditional code.
2012-08-07 Roland McGrath <roland@hack.frob.com> 2012-08-07 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/closedir.c: Renamed to ... * sysdeps/unix/closedir.c: Renamed to ...

5
nptl/ChangeLog
View File

@ -1,3 +1,8 @@
2012-08-07 Joseph Myers <joseph@codesourcery.com>
* sysdeps/pthread/createthread.c (create_thread)
[!__ASSUME_NO_CLONE_DETACHED]: Remove conditional code.
2012-08-03 Joseph Myers <joseph@codesourcery.com> 2012-08-03 Joseph Myers <joseph@codesourcery.com>
* nptl-init.c (sigcancel_handler) [__ASSUME_CORRECT_SI_PID]: Make * nptl-init.c (sigcancel_handler) [__ASSUME_CORRECT_SI_PID]: Make

9
nptl/sysdeps/pthread/createthread.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002-2007, 2008, 2010 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.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -179,18 +179,11 @@ create_thread (struct pthread *pd, const struct pthread_attr *attr,
sys_exit() in the location pointed to by the seventh parameter sys_exit() in the location pointed to by the seventh parameter
to CLONE. to CLONE.
CLONE_DETACHED
No signal is generated if the thread exists and it is
automatically reaped.
The termination signal is chosen to be zero which means no signal The termination signal is chosen to be zero which means no signal
is sent. */ is sent. */
int clone_flags = (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGNAL int clone_flags = (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGNAL
| CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_SETTLS | CLONE_PARENT_SETTID
| CLONE_CHILD_CLEARTID | CLONE_SYSVSEM | CLONE_CHILD_CLEARTID | CLONE_SYSVSEM
#if __ASSUME_NO_CLONE_DETACHED == 0
| CLONE_DETACHED
#endif
| 0); | 0);
if (__builtin_expect (THREAD_GETMEM (THREAD_SELF, report_events), 0)) if (__builtin_expect (THREAD_GETMEM (THREAD_SELF, report_events), 0))

96
sysdeps/unix/sysv/linux/dl-execstack.c
View File

@ -1,5 +1,5 @@
/* Stack executability handling for GNU dynamic linker. Linux version. /* Stack executability handling for GNU dynamic linker. Linux version.
Copyright (C) 2003, 2004, 2005, 2006 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
@ -46,95 +46,11 @@ _dl_make_stack_executable (void **stack_endp)
|| __builtin_expect (*stack_endp != __libc_stack_end, 0)) || __builtin_expect (*stack_endp != __libc_stack_end, 0))
return EPERM; return EPERM;
/* Newer Linux kernels support a flag to make our job easy. */ if (__builtin_expect (__mprotect ((void *) page, GLRO(dl_pagesize),
#if defined PROT_GROWSDOWN || defined PROT_GROWSUP __stack_prot) == 0, 1))
# if __ASSUME_PROT_GROWSUPDOWN == 0 goto return_success;
static bool no_growsupdown; result = errno;
if (! no_growsupdown) goto out;
# endif
{
if (__builtin_expect (__mprotect ((void *) page, GLRO(dl_pagesize),
__stack_prot) == 0, 1))
goto return_success;
# if __ASSUME_PROT_GROWSUPDOWN == 0
if (errno == EINVAL)
no_growsupdown = true;
else
# endif
{
result = errno;
goto out;
}
}
#endif
/* There is always a hole in the address space below the bottom of the
stack. So when we make an mprotect call that starts below the bottom
of the stack, it will include the hole and fail with ENOMEM.
We start with a random guess at how deep the stack might have gotten
so as to have extended the GROWSDOWN mapping to lower pages. */
#if __ASSUME_PROT_GROWSUPDOWN == 0
size_t size = GLRO(dl_pagesize) * 8;
# if _STACK_GROWS_DOWN
page = page + GLRO(dl_pagesize) - size;
while (1)
{
if (__mprotect ((void *) page, size,
__stack_prot & ~PROT_GROWSDOWN) == 0)
/* We got this chunk changed; loop to do another chunk below. */
page -= size;
else
{
if (errno != ENOMEM) /* Unexpected failure mode. */
{
result = errno;
goto out;
}
if (size == GLRO(dl_pagesize))
/* We just tried to mprotect the top hole page and failed.
We are done. */
break;
/* Our mprotect call failed because it started below the lowest
stack page. Try again on just the top half of that region. */
size /= 2;
page += size;
}
}
# elif _STACK_GROWS_UP
while (1)
{
if (__mprotect ((void *) page, size, __stack_prot & ~PROT_GROWSUP) == 0)
/* We got this chunk changed; loop to do another chunk below. */
page += size;
else
{
if (errno != ENOMEM) /* Unexpected failure mode. */
{
result = errno;
goto out;
}
if (size == GLRO(dl_pagesize))
/* We just tried to mprotect the lowest hole page and failed.
We are done. */
break;
/* Our mprotect call failed because it extended past the highest
stack page. Try again on just the bottom half of that region. */
size /= 2;
}
}
# else
# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
# endif
#endif
return_success: return_success:
/* Clear the address. */ /* Clear the address. */

6
sysdeps/unix/sysv/linux/getdents.c
View File

@ -97,7 +97,6 @@ __GETDENTS (int fd, char *buf, size_t nbytes)
{ {
ssize_t retval; ssize_t retval;
#ifdef __ASSUME_GETDENTS32_D_TYPE
/* The d_ino and d_off fields in kernel_dirent and dirent must have /* The d_ino and d_off fields in kernel_dirent and dirent must have
the same sizes and alignments. */ the same sizes and alignments. */
if (sizeof (DIRENT_TYPE) == sizeof (struct dirent) if (sizeof (DIRENT_TYPE) == sizeof (struct dirent)
@ -135,7 +134,6 @@ __GETDENTS (int fd, char *buf, size_t nbytes)
return retval; return retval;
} }
#endif
off64_t last_offset = -1; off64_t last_offset = -1;
@ -293,11 +291,7 @@ __GETDENTS (int fd, char *buf, size_t nbytes)
DIRENT_SET_DP_INO(dp, kdp->d_ino); DIRENT_SET_DP_INO(dp, kdp->d_ino);
dp->d_off = kdp->d_off; dp->d_off = kdp->d_off;
dp->d_reclen = new_reclen; dp->d_reclen = new_reclen;
#ifdef __ASSUME_GETDENTS32_D_TYPE
dp->d_type = *((char *) kdp + kdp->d_reclen - 1); dp->d_type = *((char *) kdp + kdp->d_reclen - 1);
#else
dp->d_type = DT_UNKNOWN;
#endif
memcpy (dp->d_name, kdp->d_name, memcpy (dp->d_name, kdp->d_name,
kdp->d_reclen - offsetof (struct kernel_dirent, d_name)); kdp->d_reclen - offsetof (struct kernel_dirent, d_name));

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

@ -139,10 +139,6 @@
# define __ASSUME_FADVISE64_64_SYSCALL 1 # define __ASSUME_FADVISE64_64_SYSCALL 1
#endif #endif
/* The PROT_GROWSDOWN/PROT_GROWSUP flags were introduced in the 2.6.0-test
series. */
#define __ASSUME_PROT_GROWSUPDOWN 1
/* Starting with 2.6.0 PowerPC adds signal/swapcontext support for Vector /* Starting with 2.6.0 PowerPC adds signal/swapcontext support for Vector
SIMD (AKA Altivec, VMX) instructions and register state. This changes SIMD (AKA Altivec, VMX) instructions and register state. This changes
the overall size of the sigcontext and adds the swapcontext syscall. */ the overall size of the sigcontext and adds the swapcontext syscall. */
@ -150,19 +146,6 @@
# define __ASSUME_SWAPCONTEXT_SYSCALL 1 # define __ASSUME_SWAPCONTEXT_SYSCALL 1
#endif #endif
/* The CLONE_DETACHED flag is not necessary in 2.6.2 kernels, it is
implied. */
#define __ASSUME_NO_CLONE_DETACHED 1
/* Starting with version 2.6.4-rc1 the getdents syscall returns d_type
information as well and in between 2.6.5 and 2.6.8 most compat wrappers
were fixed too. Except s390{,x} which was fixed in 2.6.11. */
#define __ASSUME_GETDENTS32_D_TYPE 1
/* Starting with version 2.6.9, the waitid system call is available.
Except for powerpc{,64} and s390{,x}, where it is available in 2.6.12. */
#define __ASSUME_WAITID_SYSCALL 1
/* On sparc64 stat64/lstat64/fstat64 syscalls were introduced in 2.6.12. */ /* On sparc64 stat64/lstat64/fstat64 syscalls were introduced in 2.6.12. */
#if defined __sparc__ && defined __arch64__ #if defined __sparc__ && defined __arch64__
# define __ASSUME_STAT64_SYSCALL 1 # define __ASSUME_STAT64_SYSCALL 1

41
sysdeps/unix/sysv/linux/waitid.c
View File

@ -1,5 +1,5 @@
/* Linux implementation of waitid. /* Linux implementation of waitid.
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004-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
@ -19,14 +19,8 @@
#include <stddef.h> #include <stddef.h>
#include <errno.h> #include <errno.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <kernel-features.h>
#include <sysdep.h> #include <sysdep.h>
#ifdef __NR_waitid
# if __ASSUME_WAITID_SYSCALL > 0
static inline int static inline int
do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options) do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
{ {
@ -34,37 +28,6 @@ do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
pass if we were using waitid to simulate wait3/wait4. */ pass if we were using waitid to simulate wait3/wait4. */
return INLINE_SYSCALL (waitid, 5, idtype, id, infop, options, NULL); return INLINE_SYSCALL (waitid, 5, idtype, id, infop, options, NULL);
} }
# define NO_DO_WAITID #define NO_DO_WAITID
# else
static int do_compat_waitid (idtype_t idtype, id_t id,
siginfo_t *infop, int options);
# define DO_WAITID do_compat_waitid
static int
do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
{
static int waitid_works;
if (waitid_works > 0)
return INLINE_SYSCALL (waitid, 5, idtype, id, infop, options, NULL);
if (waitid_works == 0)
{
int result = INLINE_SYSCALL (waitid, 5,
idtype, id, infop, options, NULL);
if (result < 0 && errno == ENOSYS)
waitid_works = -1;
else
{
waitid_works = 1;
return result;
}
}
return do_compat_waitid (idtype, id, infop, options);
}
# endif
#endif
#include "sysdeps/posix/waitid.c" #include "sysdeps/posix/waitid.c"