* dwarf2read.c (dwarf2_per_cu_addr_size): Make result type an int.

	* dwarf2loc.h (dwarf2_per_cu_addr_size): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d1d3f0fdb06c2e56f657f7d5cf2d5886af57ac93..7d497882831d118dfcb64877cab285a41c4b6740 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2012-01-05  Doug Evans  <dje@google.com>
 
+       * dwarf2read.c (dwarf2_per_cu_addr_size): Make result type an int.
+       * dwarf2loc.h (dwarf2_per_cu_addr_size): Update.
+
        * dwarf2read.c (comp_unit_header): Delete, unused.
 
 2012-01-05  Ulrich Weigand  <uweigand@de.ibm.com>

diff --git a/gdb/dwarf2loc.h b/gdb/dwarf2loc.h
index da05c98e506a6b8a4bb347df4410df5cb692bf3a..a7f835fe6a724b0d3390ee656ebc9a697b6a7af7 100644 (file)
--- a/gdb/dwarf2loc.h
+++ b/gdb/dwarf2loc.h
@@ -39,7 +39,7 @@ extern int entry_values_debug;
 struct objfile *dwarf2_per_cu_objfile (struct dwarf2_per_cu_data *cu);
 
 /* Return the address size given in the compilation unit header for CU.  */
-CORE_ADDR dwarf2_per_cu_addr_size (struct dwarf2_per_cu_data *cu);
+int dwarf2_per_cu_addr_size (struct dwarf2_per_cu_data *cu);
 
 /* Return the DW_FORM_ref_addr size given in the compilation unit header for
    CU.  */

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index c5c3991e9baee894be3408b36a718362d9476aa2..6f72bb9f731a96bde6c4135a1bcec701d93246b7 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -15720,7 +15720,7 @@ per_cu_header_read_in (struct comp_unit_head *cu_headerp,
 
 /* Return the address size given in the compilation unit header for CU.  */
 
-CORE_ADDR
+int
 dwarf2_per_cu_addr_size (struct dwarf2_per_cu_data *per_cu)
 {
   struct comp_unit_head cu_header_local;