8f0b4f40bf
Upstream proposed and merged a patch fixing the ARM Trusted Firmware build issue that occurs with recent version sof binutils. This includes this patch instead of the previous one. See binutils commit 7ea12e5c3ad54da440c08f32da09534e63e515ca: "Fix the generation of alignment frags in code sections for AArch64." The issue was reported at: https://sourceware.org/bugzilla/show_bug.cgi?id=20364 Change-Id: I16a8043d3562107b8e84e93d3f3d768d26dac7e4 Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Reviewed-on: https://review.coreboot.org/16110 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
93 lines
2.4 KiB
Diff
93 lines
2.4 KiB
Diff
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
|
|
index 2d491f6..e221ef4 100644
|
|
--- a/gas/config/tc-aarch64.c
|
|
+++ b/gas/config/tc-aarch64.c
|
|
@@ -1736,13 +1736,13 @@ s_ltorg (int ignored ATTRIBUTE_UNUSED)
|
|
if (pool == NULL || pool->symbol == NULL || pool->next_free_entry == 0)
|
|
continue;
|
|
|
|
- mapping_state (MAP_DATA);
|
|
-
|
|
/* Align pool as you have word accesses.
|
|
Only make a frag if we have to. */
|
|
if (!need_pass_2)
|
|
frag_align (align, 0, 0);
|
|
|
|
+ mapping_state (MAP_DATA);
|
|
+
|
|
record_alignment (now_seg, align);
|
|
|
|
sprintf (sym_name, "$$lit_\002%x", pool->id);
|
|
@@ -6373,11 +6373,15 @@ aarch64_init_frag (fragS * fragP, int max_chars)
|
|
|
|
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:
|
|
+ /* PR 20364: We can get alignment frags in code sections,
|
|
+ so do not just assume that we should use the MAP_DATA state. */
|
|
+ mapping_state_2 (subseg_text_p (now_seg) ? MAP_INSN : MAP_DATA, max_chars);
|
|
+ break;
|
|
case rs_align_code:
|
|
mapping_state_2 (MAP_INSN, max_chars);
|
|
break;
|
|
diff --git a/gas/testsuite/gas/aarch64/pr20364.d b/gas/testsuite/gas/aarch64/pr20364.d
|
|
new file mode 100644
|
|
index 0000000..babcff1
|
|
--- /dev/null
|
|
+++ b/gas/testsuite/gas/aarch64/pr20364.d
|
|
@@ -0,0 +1,13 @@
|
|
+# Check that ".align <size>, <fill>" does not set the mapping state to DATA, causing unnecessary frag generation.
|
|
+#name: PR20364
|
|
+#objdump: -d
|
|
+
|
|
+.*: file format .*
|
|
+
|
|
+Disassembly of section \.vectors:
|
|
+
|
|
+0+000 <.*>:
|
|
+ 0: d2800000 mov x0, #0x0 // #0
|
|
+ 4: 94000000 bl 0 <plat_report_exception>
|
|
+ 8: 17fffffe b 0 <bl1_exceptions>
|
|
+
|
|
diff --git a/gas/testsuite/gas/aarch64/pr20364.s b/gas/testsuite/gas/aarch64/pr20364.s
|
|
new file mode 100644
|
|
index 0000000..594ad7c
|
|
--- /dev/null
|
|
+++ b/gas/testsuite/gas/aarch64/pr20364.s
|
|
@@ -0,0 +1,28 @@
|
|
+ .macro vector_base label
|
|
+ .section .vectors, "ax"
|
|
+ .align 11, 0
|
|
+ \label:
|
|
+ .endm
|
|
+
|
|
+ .macro vector_entry label
|
|
+ .section .vectors, "ax"
|
|
+ .align 7, 0
|
|
+ \label:
|
|
+ .endm
|
|
+
|
|
+ .macro check_vector_size since
|
|
+ .if (. - \since) > (32 * 4)
|
|
+ .error "Vector exceeds 32 instructions"
|
|
+ .endif
|
|
+ .endm
|
|
+
|
|
+ .globl bl1_exceptions
|
|
+
|
|
+vector_base bl1_exceptions
|
|
+
|
|
+vector_entry SynchronousExceptionSP0
|
|
+ mov x0, #0x0
|
|
+ bl plat_report_exception
|
|
+ b SynchronousExceptionSP0
|
|
+ check_vector_size SynchronousExceptionSP0
|
|
+
|
|
--
|
|
1.7.1
|
|
|