This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [Patch, MIPS] Fix warning in sysdeps/mips/dl-trampoline.c
- From: Steve Ellcey <sellcey at imgtec dot com>
- To: Carlos O'Donell <carlos at redhat dot com>
- Cc: <libc-alpha at sourceware dot org>
- Date: Thu, 11 Dec 2014 09:22:48 -0800
- Subject: Re: [Patch, MIPS] Fix warning in sysdeps/mips/dl-trampoline.c
- Authentication-results: sourceware.org; auth=none
- References: <872cdd55-2333-4304-9335-3ca5574f30c5 at BAMAIL02 dot ba dot imgtec dot org> <5488ECDE dot 6070702 at redhat dot com> <1418314875 dot 2196 dot 141 dot camel at ubuntu-sellcey> <5489C6E5 dot 9030306 at redhat dot com>
- Reply-to: <sellcey at imgtec dot com>
On Thu, 2014-12-11 at 11:31 -0500, Carlos O'Donell wrote:
> On 12/11/2014 11:21 AM, Steve Ellcey wrote:
> > On Wed, 2014-12-10 at 20:01 -0500, Carlos O'Donell wrote:
> >
> >> Why not "switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL ? 0 : 1)" to
> >> avoid the (int) case potentially hiding future type errors?
> >
> > That seems reasonable but shouldn't it be "switch (l->l_info[VERSYMIDX
> > (DT_VERSYM)] != NULL ? 1 : 0)" I.e. return 1 if the boolean expression
> > is true and 0 if the boolean expression is false?
>
> Yes, you are correct, my mistake.
>
> Cheers,
> Carlos.
OK, here is what I am currently testing. OK for checkin if my testing
finishes with no regressions?
Steve Ellcey
sellcey@imgtec.com
2014-12-11 Steve Ellcey <sellcey@imgtec.com>
* sysdeps/mips/dl-trampoline.c: Modify switch expression.
diff --git a/sysdeps/mips/dl-trampoline.c b/sysdeps/mips/dl-trampoline.c
index f565654..66a1ea1 100644
--- a/sysdeps/mips/dl-trampoline.c
+++ b/sysdeps/mips/dl-trampoline.c
@@ -139,7 +139,7 @@ __dl_runtime_resolve (ElfW(Word) sym_index,
/* FIXME: The symbol versioning stuff is not tested yet. */
if (__builtin_expect (ELFW(ST_VISIBILITY) (sym->st_other), 0) == 0)
{
- switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL)
+ switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL ? 1 : 0)
{
default:
{