diff options
Diffstat (limited to 'gas/config/tc-aarch64.c')
| -rw-r--r-- | gas/config/tc-aarch64.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index dec50c75..646deb6 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -1858,10 +1858,9 @@ s_aarch64_inst (int ignored ATTRIBUTE_UNUSED) /* Sections are assumed to start aligned. In executable section, there is no MAP_DATA symbol pending. So we only align the address during MAP_DATA --> MAP_INSN transition. - For other sections, this is not guaranteed, align it anyway. */ + For other sections, this is not guaranteed. */ enum mstate mapstate = seg_info (now_seg)->tc_segment_info_data.mapstate; - if (!need_pass_2 && ((subseg_text_p (now_seg) && mapstate == MAP_DATA) - || !subseg_text_p (now_seg))) + if (!need_pass_2 && subseg_text_p (now_seg) && mapstate == MAP_DATA) frag_align_code (2, 0); #ifdef OBJ_ELF @@ -5690,6 +5689,14 @@ md_assemble (char *str) init_operand_error_report (); + /* Sections are assumed to start aligned. In executable section, there is no + MAP_DATA symbol pending. So we only align the address during + MAP_DATA --> MAP_INSN transition. + For other sections, this is not guaranteed. */ + enum mstate mapstate = seg_info (now_seg)->tc_segment_info_data.mapstate; + if (!need_pass_2 && subseg_text_p (now_seg) && mapstate == MAP_DATA) + frag_align_code (2, 0); + saved_cond = inst.cond; reset_aarch64_instruction (&inst); inst.cond = saved_cond; @@ -5705,15 +5712,6 @@ md_assemble (char *str) dump_opcode_operands (opcode); #endif /* DEBUG_AARCH64 */ - /* Sections are assumed to start aligned. In executable section, there is no - MAP_DATA symbol pending. So we only align the address during - MAP_DATA --> MAP_INSN transition. - For other sections, this is not guaranteed, align it anyway. */ - enum mstate mapstate = seg_info (now_seg)->tc_segment_info_data.mapstate; - if (!need_pass_2 && ((subseg_text_p (now_seg) && mapstate == MAP_DATA) - || !subseg_text_p (now_seg))) - frag_align_code (2, 0); - mapping_state (MAP_INSN); inst_base = &inst.base; |