* sysdeps/mips/dl-trampoline.c: Modify switch expression to have

	integer value instead of boolean.

diff --git a/ChangeLog b/ChangeLog
index 3bf18831d8256b6b59fc8cf577f73059c1261118..31a63e3f2fd7064eb36e288326b2349cc87d9381 100644 (file)
--- 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 f5656549349c66042a0da34706046d4ac72c2199..66a1ea1c78883a6fbb01155a55e374fc6a94e297 100644 (file)
--- 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:
          {