about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/mips/dl-trampoline.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bf18831d8..31a63e3f2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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.
 
 2014-12-11  Stefan Liebler  <stli@linux.vnet.ibm.com>
diff --git a/sysdeps/mips/dl-trampoline.c b/sysdeps/mips/dl-trampoline.c
index f565654934..66a1ea1c78 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:
 	  {