AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 16:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

nptl: fix set-but-unused warning w/_STACK_GROWS_UP

Browse Source 
On arches that set _STACK_GROWS_UP, the stacktop variable is declared
and set, but never actually used.  Refactor the code a bit so that the
variable is only declared/set under _STACK_GROWS_DOWN settings.
This commit is contained in:
Mike Frysinger 2015-07-29 22:53:28 -04:00
parent 1b15ff4810
commit 3fad53ec87
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2015-08-05 Mike Frysinger <vapier@gentoo.org>
* nptl/allocatestack.c (allocate_stack): Move stacktop decl down to
bottom and under _STACK_GROWS_DOWN. Move the stacktop assignment
in there too.
2015-08-05 Carlos O'Donell <carlos@systemhalted.org> 2015-08-05 Carlos O'Donell <carlos@systemhalted.org>
* version.h (RELEASE): Set to "development". * version.h (RELEASE): Set to "development".

17
nptl/allocatestack.c
View File

@ -353,7 +353,6 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
struct pthread *pd; struct pthread *pd;
size_t size; size_t size;
size_t pagesize_m1 = __getpagesize () - 1; size_t pagesize_m1 = __getpagesize () - 1;
void *stacktop;
assert (powerof2 (pagesize_m1 + 1)); assert (powerof2 (pagesize_m1 + 1));
assert (TCB_ALIGNMENT >= STACK_ALIGN); assert (TCB_ALIGNMENT >= STACK_ALIGN);
@ -717,19 +716,23 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
/* We place the thread descriptor at the end of the stack. */ /* We place the thread descriptor at the end of the stack. */
*pdp = pd; *pdp = pd;
#if TLS_TCB_AT_TP #if _STACK_GROWS_DOWN
void *stacktop;
# if TLS_TCB_AT_TP
/* The stack begins before the TCB and the static TLS block. */ /* The stack begins before the TCB and the static TLS block. */
stacktop = ((char *) (pd + 1) - __static_tls_size); stacktop = ((char *) (pd + 1) - __static_tls_size);
#elif TLS_DTV_AT_TP # elif TLS_DTV_AT_TP
stacktop = (char *) (pd - 1); stacktop = (char *) (pd - 1);
#endif # endif
#ifdef NEED_SEPARATE_REGISTER_STACK # ifdef NEED_SEPARATE_REGISTER_STACK
*stack = pd->stackblock; *stack = pd->stackblock;
*stacksize = stacktop - *stack; *stacksize = stacktop - *stack;
#elif _STACK_GROWS_DOWN # else
*stack = stacktop; *stack = stacktop;
#elif _STACK_GROWS_UP # endif
#else
*stack = pd->stackblock; *stack = pd->stackblock;
assert (*stack > 0); assert (*stack > 0);
#endif #endif