gas/

	* read.c (emit_expr_fix): Handle size 3.
	* config/tc-avr.c (md_assemble): Call dwarf2_emit_insn.
	* config/tc-d30v.c (write_long, write_1_short,
	write_2_short, md_assemble): Likewise.
	* config/tc-dlx.c (md_assemble): Likewise.
	* config/tc-i860.c (md_assemble): Likewise.
	* config/tc-mn10200.c (md_assemble): Likewise.
	* config/tc-pj.c (md_assemble): Likewise.
	* config/tc-vax.c (md_assemble): Likewise.
gas/testsuite/
	* gas/d30v/serial2.l: Adjust position of page break.
	* gas/lns/lns-common-1-alt.d: Match 2009-04-24 change.
	* gas/mt/ms1-16-003.d: Correct reloc name.
	* gas/mt/relocs.d: Elide incorrect file format strings.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5425e9a290cbcae1ad3251f91ab47c7bf6ffe5cb..7b09b27beb292a7a14f729e69d3752f4a0ab489e 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-08  Alan Modra  <amodra@bigpond.net.au>
+
+       * read.c (emit_expr_fix): Handle size 3.
+       * config/tc-avr.c (md_assemble): Call dwarf2_emit_insn.
+       * config/tc-d30v.c (write_long, write_1_short,
+       write_2_short, md_assemble): Likewise.
+       * config/tc-dlx.c (md_assemble): Likewise.
+       * config/tc-i860.c (md_assemble): Likewise.
+       * config/tc-mn10200.c (md_assemble): Likewise.
+       * config/tc-pj.c (md_assemble): Likewise.
+       * config/tc-vax.c (md_assemble): Likewise.
+
 2009-09-07  Tristan Gingold  <gingold@adacore.com>
 
        * po/gas.pot: Regenerate

diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index 5f243b43cb5b687ed606cdc10731d9be0440b2de..9d14f6418ea2750ec388a3590981b7c275ce2c2c 100644 (file)
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -1366,6 +1366,8 @@ md_assemble (char *str)
   if (!avr_opt.all_opcodes && (opcode->isa & avr_mcu->isa) != opcode->isa)
     as_bad (_("illegal opcode %s for mcu %s"), opcode->name, avr_mcu->name);
 
+  dwarf2_emit_insn (0);
+
   /* We used to set input_line_pointer to the result of get_operands,
      but that is wrong.  Our caller assumes we don't change it.  */
   {

diff --git a/gas/config/tc-d30v.c b/gas/config/tc-d30v.c
index 5e3e96efb9a864f5900f7345d42177512d79c82e..3e95375626d88576bd4ea5f38cf36464dea1ff15 100644 (file)
--- a/gas/config/tc-d30v.c
+++ b/gas/config/tc-d30v.c
@@ -23,6 +23,7 @@
 #include "safe-ctype.h"
 #include "subsegs.h"
 #include "opcode/d30v.h"
+#include "dwarf2dbg.h"
 
 const char comment_chars[]        = ";";
 const char line_comment_chars[]   = "#";
@@ -593,6 +594,7 @@ write_long (struct d30v_insn *opcode ATTRIBUTE_UNUSED,
   int i, where;
   char *f = frag_more (8);
 
+  dwarf2_emit_insn (8);
   insn |= FM11;
   d30v_number_to_chars (f, insn, 8);
 
@@ -620,6 +622,7 @@ write_1_short (struct d30v_insn *opcode,
   char *f = frag_more (8);
   int i, where;
 
+  dwarf2_emit_insn (8);
   if (warn_nops == NOP_ALL)
     as_warn (_("%s NOP inserted"), use_sequential ?
             _("sequential") : _("parallel"));
@@ -1087,6 +1090,7 @@ write_2_short (struct d30v_insn *opcode1,
     }
 
   f = frag_more (8);
+  dwarf2_emit_insn (8);
   d30v_number_to_chars (f, insn, 8);
 
   /* If the previous instruction was a 32-bit multiply but it is put into a
@@ -1684,6 +1688,7 @@ md_assemble (char *str)
              else
                {
                  f = frag_more (8);
+                 dwarf2_emit_insn (8);
                  d30v_number_to_chars (f, NOP2, 8);
 
                  if (warn_nops == NOP_ALL || warn_nops == NOP_MULTIPLY)

diff --git a/gas/config/tc-dlx.c b/gas/config/tc-dlx.c
index 65e4b552f33d1e25efc7e59683a6c592cf1f49df..6cf1fcd1a49c5ed47a9734a8efee320ff51755a4 100644 (file)
--- a/gas/config/tc-dlx.c
+++ b/gas/config/tc-dlx.c
@@ -909,6 +909,8 @@ md_assemble (char *str)
   know (str);
   machine_ip (str);
   toP = frag_more (4);
+  dwarf2_emit_insn (4);
+
   /* Put out the opcode.  */
   md_number_to_chars (toP, the_insn.opcode, 4);
 

diff --git a/gas/config/tc-i860.c b/gas/config/tc-i860.c
index ec9bda8a33e840a939fb3f72f443f08192f920a1..32aed0fc7a93d0d82c50eb1c49e10493fda5d758 100644 (file)
--- a/gas/config/tc-i860.c
+++ b/gas/config/tc-i860.c
@@ -408,6 +408,7 @@ md_assemble (char *str)
        as_warn (_("An instruction was expanded (%s)"), str);
     }
 
+  dwarf2_emit_insn (0);
   i = 0;
   do
     {

diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c
index fa78d53da3015318c88721ae607b70621c4098ba..4f7cccb51e5070cd1562e2b6e5d41d332a1fce75 100644 (file)
--- a/gas/config/tc-mn10200.c
+++ b/gas/config/tc-mn10200.c
@@ -1,6 +1,6 @@
 /* tc-mn10200.c -- Assembler code for the Matsushita 10200
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007  Free Software Foundation, Inc.
+   2005, 2006, 2007, 2009  Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -1156,6 +1156,7 @@ keep_going:
     abort ();
 
   /* Write out the instruction.  */
+  dwarf2_emit_insn (0);
   if (relaxable && fc > 0)
     {
       /* On a 64-bit host the size of an 'int' is not the same

diff --git a/gas/config/tc-pj.c b/gas/config/tc-pj.c
index 1c8471f575df9823dcc02947b3b8e807d7966fdc..8f49e8f70aeada8d3c1353c68934bc0890f568c4 100644 (file)
--- a/gas/config/tc-pj.c
+++ b/gas/config/tc-pj.c
@@ -261,6 +261,7 @@ md_assemble (char *str)
       return;
     }
 
+  dwarf2_emit_insn (0);
   if (opcode->opcode == -1)
     {
       /* It's a fake opcode.  Dig out the args and pretend that was

diff --git a/gas/config/tc-vax.c b/gas/config/tc-vax.c
index 7db0991035c1ddc078fac2d00c202c7b6825ab28..33353dab4b02d7286aab4570d33a361dd4638840 100644 (file)
--- a/gas/config/tc-vax.c
+++ b/gas/config/tc-vax.c
@@ -2713,6 +2713,7 @@ md_assemble (char *instruction_string)
   if (need_pass_2 || goofed)
     return;
 
+  dwarf2_emit_insn (0);
   /* Emit op-code.  */
   /* Remember where it is, in case we want to modify the op-code later.  */
   opcode_low_byteP = frag_more (v.vit_opcode_nbytes);

diff --git a/gas/read.c b/gas/read.c
index 9c38bc86252e2f83cdb7f5ff416227e880c9577a..5a384a655d2eb48e04a2169333c21b80cd6b8b28 100644 (file)
--- a/gas/read.c
+++ b/gas/read.c
@@ -4265,6 +4265,9 @@ emit_expr_fix (expressionS *exp, unsigned int nbytes, fragS *frag, char *p)
       case 2:
        r = BFD_RELOC_16;
        break;
+      case 3:
+       r = BFD_RELOC_24;
+       break;
       case 4:
        r = BFD_RELOC_32;
        break;

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e0fcb9e11967f8a9e6d28ef809768bfddba0b74f..1ff9c462550e00ef93969064e86544f099a09236 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-08  Alan Modra  <amodra@bigpond.net.au>
+
+       * gas/d30v/serial2.l: Adjust position of page break.
+       * gas/lns/lns-common-1-alt.d: Match 2009-04-24 change.
+       * gas/mt/ms1-16-003.d: Correct reloc name.
+       * gas/mt/relocs.d: Elide incorrect file format strings.
+
 2009-09-08  Alan Modra  <amodra@bigpond.net.au>
 
        * gas/all/gas.exp (do_comment): Don't run on m32c.

diff --git a/gas/testsuite/gas/d30v/serial2.l b/gas/testsuite/gas/d30v/serial2.l
index 3dc2652dacf002f5c24b55767364a95d7c6badc1..a799bb906c08568a8cbaf15b03f1f1e3aac32b8f 100644 (file)
--- a/gas/testsuite/gas/d30v/serial2.l
+++ b/gas/testsuite/gas/d30v/serial2.l
@@ -79,10 +79,10 @@ GAS LISTING .*
   17      00F00000 
   18 \?\?\?\? 10080001                 bra/tx -3 -> bra 10     ;      Valid
 \*\*\*\*  Error:Unable to mix instructions as specified
-  18      00F00000 
 \fGAS LISTING .*
 
 
+  18      00F00000 
   18      100BFFFF 
   18      00F00000 
   19 \?\?\?\? 00080001                 bra/tx -3 -> bra/fx 10  ;      Valid

diff --git a/gas/testsuite/gas/lns/lns-common-1-alt.d b/gas/testsuite/gas/lns/lns-common-1-alt.d
index b19b425ca3ce31efba37cbbb173331d2cc2854db..39e65dcd9b3e3c72fe01c1459e4c5a475cbdfdb8 100644 (file)
--- a/gas/testsuite/gas/lns/lns-common-1-alt.d
+++ b/gas/testsuite/gas/lns/lns-common-1-alt.d
@@ -34,6 +34,10 @@ Raw dump of debug contents of section \.debug_line:
   Advance Line by 1 to 7
   Advance PC by fixed size amount .* to .*
   Copy
+  Extended opcode 4: set Discriminator to 1
+  Advance Line by 0 to 7
+  Advance PC by fixed size amount .* to .*
+  Copy
   Advance PC by fixed size amount .* to .*
   Extended opcode 1: End of Sequence
 #...

diff --git a/gas/testsuite/gas/mt/ms1-16-003.d b/gas/testsuite/gas/mt/ms1-16-003.d
index f8556962f84b3b023ddcc58d3ad7e7a85d379d3e..0701a166619f1f7779a784a8ad0defa03286303b 100644 (file)
--- a/gas/testsuite/gas/mt/ms1-16-003.d
+++ b/gas/testsuite/gas/mt/ms1-16-003.d
@@ -14,7 +14,7 @@ Disassembly of section .text:
    8:  09 00 00 00     muli R0,R0,#\$0
 0000000c <dbnz_>:
    c:  3d 00 00 00     dbnz R0,c <dbnz_>
-[      ]*c: R_MS1_PC16 dbnz
+[      ]*c: R_MT_PC16  dbnz
 00000010 <fbcbincs>:
   10:  f0 00 00 00     fbcbincs #\$0,#\$0,#\$0,#\$0,#\$0,#\$0,#\$0,#\$0,#\$0,#\$0
 00000014 <mfbcbincs>:

diff --git a/gas/testsuite/gas/mt/relocs.d b/gas/testsuite/gas/mt/relocs.d
index 2a752ba2e02992b43f1a833bdd8a0cd983b0c120..8546367bae3032bc17eedbed8ba5c71bb1673ffa 100644 (file)
--- a/gas/testsuite/gas/mt/relocs.d
+++ b/gas/testsuite/gas/mt/relocs.d
@@ -1,5 +1,5 @@
 
-relocs.x:     file format elf32-(mrisc1|ms1)
+relocs.x:     file format .*
 
 Contents of section .text:
  2000 00131000 3700dffc 12000000 3700fff8  ....7.......7...