diff --git a/gas/config/tc-cris.c b/gas/config/tc-cris.c
index 6a916fdd9c7..86ec1f701ec 100644
--- a/gas/config/tc-cris.c
+++ b/gas/config/tc-cris.c
@@ -211,7 +211,7 @@ static int warn_for_branch_expansion = 0;
 static int err_for_dangerous_mul_placement
  = (XCONCAT2 (arch_,DEFAULT_CRIS_ARCH) != arch_crisv32);
 
-const char cris_comment_chars[] = ";";
+const char comment_chars[] = ";";
 
 /* This array holds the chars that only start a comment at the beginning of
    a line.  If the line seems to have the form '# 123 filename'
diff --git a/gas/config/tc-cris.h b/gas/config/tc-cris.h
index 398f8193e86..4dab3adba36 100644
--- a/gas/config/tc-cris.h
+++ b/gas/config/tc-cris.h
@@ -50,11 +50,6 @@ extern size_t md_longopts_size;
 
 extern const pseudo_typeS md_pseudo_table[];
 
-#define tc_comment_chars cris_comment_chars
-extern const char cris_comment_chars[];
-extern const char line_comment_chars[];
-extern const char line_separator_chars[];
-
 /* This should be optional, since it is ignored as an escape (assumed to
    be itself) if it is not recognized.  */
 #define ONLY_STANDARD_ESCAPES
diff --git a/gas/config/tc-mmix.c b/gas/config/tc-mmix.c
index 2ae98b34b4e..4d0f94eda48 100644
--- a/gas/config/tc-mmix.c
+++ b/gas/config/tc-mmix.c
@@ -382,7 +382,7 @@ const pseudo_typeS md_pseudo_table[] =
    {NULL, 0, 0}
  };
 
-const char mmix_comment_chars[] = "%!";
+const char comment_chars[] = "%!";
 
 /* A ':' is a valid symbol character in mmixal.  It's the prefix
    delimiter, but other than that, it works like a symbol character,
diff --git a/gas/config/tc-mmix.h b/gas/config/tc-mmix.h
index b07f0047539..08061b8c123 100644
--- a/gas/config/tc-mmix.h
+++ b/gas/config/tc-mmix.h
@@ -26,9 +26,6 @@
 #define TARGET_ARCH bfd_arch_mmix
 #define TARGET_BYTES_BIG_ENDIAN 1
 
-extern const char mmix_comment_chars[];
-#define tc_comment_chars mmix_comment_chars
-
 extern const char mmix_symbol_chars[];
 #define tc_symbol_chars mmix_symbol_chars
 
diff --git a/gas/config/tc-or1k.c b/gas/config/tc-or1k.c
index 0dcb6ea7d56..14b09c9c3e6 100644
--- a/gas/config/tc-or1k.c
+++ b/gas/config/tc-or1k.c
@@ -49,7 +49,7 @@ typedef struct
 }
 or1k_insn;
 
-const char comment_chars[]        = "#";
+const char comment_chars[]        = ";#";
 const char line_comment_chars[]   = "#";
 const char line_separator_chars[] = ";";
 const char EXP_CHARS[]            = "eE";
@@ -90,8 +90,6 @@ s_nodelay (int val ATTRIBUTE_UNUSED)
   nodelay = true;
 }
 
-const char or1k_comment_chars [] = ";#";
-
 /* The target specific pseudo-ops which we support.  */
 const pseudo_typeS md_pseudo_table[] =
 {
diff --git a/gas/config/tc-or1k.h b/gas/config/tc-or1k.h
index 8277272af3a..5b323f2e6d8 100644
--- a/gas/config/tc-or1k.h
+++ b/gas/config/tc-or1k.h
@@ -29,9 +29,6 @@ extern unsigned long or1k_machine;
 #define TARGET_FORMAT           "elf32-or1k"
 #define TARGET_BYTES_BIG_ENDIAN 1
 
-extern const char or1k_comment_chars [];
-#define tc_comment_chars or1k_comment_chars
-
 /* Permit temporary numeric labels.  */
 #define LOCAL_LABELS_FB 1
 
diff --git a/gas/config/tc-visium.c b/gas/config/tc-visium.c
index ee20be405da..fcb128a1abb 100644
--- a/gas/config/tc-visium.c
+++ b/gas/config/tc-visium.c
@@ -53,9 +53,8 @@
 
 
 /* This string holds the chars that always start a comment. If the
-   pre-processor is disabled, these aren't very useful. The macro
-   tc_comment_chars points to this.  */
-const char *visium_comment_chars = "!;";
+   pre-processor is disabled, these aren't very useful.  */
+const char comment_chars[] = "!;";
 
 /* This array holds the chars that only start a comment at the beginning
    of a line.  If the line seems to have the form '# 123 filename' .line
diff --git a/gas/config/tc-visium.h b/gas/config/tc-visium.h
index c94f27e705d..b85357a3051 100644
--- a/gas/config/tc-visium.h
+++ b/gas/config/tc-visium.h
@@ -63,9 +63,6 @@ extern long visium_pcrel_from_section (struct fix *, segT);
 
 #define md_operand(x)
 
-#define tc_comment_chars visium_comment_chars
-extern const char *visium_comment_chars;
-
 #define TARGET_USE_CFIPOP 1
 
 #define tc_cfi_frame_initial_instructions visium_cfi_frame_initial_instructions