2005-05-09 Andrew Cagney <cagney@gnu.org>

	Use gdb_byte in preference to bfd_byte.
	* gdbarch.sh: Update.
	* gdbarch.h, gdbarch.c: Re-generate.
	* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
	* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
	* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
	* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
	* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
	* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
	* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
	* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
	* valprint.h, value.c, value.h: Update.

40 files changed, 218 insertions, 203 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7881fe54759..316af21b760 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2005-05-09  Andrew Cagney  <cagney@gnu.org>
+
+	Use gdb_byte in preference to bfd_byte.
+	* gdbarch.sh: Update.
+	* gdbarch.h, gdbarch.c: Re-generate.
+	* ada-lang.c, ada-lang.h, ada-valprint.c, arch-utils.c: Update.
+	* c-lang.c, c-lang.h, c-valprint.c, cp-valprint.c: Update.
+	* f-lang.c, f-lang.h, f-valprint.c, gdbcore.h, jv-lang.h: Update.
+	* jv-valprint.c, language.c, language.h, m2-lang.c: Update.
+	* m2-lang.h, m2-valprint.c, objc-lang.c, p-lang.c: Update.
+	* p-lang.h, p-valprint.c, regcache.c, scm-lang.c: Update.
+	* scm-lang.h, scm-valprint.c, target.c, target.h: Update.
+	* tramp-frame.c, valarith.c, valops.c, valprint.c: Update.
+	* valprint.h, value.c, value.h: Update.
+
 2005-05-09  Mark Kettenis  <kettenis@gnu.org>
 
 	* vaxbsd-nat.c (vaxbsd_supply_gregset, vaxbsd_collect_gregset):
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index e2d0552824e..0760beca5e4 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -163,7 +163,7 @@ static struct value *evaluate_subexp_type (struct expression *, int *);
 static int is_dynamic_field (struct type *, int);
 
 static struct type *to_fixed_variant_branch_type (struct type *,
-						  const bfd_byte *,
+						  const gdb_byte *,
                                                   CORE_ADDR, struct value *);
 
 static struct type *to_fixed_array_type (struct type *, struct value *, int);
@@ -415,7 +415,7 @@ is_suffix (const char *str, const char *suffix)
 
 struct value *
 value_from_contents_and_address (struct type *type,
-				 const bfd_byte *valaddr,
+				 const gdb_byte *valaddr,
                                  CORE_ADDR address)
 {
   struct value *v = allocate_value (type);
@@ -461,8 +461,8 @@ coerce_unspec_val_to_type (struct value *val, struct type *type)
     }
 }
 
-static const bfd_byte *
-cond_offset_host (const bfd_byte *valaddr, long offset)
+static const gdb_byte *
+cond_offset_host (const gdb_byte *valaddr, long offset)
 {
   if (valaddr == NULL)
     return NULL;
@@ -1783,7 +1783,7 @@ has_negatives (struct type *type)
    Assumes 0 <= BIT_OFFSET < HOST_CHAR_BIT.  */
 
 struct value *
-ada_value_primitive_packed_val (struct value *obj, const bfd_byte *valaddr,
+ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
 				long offset, int bit_offset, int bit_size,
                                 struct type *type)
 {
@@ -1935,7 +1935,7 @@ ada_value_primitive_packed_val (struct value *obj, const bfd_byte *valaddr,
    TARGET, starting at bit offset TARG_OFFSET.  SOURCE and TARGET must
    not overlap.  */
 static void
-move_bits (bfd_byte *target, int targ_offset, const bfd_byte *source,
+move_bits (gdb_byte *target, int targ_offset, const gdb_byte *source,
 	   int src_offset, int n)
 {
   unsigned int accum, mask;
@@ -5000,7 +5000,7 @@ ada_value_tag (struct value *val)
 
 static struct value *
 value_tag_from_contents_and_address (struct type *type,
-				     const bfd_byte *valaddr,
+				     const gdb_byte *valaddr,
                                      CORE_ADDR address)
 {
   int tag_byte_offset, dummy1, dummy2;
@@ -5008,7 +5008,7 @@ value_tag_from_contents_and_address (struct type *type,
   if (find_struct_field ("_tag", type, 0, &tag_type, &tag_byte_offset,
                          &dummy1, &dummy2))
     {
-      const bfd_byte *valaddr1 = ((valaddr == NULL)
+      const gdb_byte *valaddr1 = ((valaddr == NULL)
 				  ? NULL
 				  : valaddr + tag_byte_offset);
       CORE_ADDR address1 = (address == 0) ? 0 : address + tag_byte_offset;
@@ -5706,7 +5706,7 @@ BadName:
 
 int
 ada_which_variant_applies (struct type *var_type, struct type *outer_type,
-                           const bfd_byte *outer_valaddr)
+                           const gdb_byte *outer_valaddr)
 {
   int others_clause;
   int i;
@@ -6057,7 +6057,7 @@ empty_record (struct objfile *objfile)
 
 struct type *
 ada_template_to_fixed_record_type_1 (struct type *type,
-				     const bfd_byte *valaddr,
+				     const gdb_byte *valaddr,
                                      CORE_ADDR address, struct value *dval0,
                                      int keep_dynamic_fields)
 {
@@ -6217,7 +6217,7 @@ ada_template_to_fixed_record_type_1 (struct type *type,
    of 1.  */
 
 static struct type *
-template_to_fixed_record_type (struct type *type, const bfd_byte *valaddr,
+template_to_fixed_record_type (struct type *type, const gdb_byte *valaddr,
                                CORE_ADDR address, struct value *dval0)
 {
   return ada_template_to_fixed_record_type_1 (type, valaddr,
@@ -6284,7 +6284,7 @@ template_to_static_fixed_type (struct type *type0)
    contains the necessary discriminant values.  */
 
 static struct type *
-to_record_with_fixed_variant_part (struct type *type, const bfd_byte *valaddr,
+to_record_with_fixed_variant_part (struct type *type, const gdb_byte *valaddr,
                                    CORE_ADDR address, struct value *dval0)
 {
   struct value *mark = value_mark ();
@@ -6362,7 +6362,7 @@ to_record_with_fixed_variant_part (struct type *type, const bfd_byte *valaddr,
    shortcut and suspect the compiler should be altered.  FIXME.  */
 
 static struct type *
-to_fixed_record_type (struct type *type0, const bfd_byte *valaddr,
+to_fixed_record_type (struct type *type0, const gdb_byte *valaddr,
                       CORE_ADDR address, struct value *dval)
 {
   struct type *templ_type;
@@ -6397,7 +6397,7 @@ to_fixed_record_type (struct type *type0, const bfd_byte *valaddr,
    indicated in the union's type name.  */
 
 static struct type *
-to_fixed_variant_branch_type (struct type *var_type0, const bfd_byte *valaddr,
+to_fixed_variant_branch_type (struct type *var_type0, const gdb_byte *valaddr,
                               CORE_ADDR address, struct value *dval)
 {
   int which;
@@ -6503,7 +6503,7 @@ to_fixed_array_type (struct type *type0, struct value *dval,
    ADDRESS or in VALADDR contains these discriminants.  */
 
 struct type *
-ada_to_fixed_type (struct type *type, const bfd_byte *valaddr,
+ada_to_fixed_type (struct type *type, const gdb_byte *valaddr,
                    CORE_ADDR address, struct value *dval)
 {
   type = ada_check_typedef (type);
@@ -6855,8 +6855,8 @@ ada_aligned_type (struct type *type)
 /* The address of the aligned value in an object at address VALADDR
    having type TYPE.  Assumes ada_is_aligner_type (TYPE).  */
 
-const bfd_byte *
-ada_aligned_value_addr (struct type *type, const bfd_byte *valaddr)
+const gdb_byte *
+ada_aligned_value_addr (struct type *type, const gdb_byte *valaddr)
 {
   if (ada_is_aligner_type (type))
     return ada_aligned_value_addr (TYPE_FIELD_TYPE (type, 0),
diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index 9979376dd50..c796e8b17db 100644
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -188,7 +188,7 @@ extern void ada_error (char *); /* Defined in ada-exp.y */
 extern void ada_print_type (struct type *, char *, struct ui_file *, int,
                             int);
 
-extern int ada_val_print (struct type *, const bfd_byte *, int, CORE_ADDR,
+extern int ada_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
                           struct ui_file *, int, int, int,
                           enum val_prettyprint);
 
@@ -198,14 +198,14 @@ extern int ada_value_print (struct value *, struct ui_file *, int,
                                 /* Defined in ada-lang.c */
 
 extern struct value *value_from_contents_and_address (struct type *,
-						      const bfd_byte *,
+						      const gdb_byte *,
                                                       CORE_ADDR);
 
 extern void ada_emit_char (int, struct ui_file *, int, int);
 
 extern void ada_printchar (int, struct ui_file *);
 
-extern void ada_printstr (struct ui_file *, const bfd_byte *,
+extern void ada_printstr (struct ui_file *, const gdb_byte *,
 			  unsigned int, int, int);
 
 extern void ada_convert_actuals (struct value *, int, struct value **,
@@ -279,7 +279,7 @@ extern int ada_is_ignored_field (struct type *, int);
 extern int ada_is_packed_array_type (struct type *);
 
 extern struct value *ada_value_primitive_packed_val (struct value *,
-						     const bfd_byte *,
+						     const gdb_byte *,
                                                      long, int, int,
                                                      struct type *);
 
@@ -319,8 +319,8 @@ extern int ada_is_aligner_type (struct type *);
 
 extern struct type *ada_aligned_type (struct type *);
 
-extern const bfd_byte *ada_aligned_value_addr (struct type *,
-					       const bfd_byte *);
+extern const gdb_byte *ada_aligned_value_addr (struct type *,
+					       const gdb_byte *);
 
 extern const char *ada_attribute_name (enum exp_opcode);
 
@@ -343,13 +343,13 @@ extern struct value *ada_vax_float_print_function (struct type *);
 extern struct type *ada_system_address_type (void);
 
 extern int ada_which_variant_applies (struct type *, struct type *,
-				      const bfd_byte *);
+				      const gdb_byte *);
 
-extern struct type *ada_to_fixed_type (struct type *, const bfd_byte *,
+extern struct type *ada_to_fixed_type (struct type *, const gdb_byte *,
 				       CORE_ADDR, struct value *);
 
 extern struct type *ada_template_to_fixed_record_type_1 (struct type *type,
-							 const bfd_byte *valaddr,
+							 const gdb_byte *valaddr,
 							 CORE_ADDR address,
 							 struct value *dval0,
 							 int keep_dynamic_fields);
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 600c9a85967..0fbb9c9b862 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -39,7 +39,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 struct ada_val_print_args
 {
   struct type *type;
-  const bfd_byte *valaddr0;
+  const gdb_byte *valaddr0;
   int embedded_offset;
   CORE_ADDR address;
   struct ui_file *stream;
@@ -49,19 +49,19 @@ struct ada_val_print_args
   enum val_prettyprint pretty;
 };
 
-static void print_record (struct type *, const bfd_byte *, struct ui_file *,
+static void print_record (struct type *, const gdb_byte *, struct ui_file *,
 			  int, int, enum val_prettyprint);
 
-static int print_field_values (struct type *, const bfd_byte *,
+static int print_field_values (struct type *, const gdb_byte *,
 			       struct ui_file *, int, int,
 			       enum val_prettyprint, int, struct type *,
-			       const bfd_byte *);
+			       const gdb_byte *);
 
 static void adjust_type_signedness (struct type *);
 
 static int ada_val_print_stub (void *args0);
 
-static int ada_val_print_1 (struct type *, const bfd_byte *, int, CORE_ADDR,
+static int ada_val_print_1 (struct type *, const gdb_byte *, int, CORE_ADDR,
 			    struct ui_file *, int, int, int,
 			    enum val_prettyprint);
 
@@ -129,7 +129,7 @@ print_optional_low_bound (struct ui_file *stream, struct type *type)
     by ada_coerce_to_simple_array).  */
 
 static void
-val_print_packed_array_elements (struct type *type, const bfd_byte *valaddr,
+val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
 				 int bitoffset, struct ui_file *stream,
 				 int format, int recurse,
 				 enum val_prettyprint pretty)
@@ -237,7 +237,7 @@ val_print_packed_array_elements (struct type *type, const bfd_byte *valaddr,
 }
 
 static struct type *
-printable_val_type (struct type *type, const bfd_byte *valaddr)
+printable_val_type (struct type *type, const gdb_byte *valaddr)
 {
   return ada_to_fixed_type (ada_aligned_type (type), valaddr, 0, NULL);
 }
@@ -269,7 +269,7 @@ ada_emit_char (int c, struct ui_file *stream, int quoter, int type_len)
    or 2) of a character.  */
 
 static int
-char_at (const bfd_byte *string, int i, int type_len)
+char_at (const gdb_byte *string, int i, int type_len)
 {
   if (type_len == 1)
     return string[i];
@@ -290,7 +290,7 @@ ui_memcpy (void *dest, const char *buffer, long len)
    a decimal point, and at least one digit before and after the
    point.  We use GNAT format for NaNs and infinities.  */
 static void
-ada_print_floating (const bfd_byte *valaddr, struct type *type,
+ada_print_floating (const gdb_byte *valaddr, struct type *type,
 		    struct ui_file *stream)
 {
   char buffer[64];
@@ -431,7 +431,7 @@ ada_print_scalar (struct type *type, LONGEST val, struct ui_file *stream)
  */
 
 static void
-printstr (struct ui_file *stream, const bfd_byte *string,
+printstr (struct ui_file *stream, const gdb_byte *string,
 	  unsigned int length, int force_ellipses, int type_len)
 {
   unsigned int i;
@@ -520,7 +520,7 @@ printstr (struct ui_file *stream, const bfd_byte *string,
 }
 
 void
-ada_printstr (struct ui_file *stream, const bfd_byte *string,
+ada_printstr (struct ui_file *stream, const gdb_byte *string,
 	      unsigned int length, int width, int force_ellipses)
 {
   printstr (stream, string, length, force_ellipses, width);
@@ -547,7 +547,7 @@ ada_printstr (struct ui_file *stream, const bfd_byte *string,
    arrays.)  */
 
 int
-ada_val_print (struct type *type, const bfd_byte *valaddr0,
+ada_val_print (struct type *type, const gdb_byte *valaddr0,
 	       int embedded_offset, CORE_ADDR address,
 	       struct ui_file *stream, int format, int deref_ref,
 	       int recurse, enum val_prettyprint pretty)
@@ -582,7 +582,7 @@ ada_val_print_stub (void *args0)
  * does not catch evaluation errors (leaving that to ada_val_print).  */
 
 static int
-ada_val_print_1 (struct type *type, const bfd_byte *valaddr0,
+ada_val_print_1 (struct type *type, const gdb_byte *valaddr0,
 		 int embedded_offset, CORE_ADDR address,
 		 struct ui_file *stream, int format,
 		 int deref_ref, int recurse, enum val_prettyprint pretty)
@@ -592,7 +592,7 @@ ada_val_print_1 (struct type *type, const bfd_byte *valaddr0,
   struct type *elttype;
   unsigned int eltlen;
   LONGEST val;
-  const bfd_byte *valaddr = valaddr0 + embedded_offset;
+  const gdb_byte *valaddr = valaddr0 + embedded_offset;
 
   type = ada_check_typedef (type);
 
@@ -873,10 +873,10 @@ ada_val_print_1 (struct type *type, const bfd_byte *valaddr0,
 }
 
 static int
-print_variant_part (struct type *type, int field_num, const bfd_byte *valaddr,
+print_variant_part (struct type *type, int field_num, const gdb_byte *valaddr,
 		    struct ui_file *stream, int format, int recurse,
 		    enum val_prettyprint pretty, int comma_needed,
-		    struct type *outer_type, const bfd_byte *outer_valaddr)
+		    struct type *outer_type, const gdb_byte *outer_valaddr)
 {
   struct type *var_type = TYPE_FIELD_TYPE (type, field_num);
   int which = ada_which_variant_applies (var_type, outer_type, outer_valaddr);
@@ -896,7 +896,7 @@ int
 ada_value_print (struct value *val0, struct ui_file *stream, int format,
 		 enum val_prettyprint pretty)
 {
-  const bfd_byte *valaddr = value_contents (val0);
+  const gdb_byte *valaddr = value_contents (val0);
   CORE_ADDR address = VALUE_ADDRESS (val0) + value_offset (val0);
   struct type *type =
     ada_to_fixed_type (value_type (val0), valaddr, address, NULL);
@@ -952,7 +952,7 @@ ada_value_print (struct value *val0, struct ui_file *stream, int format,
 }
 
 static void
-print_record (struct type *type, const bfd_byte *valaddr,
+print_record (struct type *type, const gdb_byte *valaddr,
 	      struct ui_file *stream, int format, int recurse,
 	      enum val_prettyprint pretty)
 {
@@ -985,10 +985,10 @@ print_record (struct type *type, const bfd_byte *valaddr,
    Returns 1 if COMMA_NEEDED or any fields were printed.  */
 
 static int
-print_field_values (struct type *type, const bfd_byte *valaddr,
+print_field_values (struct type *type, const gdb_byte *valaddr,
 		    struct ui_file *stream, int format, int recurse,
 		    enum val_prettyprint pretty, int comma_needed,
-		    struct type *outer_type, const bfd_byte *outer_valaddr)
+		    struct type *outer_type, const gdb_byte *outer_valaddr)
 {
   int i, len;
 
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index a8fa5caa9cc..13134fa9bf4 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -44,7 +44,7 @@ legacy_extract_return_value (struct type *type, struct regcache *regcache,
 			     void *valbuf)
 {
   char *registers = deprecated_grub_regcache_for_registers (regcache);
-  bfd_byte *buf = valbuf;
+  gdb_byte *buf = valbuf;
   DEPRECATED_EXTRACT_RETURN_VALUE (type, registers, buf); /* OK */
 }
 
@@ -54,7 +54,7 @@ void
 legacy_store_return_value (struct type *type, struct regcache *regcache,
 			   const void *buf)
 {
-  bfd_byte *b = alloca (TYPE_LENGTH (type));
+  gdb_byte *b = alloca (TYPE_LENGTH (type));
   gdb_assert (regcache == current_regcache);
   memcpy (b, buf, TYPE_LENGTH (type));
   DEPRECATED_STORE_RETURN_VALUE (type, b);
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index 35b51315903..6f1d8fe7fba 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -86,7 +86,7 @@ c_printchar (int c, struct ui_file *stream)
    printing LENGTH characters, or if FORCE_ELLIPSES.  */
 
 void
-c_printstr (struct ui_file *stream, const bfd_byte *string,
+c_printstr (struct ui_file *stream, const gdb_byte *string,
 	    unsigned int length, int width, int force_ellipses)
 {
   unsigned int i;
diff --git a/gdb/c-lang.h b/gdb/c-lang.h
index 0ff90ef730d..2146a406026 100644
--- a/gdb/c-lang.h
+++ b/gdb/c-lang.h
@@ -39,7 +39,7 @@ extern void c_error (char *);	/* Defined in c-exp.y */
 extern void c_print_type (struct type *, char *, struct ui_file *, int,
 			  int);
 
-extern int c_val_print (struct type *, const bfd_byte *, int, CORE_ADDR,
+extern int c_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
 			struct ui_file *, int, int, int,
 			enum val_prettyprint);
 
@@ -50,7 +50,7 @@ extern int c_value_print (struct value *, struct ui_file *, int,
 
 extern void c_printchar (int, struct ui_file *);
 
-extern void c_printstr (struct ui_file * stream, const bfd_byte *string,
+extern void c_printstr (struct ui_file * stream, const gdb_byte *string,
 			unsigned int length, int width,
 			int force_ellipses);
 
@@ -76,14 +76,14 @@ extern int vtblprint;		/* Controls printing of vtbl's */
 
 extern int static_field_print;
 
-extern void cp_print_class_member (const bfd_byte *, struct type *,
+extern void cp_print_class_member (const gdb_byte *, struct type *,
 				   struct ui_file *, char *);
 
-extern void cp_print_class_method (const bfd_byte *, struct type *,
+extern void cp_print_class_method (const gdb_byte *, struct type *,
 				   struct ui_file *);
 
 extern void cp_print_value_fields (struct type *, struct type *,
-				   const bfd_byte *, int, CORE_ADDR,
+				   const gdb_byte *, int, CORE_ADDR,
 				   struct ui_file *, int,
 				   int, enum val_prettyprint,
 				   struct type **, int);
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 0a4255eebd5..15b2c2eac6c 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -70,7 +70,7 @@ print_function_pointer_address (CORE_ADDR address, struct ui_file *stream)
    The PRETTY parameter controls prettyprinting.  */
 
 int
-c_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
+c_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 	     CORE_ADDR address, struct ui_file *stream, int format,
 	     int deref_ref, int recurse, enum val_prettyprint pretty)
 {
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index cc481b4dd5d..223d0154ed6 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -81,7 +81,7 @@ static void cp_print_static_field (struct type *, struct value *,
 				   struct ui_file *, int, int,
 				   enum val_prettyprint);
 
-static void cp_print_value (struct type *, struct type *, const bfd_byte *,
+static void cp_print_value (struct type *, struct type *, const gdb_byte *,
 			    int, CORE_ADDR, struct ui_file *, int, int,
 			    enum val_prettyprint, struct type **);
 
@@ -93,7 +93,7 @@ static void cp_print_hpacc_virtual_table_entries (struct type *, int *,
 
 
 void
-cp_print_class_method (const bfd_byte *valaddr,
+cp_print_class_method (const gdb_byte *valaddr,
 		       struct type *type,
 		       struct ui_file *stream)
 {
@@ -259,7 +259,7 @@ cp_is_vtbl_member (struct type *type)
 
 void
 cp_print_value_fields (struct type *type, struct type *real_type,
-		       const bfd_byte *valaddr, int offset, CORE_ADDR address,
+		       const gdb_byte *valaddr, int offset, CORE_ADDR address,
 		       struct ui_file *stream, int format, int recurse,
 		       enum val_prettyprint pretty,
 		       struct type **dont_print_vb,int dont_print_statmem)
@@ -520,7 +520,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
 
 static void
 cp_print_value (struct type *type, struct type *real_type,
-		const bfd_byte *valaddr, int offset, CORE_ADDR address,
+		const gdb_byte *valaddr, int offset, CORE_ADDR address,
 		struct ui_file *stream, int format, int recurse,
 		enum val_prettyprint pretty, struct type **dont_print_vb)
 {
@@ -547,7 +547,7 @@ cp_print_value (struct type *type, struct type *real_type,
       int skip;
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
       char *basename = TYPE_NAME (baseclass);
-      const bfd_byte *base_valaddr;
+      const gdb_byte *base_valaddr;
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
 	{
@@ -594,7 +594,7 @@ cp_print_value (struct type *type, struct type *real_type,
 		      || (boffset + offset) >= TYPE_LENGTH (type)))
 		{
 		  /* FIXME (alloca): unsafe if baseclass is really really large. */
-		  bfd_byte *buf = alloca (TYPE_LENGTH (baseclass));
+		  gdb_byte *buf = alloca (TYPE_LENGTH (baseclass));
 		  base_valaddr = buf;
 		  if (target_read_memory (address + boffset, buf,
 					  TYPE_LENGTH (baseclass)) != 0)
@@ -704,7 +704,7 @@ cp_print_static_field (struct type *type,
 }
 
 void
-cp_print_class_member (const bfd_byte *valaddr, struct type *domain,
+cp_print_class_member (const gdb_byte *valaddr, struct type *domain,
 		       struct ui_file *stream, char *prefix)
 {
 
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index d5b40cdbb43..9308dbd6bca 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -160,7 +160,7 @@ f_printchar (int c, struct ui_file *stream)
    be replaced with a true F77 version. */
 
 static void
-f_printstr (struct ui_file *stream, const bfd_byte *string,
+f_printstr (struct ui_file *stream, const gdb_byte *string,
 	    unsigned int length, int width, int force_ellipses)
 {
   unsigned int i;
diff --git a/gdb/f-lang.h b/gdb/f-lang.h
index 2c4ae12b545..6145cb50f7a 100644
--- a/gdb/f-lang.h
+++ b/gdb/f-lang.h
@@ -30,7 +30,7 @@ extern void f_error (char *);	/* Defined in f-exp.y */
 extern void f_print_type (struct type *, char *, struct ui_file *, int,
 			  int);
 
-extern int f_val_print (struct type *, const bfd_byte *, int, CORE_ADDR,
+extern int f_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
 			struct ui_file *, int, int, int,
 			enum val_prettyprint);
 
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 5d86798f1b1..24be42bbc66 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -274,7 +274,7 @@ f77_create_arrayprint_offset_tbl (struct type *type, struct ui_file *stream)
 
 static void
 f77_print_array_1 (int nss, int ndimensions, struct type *type,
-		   const bfd_byte *valaddr, CORE_ADDR address,
+		   const gdb_byte *valaddr, CORE_ADDR address,
 		   struct ui_file *stream, int format,
 		   int deref_ref, int recurse, enum val_prettyprint pretty,
 		   int *elts)
@@ -319,7 +319,7 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type,
    stuff and then immediately call f77_print_array_1() */
 
 static void
-f77_print_array (struct type *type, const bfd_byte *valaddr,
+f77_print_array (struct type *type, const gdb_byte *valaddr,
 		 CORE_ADDR address, struct ui_file *stream,
 		 int format, int deref_ref, int recurse,
 		 enum val_prettyprint pretty)
@@ -358,7 +358,7 @@ f77_print_array (struct type *type, const bfd_byte *valaddr,
    The PRETTY parameter controls prettyprinting.  */
 
 int
-f_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
+f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 	     CORE_ADDR address, struct ui_file *stream, int format,
 	     int deref_ref, int recurse, enum val_prettyprint pretty)
 {
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 4aee6495f51..cde8ab88451 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -2729,7 +2729,7 @@ gdbarch_integer_to_address_p (struct gdbarch *gdbarch)
 }
 
 CORE_ADDR
-gdbarch_integer_to_address (struct gdbarch *gdbarch, struct type *type, const bfd_byte *buf)
+gdbarch_integer_to_address (struct gdbarch *gdbarch, struct type *type, const gdb_byte *buf)
 {
   gdb_assert (gdbarch != NULL);
   gdb_assert (gdbarch->integer_to_address != NULL);
@@ -2829,7 +2829,7 @@ set_gdbarch_store_return_value (struct gdbarch *gdbarch,
 }
 
 void
-gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, struct type *type, bfd_byte *regbuf, bfd_byte *valbuf)
+gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, struct type *type, gdb_byte *regbuf, gdb_byte *valbuf)
 {
   gdb_assert (gdbarch != NULL);
   gdb_assert (gdbarch->deprecated_extract_return_value != NULL);
@@ -2846,7 +2846,7 @@ set_gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch,
 }
 
 void
-gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, struct type *type, bfd_byte *valbuf)
+gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, struct type *type, gdb_byte *valbuf)
 {
   gdb_assert (gdbarch != NULL);
   gdb_assert (gdbarch->deprecated_store_return_value != NULL);
@@ -2937,7 +2937,7 @@ set_gdbarch_inner_than (struct gdbarch *gdbarch,
   gdbarch->inner_than = inner_than;
 }
 
-const bfd_byte *
+const gdb_byte *
 gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr)
 {
   gdb_assert (gdbarch != NULL);
@@ -2979,7 +2979,7 @@ set_gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch,
 }
 
 int
-gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, bfd_byte *contents_cache)
+gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, gdb_byte *contents_cache)
 {
   gdb_assert (gdbarch != NULL);
   gdb_assert (gdbarch->memory_insert_breakpoint != NULL);
@@ -2996,7 +2996,7 @@ set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch,
 }
 
 int
-gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, bfd_byte *contents_cache)
+gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, gdb_byte *contents_cache)
 {
   gdb_assert (gdbarch != NULL);
   gdb_assert (gdbarch->memory_remove_breakpoint != NULL);
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 8afaf9b9082..63d1712aa1f 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -749,8 +749,8 @@ extern void set_gdbarch_address_to_pointer (struct gdbarch *gdbarch, gdbarch_add
 
 extern int gdbarch_integer_to_address_p (struct gdbarch *gdbarch);
 
-typedef CORE_ADDR (gdbarch_integer_to_address_ftype) (struct gdbarch *gdbarch, struct type *type, const bfd_byte *buf);
-extern CORE_ADDR gdbarch_integer_to_address (struct gdbarch *gdbarch, struct type *type, const bfd_byte *buf);
+typedef CORE_ADDR (gdbarch_integer_to_address_ftype) (struct gdbarch *gdbarch, struct type *type, const gdb_byte *buf);
+extern CORE_ADDR gdbarch_integer_to_address (struct gdbarch *gdbarch, struct type *type, const gdb_byte *buf);
 extern void set_gdbarch_integer_to_address (struct gdbarch *gdbarch, gdbarch_integer_to_address_ftype *integer_to_address);
 
 /* NOTE: cagney/2003-03-24: Replaced by PUSH_ARGUMENTS. */
@@ -818,8 +818,8 @@ extern void set_gdbarch_store_return_value (struct gdbarch *gdbarch, gdbarch_sto
 #define STORE_RETURN_VALUE(type, regcache, valbuf) (gdbarch_store_return_value (current_gdbarch, type, regcache, valbuf))
 #endif
 
-typedef void (gdbarch_deprecated_extract_return_value_ftype) (struct type *type, bfd_byte *regbuf, bfd_byte *valbuf);
-extern void gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, struct type *type, bfd_byte *regbuf, bfd_byte *valbuf);
+typedef void (gdbarch_deprecated_extract_return_value_ftype) (struct type *type, gdb_byte *regbuf, gdb_byte *valbuf);
+extern void gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, struct type *type, gdb_byte *regbuf, gdb_byte *valbuf);
 extern void set_gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch, gdbarch_deprecated_extract_return_value_ftype *deprecated_extract_return_value);
 #if !defined (GDB_TM_FILE) && defined (DEPRECATED_EXTRACT_RETURN_VALUE)
 #error "Non multi-arch definition of DEPRECATED_EXTRACT_RETURN_VALUE"
@@ -828,8 +828,8 @@ extern void set_gdbarch_deprecated_extract_return_value (struct gdbarch *gdbarch
 #define DEPRECATED_EXTRACT_RETURN_VALUE(type, regbuf, valbuf) (gdbarch_deprecated_extract_return_value (current_gdbarch, type, regbuf, valbuf))
 #endif
 
-typedef void (gdbarch_deprecated_store_return_value_ftype) (struct type *type, bfd_byte *valbuf);
-extern void gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, struct type *type, bfd_byte *valbuf);
+typedef void (gdbarch_deprecated_store_return_value_ftype) (struct type *type, gdb_byte *valbuf);
+extern void gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, struct type *type, gdb_byte *valbuf);
 extern void set_gdbarch_deprecated_store_return_value (struct gdbarch *gdbarch, gdbarch_deprecated_store_return_value_ftype *deprecated_store_return_value);
 #if !defined (GDB_TM_FILE) && defined (DEPRECATED_STORE_RETURN_VALUE)
 #error "Non multi-arch definition of DEPRECATED_STORE_RETURN_VALUE"
@@ -911,8 +911,8 @@ extern void set_gdbarch_inner_than (struct gdbarch *gdbarch, gdbarch_inner_than_
 #define INNER_THAN(lhs, rhs) (gdbarch_inner_than (current_gdbarch, lhs, rhs))
 #endif
 
-typedef const bfd_byte * (gdbarch_breakpoint_from_pc_ftype) (CORE_ADDR *pcptr, int *lenptr);
-extern const bfd_byte * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr);
+typedef const gdb_byte * (gdbarch_breakpoint_from_pc_ftype) (CORE_ADDR *pcptr, int *lenptr);
+extern const gdb_byte * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr);
 extern void set_gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc);
 #if !defined (GDB_TM_FILE) && defined (BREAKPOINT_FROM_PC)
 #error "Non multi-arch definition of BREAKPOINT_FROM_PC"
@@ -927,8 +927,8 @@ typedef CORE_ADDR (gdbarch_adjust_breakpoint_address_ftype) (struct gdbarch *gdb
 extern CORE_ADDR gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch, CORE_ADDR bpaddr);
 extern void set_gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch, gdbarch_adjust_breakpoint_address_ftype *adjust_breakpoint_address);
 
-typedef int (gdbarch_memory_insert_breakpoint_ftype) (CORE_ADDR addr, bfd_byte *contents_cache);
-extern int gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, bfd_byte *contents_cache);
+typedef int (gdbarch_memory_insert_breakpoint_ftype) (CORE_ADDR addr, gdb_byte *contents_cache);
+extern int gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, gdb_byte *contents_cache);
 extern void set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, gdbarch_memory_insert_breakpoint_ftype *memory_insert_breakpoint);
 #if !defined (GDB_TM_FILE) && defined (MEMORY_INSERT_BREAKPOINT)
 #error "Non multi-arch definition of MEMORY_INSERT_BREAKPOINT"
@@ -937,8 +937,8 @@ extern void set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, gdbar
 #define MEMORY_INSERT_BREAKPOINT(addr, contents_cache) (gdbarch_memory_insert_breakpoint (current_gdbarch, addr, contents_cache))
 #endif
 
-typedef int (gdbarch_memory_remove_breakpoint_ftype) (CORE_ADDR addr, bfd_byte *contents_cache);
-extern int gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, bfd_byte *contents_cache);
+typedef int (gdbarch_memory_remove_breakpoint_ftype) (CORE_ADDR addr, gdb_byte *contents_cache);
+extern int gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, gdb_byte *contents_cache);
 extern void set_gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, gdbarch_memory_remove_breakpoint_ftype *memory_remove_breakpoint);
 #if !defined (GDB_TM_FILE) && defined (MEMORY_REMOVE_BREAKPOINT)
 #error "Non multi-arch definition of MEMORY_REMOVE_BREAKPOINT"
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 774c6e27daf..755ffa71e29 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -499,7 +499,7 @@ f:=:void:value_to_register:struct frame_info *frame, int regnum, struct type *ty
 #
 f:=:CORE_ADDR:pointer_to_address:struct type *type, const void *buf:type, buf::unsigned_pointer_to_address::0
 f:=:void:address_to_pointer:struct type *type, void *buf, CORE_ADDR addr:type, buf, addr::unsigned_address_to_pointer::0
-M::CORE_ADDR:integer_to_address:struct type *type, const bfd_byte *buf:type, buf
+M::CORE_ADDR:integer_to_address:struct type *type, const gdb_byte *buf:type, buf
 #
 # NOTE: cagney/2003-03-24: Replaced by PUSH_ARGUMENTS.
 F:=:void:deprecated_store_struct_return:CORE_ADDR addr, CORE_ADDR sp:addr, sp
@@ -521,8 +521,8 @@ M::enum return_value_convention:return_value:struct type *valtype, struct regcac
 
 f:=:void:extract_return_value:struct type *type, struct regcache *regcache, void *valbuf:type, regcache, valbuf::legacy_extract_return_value::0
 f:=:void:store_return_value:struct type *type, struct regcache *regcache, const void *valbuf:type, regcache, valbuf::legacy_store_return_value::0
-f:=:void:deprecated_extract_return_value:struct type *type, bfd_byte *regbuf, bfd_byte *valbuf:type, regbuf, valbuf
-f:=:void:deprecated_store_return_value:struct type *type, bfd_byte *valbuf:type, valbuf
+f:=:void:deprecated_extract_return_value:struct type *type, gdb_byte *regbuf, gdb_byte *valbuf:type, regbuf, valbuf
+f:=:void:deprecated_store_return_value:struct type *type, gdb_byte *valbuf:type, valbuf
 f:=:int:deprecated_use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type::generic_use_struct_convention::0
 
 # As of 2004-01-17 only the 32-bit SPARC ABI has been identified as an
@@ -549,10 +549,10 @@ F:=:CORE_ADDR:deprecated_extract_struct_value_address:struct regcache *regcache:
 #
 f:=:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0
 f:=:int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs:0:0
-f:=:const bfd_byte *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0:
+f:=:const gdb_byte *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0:
 M::CORE_ADDR:adjust_breakpoint_address:CORE_ADDR bpaddr:bpaddr
-f:=:int:memory_insert_breakpoint:CORE_ADDR addr, bfd_byte *contents_cache:addr, contents_cache:0:default_memory_insert_breakpoint::0
-f:=:int:memory_remove_breakpoint:CORE_ADDR addr, bfd_byte *contents_cache:addr, contents_cache:0:default_memory_remove_breakpoint::0
+f:=:int:memory_insert_breakpoint:CORE_ADDR addr, gdb_byte *contents_cache:addr, contents_cache:0:default_memory_insert_breakpoint::0
+f:=:int:memory_remove_breakpoint:CORE_ADDR addr, gdb_byte *contents_cache:addr, contents_cache:0:default_memory_remove_breakpoint::0
 v:=:CORE_ADDR:decr_pc_after_break:::0:::0
 
 # A function can be addressed by either it's "pointer" (possibly a
diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h
index d4e9a9d01e5..7b25e65a307 100644
--- a/gdb/gdbcore.h
+++ b/gdb/gdbcore.h
@@ -86,7 +86,7 @@ CORE_ADDR read_memory_typed_address (CORE_ADDR addr, struct type *type);
    byteswapping, alignment, different sizes for host vs. target types,
    etc.  */
 
-extern void write_memory (CORE_ADDR memaddr, const bfd_byte *myaddr, int len);
+extern void write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len);
 
 /* Store VALUE at ADDR in the inferior as a LEN-byte unsigned integer.  */
 extern void write_memory_unsigned_integer (CORE_ADDR addr, int len,
diff --git a/gdb/jv-lang.h b/gdb/jv-lang.h
index 1ba6747d65e..3d09b57016a 100644
--- a/gdb/jv-lang.h
+++ b/gdb/jv-lang.h
@@ -42,7 +42,7 @@ extern struct type *java_float_type;
 extern struct type *java_double_type;
 extern struct type *java_void_type;
 
-extern int java_val_print (struct type *, const bfd_byte *, int, CORE_ADDR,
+extern int java_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
 			   struct ui_file *, int, int, int,
 			   enum val_prettyprint);
 
diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index 5ca94b5f30b..41f6c561a6f 100644
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -244,7 +244,7 @@ java_value_print (struct value *val, struct ui_file *stream, int format,
    should not print, or zero if called from top level.  */
 
 static void
-java_print_value_fields (struct type *type, const bfd_byte *valaddr,
+java_print_value_fields (struct type *type, const gdb_byte *valaddr,
 			 CORE_ADDR address, struct ui_file *stream,
 			 int format, int recurse, enum val_prettyprint pretty)
 {
@@ -265,7 +265,7 @@ java_print_value_fields (struct type *type, const bfd_byte *valaddr,
 	  int boffset;
 	  struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
 	  char *basename = TYPE_NAME (baseclass);
-	  const bfd_byte *base_valaddr;
+	  const gdb_byte *base_valaddr;
 
 	  if (BASETYPE_VIA_VIRTUAL (type, i))
 	    continue;
@@ -441,7 +441,7 @@ java_print_value_fields (struct type *type, const bfd_byte *valaddr,
    The PRETTY parameter controls prettyprinting.  */
 
 int
-java_val_print (struct type *type, const bfd_byte *valaddr,
+java_val_print (struct type *type, const gdb_byte *valaddr,
 		int embedded_offset, CORE_ADDR address,
 		struct ui_file *stream, int format, int deref_ref,
 		int recurse, enum val_prettyprint pretty)
diff --git a/gdb/language.c b/gdb/language.c
index 560bfd54fc0..3d6ecfc960e 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -1082,7 +1082,7 @@ unk_lang_printchar (int c, struct ui_file *stream)
 }
 
 static void
-unk_lang_printstr (struct ui_file *stream, const bfd_byte *string,
+unk_lang_printstr (struct ui_file *stream, const gdb_byte *string,
 		   unsigned int length, int width, int force_ellipses)
 {
   error (_("internal error - unimplemented function unk_lang_printstr called."));
@@ -1102,7 +1102,7 @@ unk_lang_print_type (struct type *type, char *varstring, struct ui_file *stream,
 }
 
 static int
-unk_lang_val_print (struct type *type, const bfd_byte *valaddr,
+unk_lang_val_print (struct type *type, const gdb_byte *valaddr,
 		    int embedded_offset, CORE_ADDR address,
 		    struct ui_file *stream, int format,
 		    int deref_ref, int recurse, enum val_prettyprint pretty)
diff --git a/gdb/language.h b/gdb/language.h
index 6fd0958820f..d581bd2ddec 100644
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -193,7 +193,7 @@ struct language_defn
 
     void (*la_printchar) (int ch, struct ui_file * stream);
 
-    void (*la_printstr) (struct ui_file * stream, const bfd_byte *string,
+    void (*la_printstr) (struct ui_file * stream, const gdb_byte *string,
 			 unsigned int length, int width,
 			 int force_ellipses);
 
@@ -208,7 +208,7 @@ struct language_defn
 
     /* Print a value using syntax appropriate for this language. */
 
-    int (*la_val_print) (struct type *, const bfd_byte *, int, CORE_ADDR,
+    int (*la_val_print) (struct type *, const gdb_byte *, int, CORE_ADDR,
 			 struct ui_file *, int, int, int,
 			 enum val_prettyprint);
 
diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
index 116e678b42a..6ec2364b352 100644
--- a/gdb/m2-lang.c
+++ b/gdb/m2-lang.c
@@ -107,7 +107,7 @@ m2_printchar (int c, struct ui_file *stream)
    be replaced with a true Modula version. */
 
 static void
-m2_printstr (struct ui_file *stream, const bfd_byte *string,
+m2_printstr (struct ui_file *stream, const gdb_byte *string,
 	     unsigned int length, int width, int force_ellipses)
 {
   unsigned int i;
diff --git a/gdb/m2-lang.h b/gdb/m2-lang.h
index 94d0abf220b..044bee6fde8 100644
--- a/gdb/m2-lang.h
+++ b/gdb/m2-lang.h
@@ -27,6 +27,6 @@ extern void m2_error (char *);	/* Defined in m2-exp.y */
 extern void m2_print_type (struct type *, char *, struct ui_file *, int,
 			   int);
 
-extern int m2_val_print (struct type *, const bfd_byte *, int, CORE_ADDR,
+extern int m2_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
 			 struct ui_file *, int, int, int,
 			 enum val_prettyprint);
diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
index d822b8ed48e..62114ff1250 100644
--- a/gdb/m2-valprint.c
+++ b/gdb/m2-valprint.c
@@ -27,7 +27,7 @@
 #include "c-lang.h"
 
 int
-m2_val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
+m2_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 	      CORE_ADDR address, struct ui_file *stream, int format,
 	      int deref_ref, int recurse, enum val_prettyprint pretty)
 {
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 9d522412557..f306b948bb8 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -335,7 +335,7 @@ objc_printchar (int c, struct ui_file *stream)
    FORCE_ELLIPSES.  */
 
 static void
-objc_printstr (struct ui_file *stream, const bfd_byte *string, 
+objc_printstr (struct ui_file *stream, const gdb_byte *string, 
 	       unsigned int length, int width, int force_ellipses)
 {
   unsigned int i;
diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index 3c3e645d872..cd05a2484ea 100644
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -157,7 +157,7 @@ pascal_printchar (int c, struct ui_file *stream)
    had to stop before printing LENGTH characters, or if FORCE_ELLIPSES.  */
 
 void
-pascal_printstr (struct ui_file *stream, const bfd_byte *string,
+pascal_printstr (struct ui_file *stream, const gdb_byte *string,
 		 unsigned int length, int width, int force_ellipses)
 {
   unsigned int i;
diff --git a/gdb/p-lang.h b/gdb/p-lang.h
index 0043f5be248..324eb889862 100644
--- a/gdb/p-lang.h
+++ b/gdb/p-lang.h
@@ -29,7 +29,7 @@ extern void pascal_error (char *);	/* Defined in p-exp.y */
 /* Defined in p-typeprint.c */
 extern void pascal_print_type (struct type *, char *, struct ui_file *, int, int);
 
-extern int pascal_val_print (struct type *, const bfd_byte *, int,
+extern int pascal_val_print (struct type *, const gdb_byte *, int,
 			     CORE_ADDR, struct ui_file *, int, int,
 			     int, enum val_prettyprint);
 
@@ -45,7 +45,7 @@ extern int
 
 extern void pascal_printchar (int, struct ui_file *);
 
-extern void pascal_printstr (struct ui_file *, const bfd_byte *,
+extern void pascal_printstr (struct ui_file *, const gdb_byte *,
 			     unsigned int, int, int);
 
 extern struct type *pascal_create_fundamental_type (struct objfile *, int);
@@ -66,13 +66,13 @@ extern int vtblprint;		/* Controls printing of vtbl's */
 
 extern int static_field_print;
 
-extern void pascal_object_print_class_member (const bfd_byte *, struct type *,
+extern void pascal_object_print_class_member (const gdb_byte *, struct type *,
 					      struct ui_file *, char *);
 
-extern void pascal_object_print_class_method (const bfd_byte *, struct type *,
+extern void pascal_object_print_class_method (const gdb_byte *, struct type *,
 					      struct ui_file *);
 
-extern void pascal_object_print_value_fields (struct type *, const bfd_byte *,
+extern void pascal_object_print_value_fields (struct type *, const gdb_byte *,
 					      CORE_ADDR, struct ui_file *,
 					      int, int, enum val_prettyprint,
 					      struct type **, int);
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index e2105ebd8db..55843ea8bc9 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -57,7 +57,7 @@
 
 
 int
-pascal_val_print (struct type *type, const bfd_byte *valaddr,
+pascal_val_print (struct type *type, const gdb_byte *valaddr,
 		  int embedded_offset, CORE_ADDR address,
 		  struct ui_file *stream, int format, int deref_ref,
 		  int recurse, enum val_prettyprint pretty)
@@ -590,13 +590,13 @@ static void pascal_object_print_static_field (struct value *,
 					      struct ui_file *, int, int,
 					      enum val_prettyprint);
 
-static void pascal_object_print_value (struct type *, const bfd_byte *,
+static void pascal_object_print_value (struct type *, const gdb_byte *,
 				       CORE_ADDR, struct ui_file *,
 				       int, int, enum val_prettyprint,
 				       struct type **);
 
 void
-pascal_object_print_class_method (const bfd_byte *valaddr, struct type *type,
+pascal_object_print_class_method (const gdb_byte *valaddr, struct type *type,
 				  struct ui_file *stream)
 {
   struct type *domain;
@@ -736,7 +736,7 @@ pascal_object_is_vtbl_member (struct type *type)
    should not print, or zero if called from top level.  */
 
 void
-pascal_object_print_value_fields (struct type *type, const bfd_byte *valaddr,
+pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr,
 				  CORE_ADDR address, struct ui_file *stream,
 				  int format, int recurse,
 				  enum val_prettyprint pretty,
@@ -907,7 +907,7 @@ pascal_object_print_value_fields (struct type *type, const bfd_byte *valaddr,
    baseclasses.  */
 
 void
-pascal_object_print_value (struct type *type, const bfd_byte *valaddr,
+pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
 			   CORE_ADDR address, struct ui_file *stream,
 			   int format, int recurse,
 			   enum val_prettyprint pretty,
@@ -933,7 +933,7 @@ pascal_object_print_value (struct type *type, const bfd_byte *valaddr,
       int boffset;
       struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
       char *basename = TYPE_NAME (baseclass);
-      const bfd_byte *base_valaddr;
+      const gdb_byte *base_valaddr;
 
       if (BASETYPE_VIA_VIRTUAL (type, i))
 	{
@@ -971,7 +971,7 @@ pascal_object_print_value (struct type *type, const bfd_byte *valaddr,
       if (boffset != -1 && (boffset < 0 || boffset >= TYPE_LENGTH (type)))
 	{
 	  /* FIXME (alloc): not safe is baseclass is really really big. */
-	  bfd_byte *buf = alloca (TYPE_LENGTH (baseclass));
+	  gdb_byte *buf = alloca (TYPE_LENGTH (baseclass));
 	  base_valaddr = buf;
 	  if (target_read_memory (address + boffset, buf,
 				  TYPE_LENGTH (baseclass)) != 0)
@@ -1052,7 +1052,7 @@ pascal_object_print_static_field (struct value *val,
 }
 
 void
-pascal_object_print_class_member (const bfd_byte *valaddr, struct type *domain,
+pascal_object_print_class_member (const gdb_byte *valaddr, struct type *domain,
 				  struct ui_file *stream, char *prefix)
 {
 
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 5cee78e33f3..836f8a63ac9 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -844,7 +844,7 @@ regcache_xfer_part (struct regcache *regcache, int regnum,
 		    regcache_read_ftype *read, regcache_write_ftype *write)
 {
   struct regcache_descr *descr = regcache->descr;
-  bfd_byte reg[MAX_REGISTER_SIZE];
+  gdb_byte reg[MAX_REGISTER_SIZE];
   gdb_assert (offset >= 0 && offset <= descr->sizeof_register[regnum]);
   gdb_assert (len >= 0 && offset + len <= descr->sizeof_register[regnum]);
   /* Something to do?  */
diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c
index ebdaa47cf7e..6054920c5d6 100644
--- a/gdb/scm-lang.c
+++ b/gdb/scm-lang.c
@@ -50,7 +50,7 @@ scm_printchar (int c, struct ui_file *stream)
 }
 
 static void
-scm_printstr (struct ui_file *stream, const bfd_byte *string,
+scm_printstr (struct ui_file *stream, const gdb_byte *string,
 	      unsigned int length, int width, int force_ellipses)
 {
   fprintf_filtered (stream, "\"%s\"", string);
diff --git a/gdb/scm-lang.h b/gdb/scm-lang.h
index 1bf963f46af..1339ebaee90 100644
--- a/gdb/scm-lang.h
+++ b/gdb/scm-lang.h
@@ -50,7 +50,7 @@ struct value;
 extern int scm_value_print (struct value *, struct ui_file *,
 			    int, enum val_prettyprint);
 
-extern int scm_val_print (struct type *, const bfd_byte *, int, CORE_ADDR,
+extern int scm_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
 			  struct ui_file *, int, int, int,
 			  enum val_prettyprint);
 
diff --git a/gdb/scm-valprint.c b/gdb/scm-valprint.c
index fccedcaa5e0..05399aa091a 100644
--- a/gdb/scm-valprint.c
+++ b/gdb/scm-valprint.c
@@ -359,7 +359,7 @@ taloop:
 }
 
 int
-scm_val_print (struct type *type, const bfd_byte *valaddr,
+scm_val_print (struct type *type, const gdb_byte *valaddr,
 	       int embedded_offset, CORE_ADDR address,
 	       struct ui_file *stream, int format, int deref_ref,
 	       int recurse, enum val_prettyprint pretty)
diff --git a/gdb/target.c b/gdb/target.c
index 799ca09d93c..fa9f1fa612c 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -114,9 +114,9 @@ static int deprecated_debug_xfer_memory (CORE_ADDR, char *, int, int,
 
 static void debug_to_files_info (struct target_ops *);
 
-static int debug_to_insert_breakpoint (CORE_ADDR, bfd_byte *);
+static int debug_to_insert_breakpoint (CORE_ADDR, gdb_byte *);
 
-static int debug_to_remove_breakpoint (CORE_ADDR, bfd_byte *);
+static int debug_to_remove_breakpoint (CORE_ADDR, gdb_byte *);
 
 static int debug_to_can_use_hw_breakpoint (int, int, int);
 
@@ -966,9 +966,9 @@ xfer_using_stratum (enum target_object object, const char *annex,
 	    return 0;
 	  offset += xfered;
 	  if (readbuf != NULL)
-	    readbuf = (bfd_byte *) readbuf + xfered;
+	    readbuf = (gdb_byte *) readbuf + xfered;
 	  if (writebuf != NULL)
-	    writebuf = (bfd_byte *) writebuf + xfered;
+	    writebuf = (gdb_byte *) writebuf + xfered;
 	  target = target_stack;
 	}
       else if (xfered < 0)
@@ -1001,7 +1001,7 @@ xfer_using_stratum (enum target_object object, const char *annex,
    deal with partial reads should call target_read_memory_partial. */
 
 int
-target_read_memory (CORE_ADDR memaddr, bfd_byte *myaddr, int len)
+target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
 {
   if (target_xfer_partial_p ())
     return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL,
@@ -1011,9 +1011,9 @@ target_read_memory (CORE_ADDR memaddr, bfd_byte *myaddr, int len)
 }
 
 int
-target_write_memory (CORE_ADDR memaddr, const bfd_byte *myaddr, int len)
+target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
 {
-  bfd_byte *bytes = alloca (len);
+  gdb_byte *bytes = alloca (len);
   memcpy (bytes, myaddr, len);
   if (target_xfer_partial_p ())
     return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL,
@@ -1378,7 +1378,7 @@ target_read (struct target_ops *ops,
   while (xfered < len)
     {
       LONGEST xfer = target_read_partial (ops, object, annex,
-					  (bfd_byte *) buf + xfered,
+					  (gdb_byte *) buf + xfered,
 					  offset + xfered, len - xfered);
       /* Call an observer, notifying them of the xfer progress?  */
       if (xfer <= 0)
@@ -1400,7 +1400,7 @@ target_write (struct target_ops *ops,
   while (xfered < len)
     {
       LONGEST xfer = target_write_partial (ops, object, annex,
-					   (bfd_byte *) buf + xfered,
+					   (gdb_byte *) buf + xfered,
 					   offset + xfered, len - xfered);
       /* Call an observer, notifying them of the xfer progress?  */
       if (xfer <= 0)
@@ -2055,7 +2055,7 @@ debug_to_files_info (struct target_ops *target)
 }
 
 static int
-debug_to_insert_breakpoint (CORE_ADDR addr, bfd_byte *save)
+debug_to_insert_breakpoint (CORE_ADDR addr, gdb_byte *save)
 {
   int retval;
 
@@ -2069,7 +2069,7 @@ debug_to_insert_breakpoint (CORE_ADDR addr, bfd_byte *save)
 }
 
 static int
-debug_to_remove_breakpoint (CORE_ADDR addr, bfd_byte *save)
+debug_to_remove_breakpoint (CORE_ADDR addr, gdb_byte *save)
 {
   int retval;
 
diff --git a/gdb/target.h b/gdb/target.h
index e5f5c7fe123..56d4ee4ac63 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -335,8 +335,8 @@ struct target_ops
 				   struct target_ops *target);
 
     void (*to_files_info) (struct target_ops *);
-    int (*to_insert_breakpoint) (CORE_ADDR, bfd_byte *);
-    int (*to_remove_breakpoint) (CORE_ADDR, bfd_byte *);
+    int (*to_insert_breakpoint) (CORE_ADDR, gdb_byte *);
+    int (*to_remove_breakpoint) (CORE_ADDR, gdb_byte *);
     int (*to_can_use_hw_breakpoint) (int, int, int);
     int (*to_insert_hw_breakpoint) (CORE_ADDR, char *);
     int (*to_remove_hw_breakpoint) (CORE_ADDR, char *);
@@ -537,9 +537,9 @@ extern int do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
 
 extern int target_read_string (CORE_ADDR, char **, int, int *);
 
-extern int target_read_memory (CORE_ADDR memaddr, bfd_byte *myaddr, int len);
+extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
 
-extern int target_write_memory (CORE_ADDR memaddr, const bfd_byte *myaddr,
+extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
 				int len);
 
 extern int xfer_memory (CORE_ADDR, char *, int, int,
@@ -1135,13 +1135,13 @@ struct section_table *target_section_by_addr (struct target_ops *target,
 
 /* From mem-break.c */
 
-extern int memory_remove_breakpoint (CORE_ADDR, bfd_byte *);
+extern int memory_remove_breakpoint (CORE_ADDR, gdb_byte *);
 
-extern int memory_insert_breakpoint (CORE_ADDR, bfd_byte *);
+extern int memory_insert_breakpoint (CORE_ADDR, gdb_byte *);
 
-extern int default_memory_remove_breakpoint (CORE_ADDR, bfd_byte *);
+extern int default_memory_remove_breakpoint (CORE_ADDR, gdb_byte *);
 
-extern int default_memory_insert_breakpoint (CORE_ADDR, bfd_byte *);
+extern int default_memory_insert_breakpoint (CORE_ADDR, gdb_byte *);
 
 
 /* From target.c */
diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c
index 75fb22fc910..8d808d38d12 100644
--- a/gdb/tramp-frame.c
+++ b/gdb/tramp-frame.c
@@ -97,7 +97,7 @@ tramp_frame_start (const struct tramp_frame *tramp,
       int i;
       for (i = 0; 1; i++)
 	{
-	  bfd_byte buf[sizeof (tramp->insn[0])];
+	  gdb_byte buf[sizeof (tramp->insn[0])];
 	  ULONGEST insn;
 	  if (tramp->insn[i].bytes == TRAMP_SENTINEL_INSN)
 	    return func;
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 79089007a7d..54a7fc60df6 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -1158,7 +1158,7 @@ int
 value_logical_not (struct value *arg1)
 {
   int len;
-  const bfd_byte *p;
+  const gdb_byte *p;
   struct type *type1;
 
   arg1 = coerce_number (arg1);
@@ -1187,8 +1187,8 @@ value_strcmp (struct value *arg1, struct value *arg2)
 {
   int len1 = TYPE_LENGTH (value_type (arg1));
   int len2 = TYPE_LENGTH (value_type (arg2));
-  const bfd_byte *s1 = value_contents (arg1);
-  const bfd_byte *s2 = value_contents (arg2);
+  const gdb_byte *s1 = value_contents (arg1);
+  const gdb_byte *s2 = value_contents (arg2);
   int i, len = len1 < len2 ? len1 : len2;
 
   for (i = 0; i < len; i++)
@@ -1216,8 +1216,8 @@ int
 value_equal (struct value *arg1, struct value *arg2)
 {
   int len;
-  const bfd_byte *p1;
-  const bfd_byte *p2;
+  const gdb_byte *p1;
+  const gdb_byte *p2;
   struct type *type1, *type2;
   enum type_code code1;
   enum type_code code2;
@@ -1399,7 +1399,7 @@ value_complement (struct value *arg1)
    Return -1 if out of range, -2 other error. */
 
 int
-value_bit_index (struct type *type, const bfd_byte *valaddr, int index)
+value_bit_index (struct type *type, const gdb_byte *valaddr, int index)
 {
   LONGEST low_bound, high_bound;
   LONGEST word;
diff --git a/gdb/valops.c b/gdb/valops.c
index d90d5f87922..658f2a9e76a 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -566,7 +566,7 @@ value_assign (struct value *toval, struct value *fromval)
 
     case lval_memory:
       {
-	const bfd_byte *dest_buffer;
+	const gdb_byte *dest_buffer;
 	CORE_ADDR changed_addr;
 	int changed_len;
         char buffer[sizeof (LONGEST)];
@@ -1364,7 +1364,7 @@ search_struct_field (char *name, struct value *arg1, int offset,
 
 void
 find_rt_vbase_offset (struct type *type, struct type *basetype,
-		      const bfd_byte *valaddr, int offset, int *boffset_p,
+		      const gdb_byte *valaddr, int offset, int *boffset_p,
 		      int *skip_p)
 {
   int boffset;			/* offset of virtual base */
@@ -1520,7 +1520,7 @@ search_struct_method (char *name, struct value **arg1p,
 	  else
 	    {
 	      struct type *baseclass = check_typedef (TYPE_BASECLASS (type, i));
-	      const bfd_byte *base_valaddr;
+	      const gdb_byte *base_valaddr;
 
 	      /* The virtual base class pointer might have been clobbered by the
 	         user program. Make sure that it still points to a valid memory
@@ -1528,7 +1528,7 @@ search_struct_method (char *name, struct value **arg1p,
 
 	      if (offset < 0 || offset >= TYPE_LENGTH (type))
 		{
-		  bfd_byte *tmp = alloca (TYPE_LENGTH (baseclass));
+		  gdb_byte *tmp = alloca (TYPE_LENGTH (baseclass));
 		  if (target_read_memory (VALUE_ADDRESS (*arg1p)
 					  + value_offset (*arg1p) + offset,
 					  tmp, TYPE_LENGTH (baseclass)) != 0)
@@ -2317,7 +2317,7 @@ check_field_in (struct type *type, const char *name)
    target structure/union is defined, otherwise, return 0.  */
 
 int
-check_field (struct value *arg1, const bfd_byte *name)
+check_field (struct value *arg1, const gdb_byte *name)
 {
   struct type *t;
 
diff --git a/gdb/valprint.c b/gdb/valprint.c
index bda75efbcb7..ac2d401aae9 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -190,7 +190,7 @@ show_addressprint (struct ui_file *file, int from_tty,
 
 
 int
-val_print (struct type *type, const bfd_byte *valaddr, int embedded_offset,
+val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 	   CORE_ADDR address, struct ui_file *stream, int format,
 	   int deref_ref, int recurse, enum val_prettyprint pretty)
 {
@@ -285,7 +285,7 @@ value_print (struct value *val, struct ui_file *stream, int format,
    value.  STREAM is where to print the value.  */
 
 void
-val_print_type_code_int (struct type *type, const bfd_byte *valaddr,
+val_print_type_code_int (struct type *type, const gdb_byte *valaddr,
 			 struct ui_file *stream)
 {
   if (TYPE_LENGTH (type) > sizeof (LONGEST))
@@ -392,7 +392,7 @@ longest_to_int (LONGEST arg)
    TYPE_CODE_FLT), pointed to in GDB by VALADDR, on STREAM.  */
 
 void
-print_floating (const bfd_byte *valaddr, struct type *type,
+print_floating (const gdb_byte *valaddr, struct type *type,
 		struct ui_file *stream)
 {
   DOUBLEST doub;
@@ -453,13 +453,13 @@ print_floating (const bfd_byte *valaddr, struct type *type,
 }
 
 void
-print_binary_chars (struct ui_file *stream, const bfd_byte *valaddr,
+print_binary_chars (struct ui_file *stream, const gdb_byte *valaddr,
 		    unsigned len)
 {
 
 #define BITS_IN_BYTES 8
 
-  const bfd_byte *p;
+  const gdb_byte *p;
   unsigned int i;
   int b;
 
@@ -513,10 +513,10 @@ print_binary_chars (struct ui_file *stream, const bfd_byte *valaddr,
  * Print it in octal on stream or format it in buf.
  */
 void
-print_octal_chars (struct ui_file *stream, const bfd_byte *valaddr,
+print_octal_chars (struct ui_file *stream, const gdb_byte *valaddr,
 		   unsigned len)
 {
-  const bfd_byte *p;
+  const gdb_byte *p;
   unsigned char octa1, octa2, octa3, carry;
   int cycle;
 
@@ -661,7 +661,7 @@ print_octal_chars (struct ui_file *stream, const bfd_byte *valaddr,
  * Print it in decimal on stream or format it in buf.
  */
 void
-print_decimal_chars (struct ui_file *stream, const bfd_byte *valaddr,
+print_decimal_chars (struct ui_file *stream, const gdb_byte *valaddr,
 		     unsigned len)
 {
 #define TEN             10
@@ -678,7 +678,7 @@ print_decimal_chars (struct ui_file *stream, const bfd_byte *valaddr,
 #define LOW_NIBBLE(  x ) ( (x) & 0x00F)
 #define HIGH_NIBBLE( x ) (((x) & 0x0F0) >> 4)
 
-  const bfd_byte *p;
+  const gdb_byte *p;
   unsigned char *digits;
   int carry;
   int decimal_len;
@@ -796,10 +796,10 @@ print_decimal_chars (struct ui_file *stream, const bfd_byte *valaddr,
 /* VALADDR points to an integer of LEN bytes.  Print it in hex on stream.  */
 
 void
-print_hex_chars (struct ui_file *stream, const bfd_byte *valaddr,
+print_hex_chars (struct ui_file *stream, const gdb_byte *valaddr,
 		 unsigned len)
 {
-  const bfd_byte *p;
+  const gdb_byte *p;
 
   /* FIXME: We should be not printing leading zeroes in most cases.  */
 
@@ -828,10 +828,10 @@ print_hex_chars (struct ui_file *stream, const bfd_byte *valaddr,
    Omit any leading zero chars.  */
 
 void
-print_char_chars (struct ui_file *stream, const bfd_byte *valaddr,
+print_char_chars (struct ui_file *stream, const gdb_byte *valaddr,
 		  unsigned len)
 {
-  const bfd_byte *p;
+  const gdb_byte *p;
 
   if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
     {
@@ -869,7 +869,7 @@ print_char_chars (struct ui_file *stream, const bfd_byte *valaddr,
  */
 
 void
-val_print_array_elements (struct type *type, const bfd_byte *valaddr,
+val_print_array_elements (struct type *type, const gdb_byte *valaddr,
 			  CORE_ADDR address, struct ui_file *stream,
 			  int format, int deref_ref,
 			  int recurse, enum val_prettyprint pretty,
diff --git a/gdb/valprint.h b/gdb/valprint.h
index 3a923a4d45f..4b776189f6c 100644
--- a/gdb/valprint.h
+++ b/gdb/valprint.h
@@ -50,26 +50,26 @@ extern int output_format;
 
 extern int stop_print_at_null;	/* Stop printing at null char? */
 
-extern void val_print_array_elements (struct type *, const bfd_byte *,
+extern void val_print_array_elements (struct type *, const gdb_byte *,
 				      CORE_ADDR, struct ui_file *, int,
 				      int, int, enum val_prettyprint,
 				      unsigned int);
 
-extern void val_print_type_code_int (struct type *, const bfd_byte *,
+extern void val_print_type_code_int (struct type *, const gdb_byte *,
 				     struct ui_file *);
 
-extern void print_binary_chars (struct ui_file *, const bfd_byte *,
+extern void print_binary_chars (struct ui_file *, const gdb_byte *,
 				unsigned int);
 
-extern void print_octal_chars (struct ui_file *, const bfd_byte *,
+extern void print_octal_chars (struct ui_file *, const gdb_byte *,
 			       unsigned int);
 
-extern void print_decimal_chars (struct ui_file *, const bfd_byte *,
+extern void print_decimal_chars (struct ui_file *, const gdb_byte *,
 				 unsigned int);
 
-extern void print_hex_chars (struct ui_file *, const bfd_byte *,
+extern void print_hex_chars (struct ui_file *, const gdb_byte *,
 			     unsigned int);
 
-extern void print_char_chars (struct ui_file *, const bfd_byte *,
+extern void print_char_chars (struct ui_file *, const gdb_byte *,
 			      unsigned int);
 #endif
diff --git a/gdb/value.c b/gdb/value.c
index 08d75570106..8662d68a85a 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -165,7 +165,7 @@ struct value
      declared here.  */
   union
   {
-    bfd_byte contents[1];
+    gdb_byte contents[1];
     DOUBLEST force_doublest_align;
     LONGEST force_longest_align;
     CORE_ADDR force_core_addr_align;
@@ -306,13 +306,13 @@ set_value_bitsize (struct value *value, int bit)
   value->bitsize = bit;
 }
 
-bfd_byte *
+gdb_byte *
 value_contents_raw (struct value *value)
 {
   return value->aligner.contents + value->embedded_offset;
 }
 
-bfd_byte *
+gdb_byte *
 value_contents_all_raw (struct value *value)
 {
   return value->aligner.contents;
@@ -324,7 +324,7 @@ value_enclosing_type (struct value *value)
   return value->enclosing_type;
 }
 
-const bfd_byte *
+const gdb_byte *
 value_contents_all (struct value *value)
 {
   if (value->lazy)
@@ -344,13 +344,13 @@ set_value_lazy (struct value *value, int val)
   value->lazy = val;
 }
 
-const bfd_byte *
+const gdb_byte *
 value_contents (struct value *value)
 {
   return value_contents_writeable (value);
 }
 
-bfd_byte *
+gdb_byte *
 value_contents_writeable (struct value *value)
 {
   if (value->lazy)
@@ -768,7 +768,7 @@ void
 set_internalvar_component (struct internalvar *var, int offset, int bitpos,
 			   int bitsize, struct value *newval)
 {
-  bfd_byte *addr = value_contents_writeable (var->value) + offset;
+  gdb_byte *addr = value_contents_writeable (var->value) + offset;
 
   if (bitsize)
     modify_field (addr, value_as_long (newval),
@@ -996,7 +996,7 @@ value_as_address (struct value *val)
    to an INT (or some size).  After all, it is only an offset.  */
 
 LONGEST
-unpack_long (struct type *type, const bfd_byte *valaddr)
+unpack_long (struct type *type, const gdb_byte *valaddr)
 {
   enum type_code code = TYPE_CODE (type);
   int len = TYPE_LENGTH (type);
@@ -1045,7 +1045,7 @@ unpack_long (struct type *type, const bfd_byte *valaddr)
    format, result is in host format.  */
 
 DOUBLEST
-unpack_double (struct type *type, const bfd_byte *valaddr, int *invp)
+unpack_double (struct type *type, const gdb_byte *valaddr, int *invp)
 {
   enum type_code code;
   int len;
@@ -1109,7 +1109,7 @@ unpack_double (struct type *type, const bfd_byte *valaddr, int *invp)
    to an INT (or some size).  After all, it is only an offset.  */
 
 CORE_ADDR
-unpack_pointer (struct type *type, const bfd_byte *valaddr)
+unpack_pointer (struct type *type, const gdb_byte *valaddr)
 {
   /* Assume a CORE_ADDR can fit in a LONGEST (for now).  Not sure
      whether we want this to be true eventually.  */
@@ -1359,7 +1359,7 @@ value_fn_field (struct value **arg1p, struct fn_field *f, int j, struct type *ty
    If the field is signed, we also do sign extension. */
 
 LONGEST
-unpack_field_as_long (struct type *type, const bfd_byte *valaddr, int fieldno)
+unpack_field_as_long (struct type *type, const gdb_byte *valaddr, int fieldno)
 {
   ULONGEST val;
   ULONGEST valmask;
@@ -1406,7 +1406,7 @@ unpack_field_as_long (struct type *type, const bfd_byte *valaddr, int fieldno)
    0 <= BITPOS, where lbits is the size of a LONGEST in bits.  */
 
 void
-modify_field (bfd_byte *addr, LONGEST fieldval, int bitpos, int bitsize)
+modify_field (gdb_byte *addr, LONGEST fieldval, int bitpos, int bitsize)
 {
   ULONGEST oword;
   ULONGEST mask = (ULONGEST) -1 >> (8 * sizeof (ULONGEST) - bitsize);
diff --git a/gdb/value.h b/gdb/value.h
index 744c26c9f84..2347dad80fd 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -168,7 +168,7 @@ extern void set_value_lazy (struct value *value, int val);
    get to the real subobject, if the value happens to represent
    something embedded in a larger run-time object.  */
 
-extern bfd_byte *value_contents_raw (struct value *);
+extern gdb_byte *value_contents_raw (struct value *);
 
 /* Actual contents of the value.  For use of this value; setting it
    uses the stuff above.  Not valid if lazy is nonzero.  Target
@@ -176,14 +176,14 @@ extern bfd_byte *value_contents_raw (struct value *);
    value.  Note that a value therefore extends beyond what is
    declared here.  */
 
-extern const bfd_byte *value_contents (struct value *);
-extern bfd_byte *value_contents_writeable (struct value *);
+extern const gdb_byte *value_contents (struct value *);
+extern gdb_byte *value_contents_writeable (struct value *);
 
 /* The ALL variants of the above two macros do not adjust the returned
    pointer by the embedded_offset value.  */
 
-extern bfd_byte *value_contents_all_raw (struct value *);
-extern const bfd_byte *value_contents_all (struct value *);
+extern gdb_byte *value_contents_all_raw (struct value *);
+extern const gdb_byte *value_contents_all (struct value *);
 
 extern int value_fetch_lazy (struct value *val);
 extern int value_contents_equal (struct value *val1, struct value *val2);
@@ -262,12 +262,12 @@ extern LONGEST value_as_long (struct value *val);
 extern DOUBLEST value_as_double (struct value *val);
 extern CORE_ADDR value_as_address (struct value *val);
 
-extern LONGEST unpack_long (struct type *type, const bfd_byte *valaddr);
-extern DOUBLEST unpack_double (struct type *type, const bfd_byte *valaddr,
+extern LONGEST unpack_long (struct type *type, const gdb_byte *valaddr);
+extern DOUBLEST unpack_double (struct type *type, const gdb_byte *valaddr,
 			       int *invp);
-extern CORE_ADDR unpack_pointer (struct type *type, const bfd_byte *valaddr);
+extern CORE_ADDR unpack_pointer (struct type *type, const gdb_byte *valaddr);
 extern LONGEST unpack_field_as_long (struct type *type,
-				     const bfd_byte *valaddr,
+				     const gdb_byte *valaddr,
 				     int fieldno);
 
 extern struct value *value_from_longest (struct type *type, LONGEST num);
@@ -379,7 +379,7 @@ extern struct value *register_value_being_returned (struct type *valtype,
 
 extern struct value *value_in (struct value *element, struct value *set);
 
-extern int value_bit_index (struct type *type, const bfd_byte *addr,
+extern int value_bit_index (struct type *type, const gdb_byte *addr,
 			    int index);
 
 extern int using_struct_return (struct type *value_type, int gcc_p);
@@ -452,20 +452,20 @@ extern void release_value (struct value *val);
 
 extern int record_latest_value (struct value *val);
 
-extern void modify_field (bfd_byte *addr, LONGEST fieldval, int bitpos,
+extern void modify_field (gdb_byte *addr, LONGEST fieldval, int bitpos,
 			  int bitsize);
 
 extern void type_print (struct type *type, char *varstring,
 			struct ui_file *stream, int show);
 
-extern bfd_byte *baseclass_addr (struct type *type, int index,
-				 bfd_byte *valaddr,
+extern gdb_byte *baseclass_addr (struct type *type, int index,
+				 gdb_byte *valaddr,
 				 struct value **valuep, int *errp);
 
 extern void print_longest (struct ui_file *stream, int format,
 			   int use_local, LONGEST val);
 
-extern void print_floating (const bfd_byte *valaddr, struct type *type,
+extern void print_floating (const gdb_byte *valaddr, struct type *type,
 			    struct ui_file *stream);
 
 extern int value_print (struct value *val, struct ui_file *stream, int format,
@@ -477,7 +477,7 @@ extern void value_print_array_elements (struct value *val,
 
 extern struct value *value_release_to_mark (struct value *mark);
 
-extern int val_print (struct type *type, const bfd_byte *valaddr,
+extern int val_print (struct type *type, const gdb_byte *valaddr,
 		      int embedded_offset, CORE_ADDR address,
 		      struct ui_file *stream, int format,
 		      int deref_ref, int recurse,
@@ -495,7 +495,7 @@ extern void print_variable_value (struct symbol *var,
 				  struct frame_info *frame,
 				  struct ui_file *stream);
 
-extern int check_field (struct value *, const bfd_byte *);
+extern int check_field (struct value *, const gdb_byte *);
 
 extern void typedef_print (struct type *type, struct symbol *news,
 			   struct ui_file *stream);
@@ -520,7 +520,7 @@ extern struct value *value_literal_complex (struct value *, struct value *,
 					    struct type *);
 
 extern void find_rt_vbase_offset (struct type *, struct type *,
-				  const bfd_byte *, int, int *, int *);
+				  const gdb_byte *, int, int *, int *);
 
 extern struct value *find_function_in_inferior (const char *);