* config/tc-bfin.c (md_assemble): Bump line counters if there is

	EOL in the instruction.

	testsuite/
	* gas/bfin/line_number.l, gas/bfin/line_number.s: New test.
	* gas/bfin/bfin.exp: Add the new test.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8ea492817cdf091c2f9093b958a57dfde0af4d6f..254a5fb2bde8cde2179a7fe46d531d0c91010f86 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-03  Jie Zhang  <jie.zhang@analog.com>
+
+       * config/tc-bfin.c (md_assemble): Bump line counters if there is
+       EOL in the instruction.
+
 2009-09-03  Jie Zhang  <jie.zhang@analog.com>
 
        * config/bfin-defs.h (IS_GENREG): Define.

diff --git a/gas/config/tc-bfin.c b/gas/config/tc-bfin.c
index 958f63da25f1d7a2f2743f26c495251b490d0b76..4a02b6915e4e890174ca675aede1bec91ff00e3f 100644 (file)
--- a/gas/config/tc-bfin.c
+++ b/gas/config/tc-bfin.c
@@ -712,6 +712,10 @@ md_assemble (char *line)
 #ifdef OBJ_ELF
   dwarf2_emit_insn (insn_size);
 #endif
+
+  while (*line++ != '\0')
+    if (*line == '\n')
+      bump_line_counters ();
 }
 
 /* Parse one line of instructions, and generate opcode for it.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 0c8b3e44dbd7a40e17972591f0502cf9c307dfa0..90b55157547d3c037c725ba426c272ff28502d98 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-03  Jie Zhang  <jie.zhang@analog.com>
+
+       * gas/bfin/line_number.l, gas/bfin/line_number.s: New test.
+       * gas/bfin/bfin.exp: Add the new test.
+
 2009-09-03  Jie Zhang  <jie.zhang@analog.com>
 
        * gas/bfin/expected_move_errors.s,

diff --git a/gas/testsuite/gas/bfin/bfin.exp b/gas/testsuite/gas/bfin/bfin.exp
index 59eed655ea922b9a0f803476b6badde4e349f319..7a70a4c29b0fca29fdc1750d11b2b53211d9faec 100644 (file)
--- a/gas/testsuite/gas/bfin/bfin.exp
+++ b/gas/testsuite/gas/bfin/bfin.exp
@@ -17,6 +17,7 @@ if [istarget bfin*-*-*] {
        run_dump_test "flow"
        run_dump_test "flow2"
        run_list_test "invalid_arith_mode" ""
+       run_list_test "line_number" ""
        run_dump_test "load"
        run_dump_test "logical"
        run_dump_test "logical2"

diff --git a/gas/testsuite/gas/bfin/line_number.l b/gas/testsuite/gas/bfin/line_number.l
new file mode 100644 (file)
index 0000000..964d809
--- /dev/null
+++ b/gas/testsuite/gas/bfin/line_number.l
@@ -0,0 +1,3 @@
+.*: Assembler messages:
+.*:4: Error: syntax error. Input text was illegal.
+.*:4: Error: 

diff --git a/gas/testsuite/gas/bfin/line_number.s b/gas/testsuite/gas/bfin/line_number.s
new file mode 100644 (file)
index 0000000..a5e47d3
--- /dev/null
+++ b/gas/testsuite/gas/bfin/line_number.s
@@ -0,0 +1,4 @@
+       R1 = ROT R0 BY 0 ||
+       R3 = [SP+12] ||
+       nop;
+       ILLEGAL;