aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2013-04-19 15:24:55 +0000
committerPedro Alves <palves@redhat.com>2013-04-19 15:24:55 +0000
commit51a5cd9059b96a2ac33cf149d369db12b891fd96 (patch)
treef5e5827454ba1b61f62888034c4832bc0c37b182
parenta993366103a671e95f5721e5517f8a68149d4d0a (diff)
downloadgdb-51a5cd9059b96a2ac33cf149d369db12b891fd96.zip
gdb-51a5cd9059b96a2ac33cf149d369db12b891fd96.tar.gz
gdb-51a5cd9059b96a2ac33cf149d369db12b891fd96.tar.bz2
Cast result of obstack_base to gdb_byte * in a couple spots.
obstack_base returns char *. Need to cast to gdb_byte * in a couple spots. gdb/ 2013-04-19 Pedro Alves <palves@redhat.com> * c-lang.c (evaluate_subexp_c): Cast result of obstack_base to gdb_byte *. * linux-tdep.c (linux_make_mappings_corefile_notes): Likewise.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/c-lang.c2
-rw-r--r--gdb/linux-tdep.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 122cfb4..4ca6617 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2013-04-19 Pedro Alves <palves@redhat.com>
+ * c-lang.c (evaluate_subexp_c): Cast result of obstack_base to
+ gdb_byte *.
+ * linux-tdep.c (linux_make_mappings_corefile_notes): Likewise.
+
+2013-04-19 Pedro Alves <palves@redhat.com>
+
* alpha-tdep.c (alpha_extract_return_value): Use
regcache_cooked_read_unsigned to read 'v0'.
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 6f9d392..48a1fb0 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -658,7 +658,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp,
if (obstack_object_size (&output) != TYPE_LENGTH (type))
error (_("Could not convert character "
"constant to target character set"));
- value = unpack_long (type, obstack_base (&output));
+ value = unpack_long (type, (gdb_byte *) obstack_base (&output));
result = value_from_longest (type, value);
}
else
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index 9623d19..bfb6404 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -993,8 +993,8 @@ linux_make_mappings_corefile_notes (struct gdbarch *gdbarch, bfd *obfd,
if (mapping_data.file_count != 0)
{
/* Write the count to the obstack. */
- pack_long (obstack_base (&data_obstack), long_type,
- mapping_data.file_count);
+ pack_long ((gdb_byte *) obstack_base (&data_obstack),
+ long_type, mapping_data.file_count);
/* Copy the filenames to the data obstack. */
obstack_grow (&data_obstack, obstack_base (&filename_obstack),