Change type of return value of offset read hooks to Dwarf_Off

diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index fb9045f06748cfbd919723c2b12eb51ee57ab906..b13323376e7a3b0f15f4854bb1d37ce69279d803 100644 (file)
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -445,7 +445,7 @@ int __libdw_relocate_address (Dwarf *dbg,
 
 int __libdw_relocate_offset (Dwarf *dbg,
                             int sec_index, uintptr_t addr,
-                            int width, Dwarf_Addr *val)
+                            int width, Dwarf_Off *val)
   internal_function;
 
 #define READ_AND_RELOCATE(RELOC_HOOK)                                  \
@@ -455,7 +455,7 @@ int __libdw_relocate_offset (Dwarf *dbg,
       return status;                                                   \
                                                                        \
     uintptr_t addr0 = (uintptr_t)*addr;                                        \
-    Dwarf_Addr val;                                                    \
+    __typeof (*ret) val;                                               \
                                                                        \
     if (width == 4)                                                    \
       val = read_4ubyte_unaligned_inc (dbg, *addr);                    \
@@ -483,7 +483,7 @@ __libdw_read_address_inc (Dwarf *dbg,
 static inline int
 __libdw_read_offset_inc (Dwarf *dbg,
                         int sec_index, unsigned char **addr,
-                        int width, Dwarf_Addr *ret)
+                        int width, Dwarf_Off *ret)
 {
   READ_AND_RELOCATE (__libdw_relocate_offset)
 }

diff --git a/libdw/libdw_readhooks.c b/libdw/libdw_readhooks.c
index 20a5e1e88bb3537e1e1921c9eead03ecba9ef131..404f12aa72efaca057b4d93a7146b0a581e846fd 100644 (file)
--- a/libdw/libdw_readhooks.c
+++ b/libdw/libdw_readhooks.c
@@ -68,7 +68,7 @@ __libdw_relocate_offset (Dwarf *dbg __attribute__ ((unused)),
                         int sec_index __attribute__ ((unused)),
                         uintptr_t addr __attribute__ ((unused)),
                         int width __attribute__ ((unused)),
-                        Dwarf_Addr *val __attribute__ ((unused)))
+                        Dwarf_Off *val __attribute__ ((unused)))
 {
   return 0;
 }