From 7b0c063f12f09e211391cd0f103e085f390d9f23 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 2 Dec 2015 12:11:06 +0100 Subject: Drop using _tlsbase and _tlstop in favor of access via NtCurrentTeb. * cygtls.h (_tlsbase): Remove. Replace throughout with NtCurrentTeb()->Tib.StackBase. (_tlstop): Remove. Replace throughout with NtCurrentTeb()->Tib.StackLimit. * dcrt0.cc (child_info_fork::alloc_stack): Move definition of local teb variable up to be used throughout. * include/cygwin/config.h (__getreent): Use inline function on both architectures. Signed-off-by: Corinna Vinschen --- winsup/cygwin/fork.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/fork.cc') diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index 084f8f026..78ae932d3 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -307,7 +307,7 @@ frok::parent (volatile char * volatile stack_here) ch.forker_finished = forker_finished; - ch.stackbottom = _tlsbase; + ch.stackbottom = NtCurrentTeb()->Tib.StackBase; ch.stackaddr = NtCurrentTeb ()->DeallocationStack; if (!ch.stackaddr) { @@ -315,7 +315,7 @@ frok::parent (volatile char * volatile stack_here) stack. If so, the entire stack is committed anyway and StackLimit points to the allocation address of the stack. Mark in guardsize that we must not set up guard pages. */ - ch.stackaddr = ch.stacktop = _tlstop; + ch.stackaddr = ch.stacktop = NtCurrentTeb()->Tib.StackLimit; ch.guardsize = (size_t) -1; } else -- cgit v1.2.3