diff options
Diffstat (limited to 'gold/object.cc')
-rw-r--r-- | gold/object.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gold/object.cc b/gold/object.cc index 8c874fe..374340f 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -1862,7 +1862,10 @@ Sized_relobj_file<size, big_endian>::do_layout(Symbol_table* symtab, } if (!is_pass_two) - layout->layout_gnu_stack(seen_gnu_stack, gnu_stack_flags, this); + { + layout->merge_gnu_properties(this); + layout->layout_gnu_stack(seen_gnu_stack, gnu_stack_flags, this); + } // Handle the .eh_frame sections after the other sections. gold_assert(!is_pass_one || eh_frame_sections.empty()); |