diff options
| -rw-r--r-- | gas/config/tc-mips.c | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/align-after-label.s | 3 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/micromips-align-after-label.d | 13 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/mips-align-after-label.d | 12 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/mips.exp | 2 |
5 files changed, 35 insertions, 0 deletions
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 077993c..e59021e 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -16262,6 +16262,8 @@ s_align (int x ATTRIBUTE_UNUSED) int temp, fill_value, *fill_ptr; long max_alignment = 28; + file_mips_check_options (); + /* o Note that the assembler pulls down any immediately preceding label to the aligned address. o It's not documented but auto alignment is reinstated by @@ -16286,6 +16288,9 @@ s_align (int x ATTRIBUTE_UNUSED) } else fill_ptr = 0; + + mips_mark_labels (); + if (temp) { segment_info_type *si = seg_info (now_seg); diff --git a/gas/testsuite/gas/mips/align-after-label.s b/gas/testsuite/gas/mips/align-after-label.s new file mode 100644 index 0000000..75e1c1b --- /dev/null +++ b/gas/testsuite/gas/mips/align-after-label.s @@ -0,0 +1,3 @@ +seg1: + .align 2 + ADDIU $0, $0, 1 diff --git a/gas/testsuite/gas/mips/micromips-align-after-label.d b/gas/testsuite/gas/mips/micromips-align-after-label.d new file mode 100644 index 0000000..9358b91 --- /dev/null +++ b/gas/testsuite/gas/mips/micromips-align-after-label.d @@ -0,0 +1,13 @@ +#objdump: -dr --show-raw-insn +#name: microMIPSr3 (align after label) +#as: -mips32r3 -32 -mmicromips -EB +#source: align-after-label.s + +.*: +file format .*mips.* + +Disassembly of section \.text: + +[0-9a-f]+ <seg1>: +[ 0-9a-f]+: 4c02 addiu zero,zero,1 +[ 0-9a-f]+: 0c00 nop +#pass diff --git a/gas/testsuite/gas/mips/mips-align-after-label.d b/gas/testsuite/gas/mips/mips-align-after-label.d new file mode 100644 index 0000000..8f3d40d --- /dev/null +++ b/gas/testsuite/gas/mips/mips-align-after-label.d @@ -0,0 +1,12 @@ +#objdump: -dr --show-raw-insn +#name: MIPS32r3 (align after label) +#as: -mips32r3 -32 -mno-micromips -EB +#source: align-after-label.s + +.*: +file format .*mips.* + +Disassembly of section \.text: + +[0-9a-f]+ <seg1>: +[ 0-9a-f]+: 24000001 li zero,1 +#pass diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp index fafed2d..e358c97 100644 --- a/gas/testsuite/gas/mips/mips.exp +++ b/gas/testsuite/gas/mips/mips.exp @@ -1518,6 +1518,8 @@ if { [istarget mips*-*-vxworks*] } { run_dump_test "align2" run_dump_test "align2-el" run_dump_test "align3" + run_dump_test "mips-align-after-label" + run_dump_test "micromips-align-after-label" run_dump_test "odd-float" run_dump_test "insn-opts" |