From 783d7405385ece1698601019d8220aff8082865b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Jan 2017 08:49:52 +0100 Subject: nptl_db: fix gcc compiler warnings --- libpthread/nptl_db/td_ta_thr_iter.c | 3 ++- libpthread/nptl_db/td_thr_tlsbase.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libpthread/nptl_db/td_ta_thr_iter.c b/libpthread/nptl_db/td_ta_thr_iter.c index 0f1b2bfd2..c01c3e031 100644 --- a/libpthread/nptl_db/td_ta_thr_iter.c +++ b/libpthread/nptl_db/td_ta_thr_iter.c @@ -29,6 +29,7 @@ iterate_thread_list (td_thragent_t *ta, td_thr_iter_f *callback, td_err_e err; psaddr_t next, ofs; void *copy; + int descr_pri; /* Test the state. XXX This is incomplete. Normally this test should be in the loop. */ @@ -89,7 +90,7 @@ iterate_thread_list (td_thragent_t *ta, td_thr_iter_f *callback, /* Now test whether this thread matches the specified conditions. */ /* Only if the priority level is as high or higher. */ - int descr_pri = ((uintptr_t) schedpolicy == SCHED_OTHER + descr_pri = ((uintptr_t) schedpolicy == SCHED_OTHER ? 0 : (uintptr_t) schedprio); if (descr_pri >= ti_pri) { diff --git a/libpthread/nptl_db/td_thr_tlsbase.c b/libpthread/nptl_db/td_thr_tlsbase.c index 9f98bd9ae..3e1e4663f 100644 --- a/libpthread/nptl_db/td_thr_tlsbase.c +++ b/libpthread/nptl_db/td_thr_tlsbase.c @@ -24,12 +24,12 @@ td_thr_tlsbase (const td_thrhandle_t *th, psaddr_t *base) { td_err_e err; - psaddr_t dtv, dtvslot, dtvptr; + psaddr_t dtv, dtvslot, dtvptr, pd; if (modid < 1) return TD_NOTLS; - psaddr_t pd = th->th_unique; + pd = th->th_unique; if (pd == 0) { /* This is the fake handle for the main thread before libpthread -- cgit v1.2.3