2007-05-31 Markus Deuling <deuling@de.ibm.com>

	* gdbarch.sh (TARGET_CHAR_SIGNED): Replace by gdbarch_char_signed.
	* gdbtypes.c (build_gdbtypes, gdbtypes_post_init): Likewise.
	* gdbarch.c, gdbarch.h: Regenerate.

5 files changed, 11 insertions, 14 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9c6d0a6..9e79948 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2007-05-31  Markus Deuling  <deuling@de.ibm.com>
 
+	* gdbarch.sh (TARGET_CHAR_SIGNED): Replace by gdbarch_char_signed.
+	* gdbtypes.c (build_gdbtypes, gdbtypes_post_init): Likewise.
+	* gdbarch.c, gdbarch.h: Regenerate.
+
+2007-05-31  Markus Deuling  <deuling@de.ibm.com>
+
 	* gdbarch.sh (TARGET_BYTE_ORDER): Replace by gdbarch_byte_order.
 	* ax-gdb.c (gen_bitfield_ref): Likewise.
 	* mi/mi-main.c (get_register): Likewise.
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 1881505..79e1fe0 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -783,11 +783,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
   fprintf_unfiltered (file,
                       "gdbarch_dump: cannot_store_register = <0x%lx>\n",
                       (long) current_gdbarch->cannot_store_register);
-#ifdef TARGET_CHAR_SIGNED
-  fprintf_unfiltered (file,
-                      "gdbarch_dump: TARGET_CHAR_SIGNED # %s\n",
-                      XSTRING (TARGET_CHAR_SIGNED));
-#endif
   fprintf_unfiltered (file,
                       "gdbarch_dump: char_signed = %s\n",
                       paddr_d (current_gdbarch->char_signed));
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 01f49fb..ec596a5 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -239,12 +239,6 @@ extern void set_gdbarch_bfd_vma_bit (struct gdbarch *gdbarch, int bfd_vma_bit);
 
 extern int gdbarch_char_signed (struct gdbarch *gdbarch);
 extern void set_gdbarch_char_signed (struct gdbarch *gdbarch, int char_signed);
-#if !defined (GDB_TM_FILE) && defined (TARGET_CHAR_SIGNED)
-#error "Non multi-arch definition of TARGET_CHAR_SIGNED"
-#endif
-#if !defined (TARGET_CHAR_SIGNED)
-#define TARGET_CHAR_SIGNED (gdbarch_char_signed (current_gdbarch))
-#endif
 
 #if defined (TARGET_READ_PC)
 /* Legacy for systems yet to multi-arch TARGET_READ_PC */
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index e81188b..0acbf2b 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -417,7 +417,7 @@ v:TARGET_ADDR_BIT:int:addr_bit:::8 * sizeof (void*):0:TARGET_PTR_BIT:
 v:TARGET_BFD_VMA_BIT:int:bfd_vma_bit:::8 * sizeof (void*):TARGET_ARCHITECTURE->bits_per_address::0
 #
 # One if \`char' acts like \`signed char', zero if \`unsigned char'.
-v:TARGET_CHAR_SIGNED:int:char_signed:::1:-1:1
+v::int:char_signed:::1:-1:1
 #
 F:TARGET_READ_PC:CORE_ADDR:read_pc:ptid_t ptid:ptid
 f:TARGET_WRITE_PC:void:write_pc:CORE_ADDR val, ptid_t ptid:val, ptid:0:generic_target_write_pc::0
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index db4a85a..159a5de 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3418,7 +3418,8 @@ build_gdbtypes (void)
   builtin_type_char =
     init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
 	       (TYPE_FLAG_NOSIGN
-                | (TARGET_CHAR_SIGNED ? 0 : TYPE_FLAG_UNSIGNED)),
+                | (gdbarch_char_signed (current_gdbarch) ?
+		   0 : TYPE_FLAG_UNSIGNED)),
 	       "char", (struct objfile *) NULL);
   builtin_type_true_char =
     init_type (TYPE_CODE_CHAR, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
@@ -3612,7 +3613,8 @@ gdbtypes_post_init (struct gdbarch *gdbarch)
   builtin_type->builtin_char =
     init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
 	       (TYPE_FLAG_NOSIGN
-                | (TARGET_CHAR_SIGNED ? 0 : TYPE_FLAG_UNSIGNED)),
+                | (gdbarch_char_signed (current_gdbarch) ? 
+		   0 : TYPE_FLAG_UNSIGNED)),
 	       "char", (struct objfile *) NULL);
   builtin_type->builtin_true_char =
     init_type (TYPE_CODE_CHAR, TARGET_CHAR_BIT / TARGET_CHAR_BIT,