diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5c7e376498..a4d39a2d6b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-26  Tristan Gingold  <gingold@adacore.com>
+
+	* dwarf2loc.c (locexpr_describe_location_piece): Use uint64_t for
+	offset.
+
 2012-07-26  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* dwarf2loc.c (dwarf2_evaluate_loc_desc_full): Expand parameter
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 67a31f8d05..31c6a3e8fb 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -3430,7 +3430,7 @@ locexpr_describe_location_piece (struct symbol *symbol, struct ui_file *stream,
 	   && data[1 + leb128_size] == DW_OP_GNU_push_tls_address
 	   && piece_end_p (data + 2 + leb128_size, end))
     {
-      ULONGEST offset;
+      uint64_t offset;
 
       data = safe_read_uleb128 (data + 1, end, &offset);
       offset = dwarf2_read_addr_index (per_cu, offset);