diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c7622cf762..3157c35d00 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-19  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* dwarf2loc.c (dwarf_expr_tls_address): Initialize ADDR.
+	* gnu-v3-abi.c (gnuv3_baseclass_offset): Update type of
+	VALADDR.
+
 2005-03-18  Kevin Buettner  <kevinb@redhat.com>
 
 	* Makefile.in (dwarf2loc.o, linux-thread-db.o): Add dependencies.
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index fc86470173..d9b1271ad4 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -186,7 +186,7 @@ static CORE_ADDR
 dwarf_expr_tls_address (void *baton, CORE_ADDR offset)
 {
   struct dwarf_expr_baton *debaton = (struct dwarf_expr_baton *) baton;
-  CORE_ADDR addr;
+  CORE_ADDR addr = 0;
 
   if (target_get_thread_local_address_p ())
     {
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index b497347478..9dc0232a64 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -355,7 +355,7 @@ gnuv3_virtual_fn_field (struct value **value_p,
 
    -1 is returned on error. */
 static int
-gnuv3_baseclass_offset (struct type *type, int index, char *valaddr,
+gnuv3_baseclass_offset (struct type *type, int index, const bfd_byte *valaddr,
 			CORE_ADDR address)
 {
   struct type *vtable_type = gdbarch_data (current_gdbarch,