summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libgcc/ChangeLog5
-rw-r--r--libgcc/config/rs6000/linux-unwind.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index a40d4594b95..6e6f79a046c 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-12 Richard Henderson <rth@redhat.com>
+
+ * config/rs6000/linux-unwind.h (frob_update_context): Properly
+ cast the pointer argument to _Unwind_SetGRPtr.
+
2011-11-11 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* config/spu/t-elf (LIB2ADD): Use LIB2FUNCS_EXCLUDE instead.
diff --git a/libgcc/config/rs6000/linux-unwind.h b/libgcc/config/rs6000/linux-unwind.h
index 20116326c3c..13bf413c7c9 100644
--- a/libgcc/config/rs6000/linux-unwind.h
+++ b/libgcc/config/rs6000/linux-unwind.h
@@ -368,7 +368,7 @@ frob_update_context (struct _Unwind_Context *context, _Unwind_FrameState *fs ATT
before the bctrl so this is the first and only place
we need to use the stored R2. */
_Unwind_Word sp = _Unwind_GetGR (context, 1);
- _Unwind_SetGRPtr (context, 2, sp + 40);
+ _Unwind_SetGRPtr (context, 2, (void *)(sp + 40));
}
}
}