aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorJiong Wang <jiong.wang@arm.com>2015-03-10 11:20:57 +0000
committerJiong Wang <jiong.wang@arm.com>2015-03-10 11:22:15 +0000
commita578ef7ed49b677ecb16a709f70c7349bdefb319 (patch)
treef504624cf6be328e09ea77d291105d3774ed429d /gas
parenta5721eddd18f4ba11adbc9bef0c6cb49a0cb69b4 (diff)
downloadfsf-binutils-gdb-a578ef7ed49b677ecb16a709f70c7349bdefb319.zip
fsf-binutils-gdb-a578ef7ed49b677ecb16a709f70c7349bdefb319.tar.gz
fsf-binutils-gdb-a578ef7ed49b677ecb16a709f70c7349bdefb319.tar.bz2
[AArch64] Set the minimum alignment on code segments
gas/ 2015-03-10 Matthew Wahab <matthew.wahab@arm.com> * config/tc-aarch64.c (mapping_state): Set minimum alignment for code sections. gas/testsuite 2015-03-10 Matthew Wahab <matthew.wahab@arm.com> * gas/aarch64/codealign.d: Add test for code section alignment. * gas/aarch64/codealign.s: New file.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-aarch64.c9
-rw-r--r--gas/testsuite/ChangeLog5
-rw-r--r--gas/testsuite/gas/aarch64/codealign.d16
-rw-r--r--gas/testsuite/gas/aarch64/codealign.s2
5 files changed, 36 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6738d51..e52702c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-10 Matthew Wahab <matthew.wahab@arm.com>
+
+ * config/tc-aarch64.c (mapping_state): Set minimum alignment for
+ code sections.
+
2015-03-10 Nick Clifton <nickc@redhat.com>
PR gas/17852
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 9179fc6..77701c6 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -1478,7 +1478,14 @@ mapping_state (enum mstate state)
/* The mapping symbol has already been emitted.
There is nothing else to do. */
return;
- else if (TRANSITION (MAP_UNDEFINED, MAP_DATA))
+
+ if (state == MAP_INSN)
+ /* AArch64 instructions require 4-byte alignment. When emitting
+ instructions into any section, record the appropriate section
+ alignment. */
+ record_alignment (now_seg, 2);
+
+ if (TRANSITION (MAP_UNDEFINED, MAP_DATA))
/* This case will be evaluated later in the next else. */
return;
else if (TRANSITION (MAP_UNDEFINED, MAP_INSN))
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index fb6e592..004c642 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-10 Matthew Wahab <matthew.wahab@arm.com>
+
+ * gas/aarch64/codealign.d: Add test for code section alignment.
+ * gas/aarch64/codealign.s: New file.
+
2015-03-04 Richard Sandiford <richard.sandiford@arm.com>
PR gas/17843
diff --git a/gas/testsuite/gas/aarch64/codealign.d b/gas/testsuite/gas/aarch64/codealign.d
new file mode 100644
index 0000000..a032b83
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/codealign.d
@@ -0,0 +1,16 @@
+#objdump: --section-headers
+# Minimum code alignment should be set.
+# This test is only valid on ELF based ports.
+#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+
+.*: +file format.*aarch64.*
+
+Sections:
+Idx Name Size VMA LMA File off Algn
+ 0 \.text .* .* .* .* 2\*\*2
+ .*CODE.*
+ 1 \.data .* .* .* .* 2\*\*0
+ .*DATA.*
+ 2 \.bss .* .* .* .* 2\*\*0
+.*
+
diff --git a/gas/testsuite/gas/aarch64/codealign.s b/gas/testsuite/gas/aarch64/codealign.s
new file mode 100644
index 0000000..b80a6d9
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/codealign.s
@@ -0,0 +1,2 @@
+.text
+ nop