From: Steve Ellcey <sellcey@mips.com>
Date: Thu, 11 Dec 2014 18:23:01 +0000 (-0800)
Subject: 	* sysdeps/mips/dl-trampoline.c: Modify switch expression to have
X-Git-Tag: glibc-2.21~250
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0276e18f327503f8cb9d6b942f25a87d144e60f;p=thirdparty%2Fglibc.git

	* sysdeps/mips/dl-trampoline.c: Modify switch expression to have
	integer value instead of boolean.
---

diff --git a/ChangeLog b/ChangeLog
index 3bf18831d82..31a63e3f2fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-11  Steve Ellcey  <sellcey@imgtec.com>
+
+	* sysdeps/mips/dl-trampoline.c: Modify switch expression to have
+	integer value instead of boolean.
+
 2014-12-11  Steve Ellcey  <sellcey@imgtec.com>
 
 	* malloc/malloc.c: Fix powerof2 check.
diff --git a/sysdeps/mips/dl-trampoline.c b/sysdeps/mips/dl-trampoline.c
index f5656549349..66a1ea1c788 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:
 	  {