diff --git a/include/tdep-hppa/dwarf-config.h b/include/tdep-hppa/dwarf-config.h
index 29f9eee..48897d3 100644
--- a/include/tdep-hppa/dwarf-config.h
+++ b/include/tdep-hppa/dwarf-config.h
@@ -35,6 +35,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
    plenty of room for expansion.  */
 #define DWARF_NUM_PRESERVED_REGS	89
 
+#define DWARF_REGNUM_MAP_LENGTH		DWARF_NUM_PRESERVED_REGS
+
 /* Return TRUE if the ADDR_SPACE uses big-endian byte-order.  */
 #define dwarf_is_big_endian(addr_space)	1
 
diff --git a/include/tdep-hppa/libunwind_i.h b/include/tdep-hppa/libunwind_i.h
index f216849..4bcbe96 100644
--- a/include/tdep-hppa/libunwind_i.h
+++ b/include/tdep-hppa/libunwind_i.h
@@ -242,14 +242,14 @@ dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val)
 # define tdep_find_proc_info(c,ip,n)				\
 	dwarf_find_proc_info((c)->as, (ip), &(c)->pi, (n),	\
 				       (c)->as_arg)
-# define tdep_put_unwind_info(c,pi)				\
-	dwarf_put_unwind_info((c)->as, (pi), (c)->as_arg)
+# define tdep_put_unwind_info(as,pi,arg)		\
+	dwarf_put_unwind_info((as), (pi), (arg))
 #else
 # define tdep_find_proc_info(c,ip,n)					\
 	(*(c)->as->acc.find_proc_info)((c)->as, (ip), &(c)->pi, (n),	\
 				       (c)->as_arg)
-# define tdep_put_unwind_info(c,pi)					\
-	(*(c)->as->acc.put_unwind_info)((c)->as, (pi), (c)->as_arg)
+# define tdep_put_unwind_info(as,pi,arg)		\
+	(*(as)->acc.put_unwind_info)((as), (pi), (arg))
 #endif
 
 #define tdep_get_as(c)			((c)->dwarf.as)