Don't treat `;' as a line separator by default.

Explicitly mention `;' in line_separator_chars in each backend.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c86531e12596bcff91c465f8306397f017ab7210..9d02b840686ded3dfe4f8c253985d55980b6a6f5 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,30 @@
+2000-06-09  Alan Modra  <alan@linuxcare.com.au>
+
+       * app.c (do_scrub_begin): Don't default lex[';'] as a line
+       separator.
+       * doc/internals.texi (line_separator_chars): Semicolon is no
+       longer a default.  Mention null and newline as defaults.
+
+       * read.c (is_end_of_line): Remove ifdef TC_HPPA.
+
+       * config/tc-i386.h (line_separator_chars): Explicitly mention `;'
+       * config/tc-i860.h (line_separator_chars): Likewise.
+       * config/tc-h8300.c (line_separator_chars): Likewise.
+       * config/tc-i960.c (line_separator_chars): Likewise.
+       * config/tc-m68k.c (line_separator_chars): Likewise.
+       * config/tc-mips.c (line_separator_chars): Likewise.
+       * config/tc-ns32k.c (line_separator_chars): Likewise.
+       * config/tc-sparc.c (line_separator_chars): Likewise.
+       * config/tc-vax.c (line_separator_chars): Likewise.
+
+       * config/tc-h8300.c (comment_chars): Use string initialiser.
+       * config/tc-i960.c (line_comment_chars): Likewise.
+       * config/tc-z8k.c (comment_chars, line_comment_chars,
+       line_separator_chars): Likewise.
+
+       * config/tc-arm.c (line_separator_chars): Always use `;', not just
+       for TE_LINUX.
+
 2000-06-08  Nick Clifton  <nickc@cygnus.com>
 
        * config/tc-arm.c (cons_fix_new_arm): Assign correct reloc value

diff --git a/gas/app.c b/gas/app.c
index 1b2243ab728ee29c127e6258950f3fffd6de0543..09c795cd2821bcc71ba9264a476d4ff3c7ae2818 100644 (file)
--- a/gas/app.c
+++ b/gas/app.c
@@ -101,7 +101,6 @@ do_scrub_begin (m68k_mri)
   lex['\t'] = LEX_IS_WHITESPACE;
   lex['\r'] = LEX_IS_WHITESPACE;
   lex['\n'] = LEX_IS_NEWLINE;
-  lex[';'] = LEX_IS_LINE_SEPARATOR;
   lex[':'] = LEX_IS_COLON;
 
 #ifdef TC_M68K

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index fb9edcc4d9ba177421c8d1c7f2fe873e8f3c01ee..7f7c7eaf4f4afe3fba634278e8938f221496b5fb 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -115,11 +115,7 @@ CONST char comment_chars[] = "@";
 /* Also note that comments like this one will always work.  */
 CONST char line_comment_chars[] = "#";
 
-#ifdef TE_LINUX
 CONST char line_separator_chars[] = ";";
-#else
-CONST char line_separator_chars[] = "";
-#endif
 
 /* Chars that can be used to separate mant
    from exp in floating point numbers.  */

diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
index 2b63b00986d0335a20008b0cfd2199a1ec72e617..97a269528612f74afeb94cacf0c826bcfdebca87 100644 (file)
--- a/gas/config/tc-h8300.c
+++ b/gas/config/tc-h8300.c
@@ -34,11 +34,9 @@
 #include "opcode/h8300.h"
 #include <ctype.h>
 
-const char comment_chars[] =
-{';', 0};
-const char line_separator_chars[] =
-{0};
+const char comment_chars[] = ";";
 const char line_comment_chars[] = "#";
+const char line_separator_chars[] = "";
 
 /* This table describes all the machine specific pseudo-ops the assembler
    has to support.  The fields are:

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 8497f05371ac5910df0101a04f4514986e0eb174..395b50f54f9c15dd8934b9c4589d00210fd8a32e 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -169,7 +169,7 @@ const char line_comment_chars[] = "";
 const char line_comment_chars[] = "/";
 #endif
 
-const char line_separator_chars[] = "";
+const char line_separator_chars[] = ";";
 
 /* Chars that can be used to separate mant from exp in floating point nums */
 const char EXP_CHARS[] = "eE";

diff --git a/gas/config/tc-i860.c b/gas/config/tc-i860.c
index 3317282ba42541208179f0dd717eedb2c0081c8e..e38e6b7d13e9f5d26f27969e3d0781720824dfcc 100644 (file)
--- a/gas/config/tc-i860.c
+++ b/gas/config/tc-i860.c
@@ -66,7 +66,7 @@ const char comment_chars[] = "!/";    /* JF removed '|' from comment_chars */
 /* Also note that comments like this one will always work. */
 const char line_comment_chars[] = "#/";
 
-const char line_separator_chars[] = "";
+const char line_separator_chars[] = ";";
 
 /* Chars that can be used to separate mant from exp in floating point nums */
 const char EXP_CHARS[] = "eE";

diff --git a/gas/config/tc-i960.c b/gas/config/tc-i960.c
index d8c15c09911f8135de0de7e20ddb406b84bed4a2..8c5be7bbb659442b31db5cc8ec8747b248e4844a 100644 (file)
--- a/gas/config/tc-i960.c
+++ b/gas/config/tc-i960.c
@@ -180,9 +180,9 @@ const char comment_chars[] = "#";
 
 /* Also note that comments started like this one will always work. */
 
-const char line_comment_chars[1];
+const char line_comment_chars[] = "";
 
-const char line_separator_chars[1];
+const char line_separator_chars[] = ";";
 
 /* Chars that can be used to separate mant from exp in floating point nums */
 const char EXP_CHARS[] = "eE";

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index b8250ec5de298e71734972ea6b481bfb8e18cb8b..da78310580cfcaac4df3f62c25c29eeeab23c361 100644 (file)
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -50,7 +50,7 @@ const char *m68k_comment_chars = "|";
 /* Also note that comments like this one will always work. */
 const char line_comment_chars[] = "#*";
 
-const char line_separator_chars[] = "";
+const char line_separator_chars[] = ";";
 
 /* Chars that can be used to separate mant from exp in floating point nums */
 CONST char EXP_CHARS[] = "eE";

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index f93e372e968e79f7c57a2bce31df4e8d36ae3bba..cdfe5365cddaa05941489a0b4ed9b90340a1f788 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -357,7 +357,7 @@ const char comment_chars[] = "#";
 const char line_comment_chars[] = "#";
 
 /* This array holds machine specific line separator characters. */
-const char line_separator_chars[] = "";
+const char line_separator_chars[] = ";";
 
 /* Chars that can be used to separate mant from exp in floating point nums */
 const char EXP_CHARS[] = "eE";

diff --git a/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c
index 59f146762297961cc9ea52bcb7a791b860d4c78c..c81a3879f26f2ad9953e969bccb6b682e665f02a 100644 (file)
--- a/gas/config/tc-ns32k.c
+++ b/gas/config/tc-ns32k.c
@@ -62,7 +62,7 @@
 
 const char comment_chars[] = "#";
 const char line_comment_chars[] = LINE_COMMENT_CHARS;
-const char line_separator_chars[] = "";
+const char line_separator_chars[] = ";";
 #if !defined(ABSOLUTE_PREFIX) && !defined(IMMEDIATE_PREFIX)
 #define ABSOLUTE_PREFIX '@'    /* One or the other MUST be defined */
 #endif

diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index bd086d22d920fd93efbab4f712f1036ef04809cd..2ac855e21a1dfb4ac23cc9bad58f741cdb26f6ca 100644 (file)
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -175,7 +175,7 @@ const char comment_chars[] = "!";   /* JF removed '|' from comment_chars */
    work if '/' isn't otherwise defined. */
 const char line_comment_chars[] = "#";
 
-const char line_separator_chars[] = "";
+const char line_separator_chars[] = ";";
 
 /* Chars that can be used to separate mant from exp in floating point nums */
 const char EXP_CHARS[] = "eE";

diff --git a/gas/config/tc-vax.c b/gas/config/tc-vax.c
index f425cccff36e72cae0202707174d12188a364a6b..314f9bc5e3ee653ef8750c10d86a24e9dd865eef 100644 (file)
--- a/gas/config/tc-vax.c
+++ b/gas/config/tc-vax.c
@@ -32,7 +32,7 @@ const char comment_chars[] = "#";
 /* Note that for the VAX the are the same as comment_chars above. */
 const char line_comment_chars[] = "#";
 
-const char line_separator_chars[] = "";
+const char line_separator_chars[] = ";";
 
 /* Chars that can be used to separate mant from exp in floating point nums */
 const char EXP_CHARS[] = "eE";

diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
index f89b14b3b32e3928e760622dd822fa88c4978bbb..323cbcfbd9c81b7ac0034d71c6e4ed0e69271314 100644 (file)
--- a/gas/config/tc-z8k.c
+++ b/gas/config/tc-z8k.c
@@ -31,12 +31,9 @@
 #include "bfd.h"
 #include <ctype.h>
 
-const char comment_chars[] =
-{'!', 0};
-const char line_separator_chars[] =
-{';', 0};
-const char line_comment_chars[] =
-{'#', 0};
+const char comment_chars[] = "!";
+const char line_comment_chars[] = "#";
+const char line_separator_chars[] = ";";
 
 extern int machine;
 extern int coff_flags;

diff --git a/gas/doc/internals.texi b/gas/doc/internals.texi
index f8374f9987af2495900b7222fad3e157fdf60076..2806fc641631052d0f8a25222fa0ee7db1eb1640 100644 (file)
--- a/gas/doc/internals.texi
+++ b/gas/doc/internals.texi
@@ -912,7 +912,7 @@ comment when they appear at the start of a line.
 @item line_separator_chars
 @cindex line_separator_chars
 This is a null terminated @code{const char} array of characters which separate
-lines (semicolon and newline are such characters by default, and need not be
+lines (null and newline are such characters by default, and need not be
 listed in this array).  Note that line_separator_chars do not separate lines
 if found in a comment, such as after a character in line_comment_chars or
 comment_chars.

diff --git a/gas/read.c b/gas/read.c
index 7d6f19a2f89ac8d9f6d6b0b1355e3b491ea7f251..90c43ddc56b29d2573058ab5b1f3b696aa593dc4 100644 (file)
--- a/gas/read.c
+++ b/gas/read.c
@@ -155,11 +155,7 @@ char is_end_of_line[256] =
 #endif
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,      /* */
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,      /* _!"#$%&'()*+,-./ */
-#ifdef TC_HPPA
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,      /* 0123456789:;<=>? */
-#else
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,      /* 0123456789:;<=>? */
-#endif
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,      /* */
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,      /* */
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,      /* */