Various minor fixups to make ppc32/64-linux work again following
recent ARM-Linux merge.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10992 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_libcassert.c b/coregrind/m_libcassert.c
index d2770cd..5d0b758 100644
--- a/coregrind/m_libcassert.c
+++ b/coregrind/m_libcassert.c
@@ -91,9 +91,9 @@
            : /* reads none */                             \
            : "r0" /* trashed */                           \
         );                                                \
-        srP->r_pc = (ULong)cia;                           \
-        srP->r_sp = (ULong)r1;                            \
-        srP->misc.PPC32.lr = lr;                          \
+        (srP)->r_pc = (ULong)cia;                         \
+        (srP)->r_sp = (ULong)r1;                          \
+        (srP)->misc.PPC32.r_lr = lr;                      \
       }
 #elif defined(VGP_ppc64_linux) || defined(VGP_ppc64_aix5)
 #  define GET_STARTREGS(srP)                              \
@@ -110,9 +110,9 @@
            : /* reads none */                             \
            : "r0" /* trashed */                           \
         );                                                \
-        srP->r_pc = cia;                                  \
-        srP->r_sp = r1;                                   \
-        srP->misc.PPC64.lr = lr;                          \
+        (srP)->r_pc = cia;                                \
+        (srP)->r_sp = r1;                                 \
+        (srP)->misc.PPC64.r_lr = lr;                      \
       }
 #elif defined(VGP_arm_linux)
 #  define GET_STARTREGS(srP)                              \