mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
b660e9eb7a
Fix a host of problems related to adjustment of
symbol values and sizes when relaxing for avr.
1. Adjust symbol size first before adjusting symbol
value. Otherwise, a symbol whose value just got adjusted to the
relaxed address also ends up getting resized. See pr21404-1.s.
2. Reduce symbol sizes only if their span is below an
alignment boundary. Otherwise, the size gets decremented once when the
actual instruction is relaxed and padding bytes are added, and again
when the padding bytes are deleted (if padding ends up being unnecessary).
pr21404-2.s addresses that, and this bug is really the root cause of PR21404.
3. Adjust all symbol values before an alignment boundary.
Previous code did not adjust symbol values if they fell in the
would-be padded area, resulting in incorrect symbol values in some
cases (see pr21404-3.s).
4. Increase symbol sizes if alignment directives require so.
As pr21404-4.s shows
.global nonzero_sym
L1:
jmp L1
nonzero_sym:
nop
nop
.p2align 2
.size nonzero_sym, .-nonzero_sym
The two nops satisfy the 4 byte alignment at assembly time and
therefore the size of nonzero_sym is 4. Relaxation shortens
the 4 byte jmp to a 2 byte rjmp, and to satisfy 4 byte alignment
the code places 2 extra padding bytes after the nops, increasing
nonzero_sym's size by 2. This wasn't handled before.
If the assembly code does not have any align directives, then the
boundary is the section size, and symbol values and sizes == boundary
should also get adjusted. To handle that case, add a did_pad variable
and use that to determine whether it should use < boundary or <= boundary.
Also get rid of reloc_toaddr, which is now redundant. toaddr is now not
adjusted to handle the above case - the newly added
did_pad variable does the job.
pr21404-{5,6,7,8} are the same testcases written for local symbols, as
the code handles them slightly differently.
26 lines
656 B
ArmAsm
26 lines
656 B
ArmAsm
.file "pr21404.s"
|
|
.section .text,"ax",@progbits
|
|
.global size_before_align
|
|
.global size_after_align
|
|
.global main
|
|
.global nonzero_sym_before_align
|
|
.global nonzero_sym_after_align
|
|
.global nonzero_sym_after_end
|
|
main:
|
|
size_before_align:
|
|
size_after_align:
|
|
L1:
|
|
jmp L1
|
|
nonzero_sym_before_align:
|
|
nonzero_sym_after_align:
|
|
nonzero_sym_after_end:
|
|
jmp L1
|
|
.size size_before_align, .-size_before_align
|
|
.size nonzero_sym_before_align, .-nonzero_sym_before_align
|
|
.p2align 1
|
|
.size size_after_align, .-size_after_align
|
|
.size nonzero_sym_after_align, .-nonzero_sym_after_align
|
|
.word L1
|
|
.size main, .-main
|
|
.size nonzero_sym_after_end, .-nonzero_sym_after_end
|