diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-11-19 11:27:19 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-11-19 11:27:19 +0100 |
commit | f1fd3dfa6db831e56433a6982fb9419cbfc674ec (patch) | |
tree | c2bc0634f1d347b58503a09edbd655dc35765229 /sysdeps | |
parent | d06542def74414c59b7a4a2bcdeea5b44d0f2428 (diff) | |
parent | 1575fef50c27064e826beecf41809bf247a1f8e4 (diff) |
Merge commit 'refs/top-bases/tschwinge/Roger_Whittaker' into tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/mach/hurd/fork.c | 18 | ||||
-rw-r--r-- | sysdeps/mach/hurd/i386/makecontext-helper.c | 71 |
2 files changed, 2 insertions, 87 deletions
diff --git a/sysdeps/mach/hurd/fork.c b/sysdeps/mach/hurd/fork.c index 816d893373..2b77d9be21 100644 --- a/sysdeps/mach/hurd/fork.c +++ b/sysdeps/mach/hurd/fork.c @@ -512,24 +512,10 @@ __fork (void) (natural_t *) &state, &statecount)) LOSE; #ifdef STACK_GROWTH_UP - if (__hurd_sigthread_stack_base == 0) - { - state.SP &= __hurd_threadvar_stack_mask; - state.SP += __hurd_threadvar_stack_offset; - } - else + if (__hurd_sigthread_stack_base != 0) state.SP = __hurd_sigthread_stack_base; #else - if (__hurd_sigthread_stack_end == 0) - { - /* The signal thread has a stack assigned by cthreads. - The threadvar_stack variables conveniently tell us how - to get to the highest address in the stack, just below - the per-thread variables. */ - state.SP &= __hurd_threadvar_stack_mask; - state.SP += __hurd_threadvar_stack_offset; - } - else + if (__hurd_sigthread_stack_end != 0) state.SP = __hurd_sigthread_stack_end; #endif MACHINE_THREAD_STATE_SET_PC (&state, diff --git a/sysdeps/mach/hurd/i386/makecontext-helper.c b/sysdeps/mach/hurd/i386/makecontext-helper.c deleted file mode 100644 index c6fb90ca5a..0000000000 --- a/sysdeps/mach/hurd/i386/makecontext-helper.c +++ /dev/null @@ -1,71 +0,0 @@ -/* Helper for makecontext: handle threadvars. - Copyright (C) 2013-2015 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <hurd/threadvar.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ucontext.h> - -#if 0 - -void -__makecontext_helper (ucontext_t *ucp) -{ - if (__hurd_threadvar_stack_mask == 0) - { - /* We are not using threads, so per init-first.c:init, the threadvars - live in a malloced space, addressed relative to the base of the - virtual address space. Just keep using that one. */ - } - else - { - /* The following is only prepared to work with libpthread, which only - keeps the threadvars at the bottom of the stack -- contrary to - libthreads, which also puts additional data there. */ - - void *s = ucp->uc_stack.ss_sp; - size_t s_size = ucp->uc_stack.ss_size; - - /* Is the new stack suitable? Check that that the last threadvar - occupies the last storage unit within the bounds of the new stack. - Alignment according to (sp & __hurd_threadvar_stack_mask) == sp is not - actually a requirement (though, in practice it often will be). */ - if (__hurd_threadvar_location_from_sp (_HURD_THREADVAR_MAX, s) - != s + s_size) - { - /* Instead of having makecontext return an error, we bail out the - hard way, as we can't expect its caller to be able to properly - react to this situation. */ - fprintf (stderr, - "*** makecontext: a stack at %p with size %#x is not " - "usable with threadvars\n", - s, s_size); - abort (); - } - - /* Copy the threadvars to the new stack. */ - void *t_old = __hurd_threadvar_location (0); - void *t_new = __hurd_threadvar_location_from_sp (0, s); - size_t t_size = __hurd_threadvar_max * sizeof (unsigned long int); - memcpy (t_new, t_old, t_size); - /* Account for the space taken by the threadvars. */ - ucp->uc_stack.ss_size -= t_size; - } -} -#endif |