diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5e697593ef..9bb3510442 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-03  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* gdbarch.sh: Remove commented out definition of
+	TARGET_CHAR_BIT.
+	* gdbarch.h: Re-generate.
+
 2017-05-03  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	* configure: Regenerate.
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 442bef165a..15a81418b0 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -128,11 +128,7 @@ extern const struct target_desc * gdbarch_target_desc (struct gdbarch *gdbarch);
 extern int gdbarch_bits_big_endian (struct gdbarch *gdbarch);
 extern void set_gdbarch_bits_big_endian (struct gdbarch *gdbarch, int bits_big_endian);
 
-/* Number of bits in a char or unsigned char for the target machine.
-   Just like CHAR_BIT in <limits.h> but describes the target machine.
-   v;TARGET_CHAR_BIT;int;char_bit;;;;8 * sizeof (char);8;;0;
-  
-   Number of bits in a short or unsigned short for the target machine. */
+/* Number of bits in a short or unsigned short for the target machine. */
 
 extern int gdbarch_short_bit (struct gdbarch *gdbarch);
 extern void set_gdbarch_short_bit (struct gdbarch *gdbarch, int short_bit);
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 68163a1947..753819f321 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -351,10 +351,6 @@ i;const struct target_desc *;target_desc;;;;;;;host_address_to_string (gdbarch->
 # and such.  Conceptually, it's quite separate from byte/word byte order.
 v;int;bits_big_endian;;;1;(gdbarch->byte_order == BFD_ENDIAN_BIG);;0
 
-# Number of bits in a char or unsigned char for the target machine.
-# Just like CHAR_BIT in <limits.h> but describes the target machine.
-# v;TARGET_CHAR_BIT;int;char_bit;;;;8 * sizeof (char);8;;0;
-#
 # Number of bits in a short or unsigned short for the target machine.
 v;int;short_bit;;;8 * sizeof (short);2*TARGET_CHAR_BIT;;0
 # Number of bits in an int or unsigned int for the target machine.