diff options
| author |   Alan Modra <amodra@gmail.com> | 2018-08-26 14:23:38 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2018-08-26 22:45:59 +0930 |
| commit | 3d9c8f6b3f033a6092425b7344647fb51dbed5c6 (patch) | |
| tree | 20093232792f1e8061ef1a406c15505571294198 /ld/emultempl | |
| parent | Automatic date update in version.in (diff) | |
| download | binutils-gdb-3d9c8f6b3f033a6092425b7344647fb51dbed5c6.tar.gz binutils-gdb-3d9c8f6b3f033a6092425b7344647fb51dbed5c6.tar.bz2 binutils-gdb-3d9c8f6b3f033a6092425b7344647fb51dbed5c6.zip | |
Delay evaluation of alignment expressions in output sections
git commit 702d16713 broke expressions using CONSTANT(COMMONPAGESIZE)
in ALIGN or SUBALIGN of output section statements, because these
optional fields were evaluated at script parse time and the patch in
question delayed setting of config.commonpagesize. The right thing to
do is keep the tree representation of those fields for later
evaluation.
PR 23571
* ldlang.h (section_alignment): Make it an expression tree.
(subsection_alignment): Likewise.
* ldlang.c (topower): Delete.
(output_section_statement_newfunc): Adjust initialization.
(init_os): Evaluate section_alignment.
(lang_size_sections_1): Likewise.
(size_input_section): Evaluate subsection_alignment.
(lang_enter_output_section_statement): Don't evaluate here.
(lang_new_phdr): Use exp_get_vma rather than exp_get_value_int.
* ldexp.h (exp_get_value_int): Delete.
(exp_get_power): Declare.
* ldexp.c (exp_get_value_int): Delete.
(exp_get_power): New function.
* emultempl/pe.em (place_orphan): Build expression for section
alignment.
* emultempl/pep.em (place_orphan): Likewise.
* testsuite/ld-scripts/pr23571.d,
* testsuite/ld-scripts/pr23571.t: New test.
* testsuite/ld-scripts/align.exp: Run it.
Diffstat (limited to 'ld/emultempl')
| -rw-r--r-- | ld/emultempl/pe.em | 2 | ||||
| -rw-r--r-- | ld/emultempl/pep.em | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index 463b85481d8..663d4ce8620 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -2165,7 +2165,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s, &add_child); if (bfd_link_relocatable (&link_info)) { - os->section_alignment = s->alignment_power; + os->section_alignment = exp_intop (1U << s->alignment_power); os->bfd_section->alignment_power = s->alignment_power; } } diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em index 1a7394ea465..1dc1664f985 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em @@ -1962,7 +1962,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s, &add_child); if (bfd_link_relocatable (&link_info)) { - os->section_alignment = s->alignment_power; + os->section_alignment = exp_intop (1U << s->alignment_power); os->bfd_section->alignment_power = s->alignment_power; } } |