[AARCH64] Positively emit symbols for alignment

2015-05-05  Renlin Li  <renlin.li@arm.com>

  gas/
    * config/tc-aarch64.c (aarch64_init_frag): Always generate mapping symbols.

  gas/testsuite/
    * gas/aarch64/mapping_5.d: New.
    * gas/aarch64/mapping_5.s: New.
    * gas/aarch64/mapping_6.d: New.
    * gas/aarch64/mapping_6.s: New.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 30831ae742e461100cbc680527f5dbd9d8a99fa1..c87327001a6d112e2f2ca419aea630398e4a5040 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-05  Renlin Li  <renlin.li@arm.com>
+
+       * config/tc-aarch64.c (aarch64_init_frag): Always generate mapping
+       symbols.
+
 2015-05-05  Nick Clifton  <nickc@redhat.com>
 
        * config/tc-msp430.c (MAX_OP_LEN): Increase to 4096.

diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 646deb64482f6b247e9e6bae1cdb6075c180840e..12012de3f2e4830f6ff5bf7e9af816b566d5e425 100644 (file)
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -6028,21 +6028,20 @@ aarch64_init_frag (fragS * fragP, int max_chars)
   /* Record a mapping symbol for alignment frags.  We will delete this
      later if the alignment ends up empty.  */
   if (!fragP->tc_frag_data.recorded)
+    fragP->tc_frag_data.recorded = 1;
+
+  switch (fragP->fr_type)
     {
-      fragP->tc_frag_data.recorded = 1;
-      switch (fragP->fr_type)
-       {
-       case rs_align:
-       case rs_align_test:
-       case rs_fill:
-         mapping_state_2 (MAP_DATA, max_chars);
-         break;
-       case rs_align_code:
-         mapping_state_2 (MAP_INSN, max_chars);
-         break;
-       default:
-         break;
-       }
+    case rs_align:
+    case rs_align_test:
+    case rs_fill:
+      mapping_state_2 (MAP_DATA, max_chars);
+      break;
+    case rs_align_code:
+      mapping_state_2 (MAP_INSN, max_chars);
+      break;
+    default:
+      break;
     }
 }
 \f

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e1fda7719e21031d518228979c7c284c184a3c07..29649e11749305916427652792412040053614bf 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-05  Renlin Li  <renlin.li@arm.com>
+
+       * gas/aarch64/mapping_5.d: New.
+       * gas/aarch64/mapping_5.s: New.
+       * gas/aarch64/mapping_6.d: New.
+       * gas/aarch64/mapping_6.s: New.
+
 2015-05-01  H.J. Lu  <hongjiu.lu@intel.com>
 
        * gas/i386/i386.exp: Run note.

diff --git a/gas/testsuite/gas/aarch64/mapping_5.d b/gas/testsuite/gas/aarch64/mapping_5.d
new file mode 100644 (file)
index 0000000..4778b3d
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/mapping_5.d
@@ -0,0 +1,13 @@
+#objdump: --syms --special-syms
+#name: AArch64 Mapping Symbols Test 5
+
+.*: +file format.*aarch64.*
+
+SYMBOL TABLE:
+[0]+00 l    d  .text   [0]+00 .text
+[0]+00 l    d  .data   [0]+00 .data
+[0]+00 l    d  .bss    [0]+00 .bss
+[0]+00 l       .text   [0]+00 \$x
+[0]+04 l       .text   [0]+00 \$d
+[0]+08 l       .text   [0]+00 \$x
+[0]+10 l       .text   [0]+00 \$d

diff --git a/gas/testsuite/gas/aarch64/mapping_5.s b/gas/testsuite/gas/aarch64/mapping_5.s
new file mode 100644 (file)
index 0000000..2cb95ed
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/mapping_5.s
@@ -0,0 +1,5 @@
+       .text
+       nop
+       .long   0
+       .align  4
+       .word   0x12345678

diff --git a/gas/testsuite/gas/aarch64/mapping_6.d b/gas/testsuite/gas/aarch64/mapping_6.d
new file mode 100644 (file)
index 0000000..3a5dfb8
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/mapping_6.d
@@ -0,0 +1,14 @@
+#objdump: --syms --special-syms
+#name: AArch64 Mapping Symbols Test 6
+
+.*: +file format.*aarch64.*
+
+SYMBOL TABLE:
+[0]+00 l    d  .text   [0]+00 .text
+[0]+00 l    d  .data   [0]+00 .data
+[0]+00 l    d  .bss    [0]+00 .bss
+[0]+00 l       .text   [0]+00 \$x
+[0]+04 l       .text   [0]+00 \$d
+[0]+10 l       .text   [0]+00 \$d
+[0]+09 l       .text   [0]+00 \$d
+[0]+0c l       .text   [0]+00 \$x

diff --git a/gas/testsuite/gas/aarch64/mapping_6.s b/gas/testsuite/gas/aarch64/mapping_6.s
new file mode 100644 (file)
index 0000000..4e0e2c5
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/mapping_6.s
@@ -0,0 +1,6 @@
+       .text
+       nop
+       .long   0
+       .byte   1
+       .align  4
+       .word   0x12345678