From 7358942661ccb0ea1e819fd2f5d47914cebf0aa2 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 8 Oct 2018 08:44:50 +1030 Subject: [PATCH] ld insert_os_after ignoring first assignment Some time ago the pr19593 test was xfailed for alpha. This turned out to be the wrong course of action since the test exposed a bug in orphan section placement. On alpha, orphan sections were being inserted before ". = SIZEOF_HEADERS" due to the test having two assignments, and on alpha, an output section statement from -Ttext-segment being passed to ld. * ldlang.c (insert_os_after): Clear ignore_first on assignment to dot, not any assignment. Clear ignore_first on output section statement contents too. * testsuite/ld-elf/pr19539.d: Remove alpha xfail. --- ld/ChangeLog | 7 +++++++ ld/ldlang.c | 11 +++++++---- ld/testsuite/ld-elf/pr19539.d | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 7356c2b810..55efbbfb17 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2018-10-08 Alan Modra + + * ldlang.c (insert_os_after): Clear ignore_first on assignment to + dot, not any assignment. Clear ignore_first on output section + statement contents too. + * testsuite/ld-elf/pr19539.d: Remove alpha xfail. + 2018-10-08 Alan Modra * testsuite/ld-elf/pr22423.d: Pass --dynamic-linker to ld. diff --git a/ld/ldlang.c b/ld/ldlang.c index 1a27787193..0041f57116 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -1777,11 +1777,13 @@ insert_os_after (lang_output_section_statement_type *after) ass = &(*where)->assignment_statement; if (ass->exp->type.node_class != etree_assert && ass->exp->assign.dst[0] == '.' - && ass->exp->assign.dst[1] == 0 - && !ignore_first) - assign = where; + && ass->exp->assign.dst[1] == 0) + { + if (!ignore_first) + assign = where; + ignore_first = FALSE; + } } - ignore_first = FALSE; continue; case lang_wild_statement_enum: case lang_input_section_enum: @@ -1792,6 +1794,7 @@ insert_os_after (lang_output_section_statement_type *after) case lang_padding_statement_enum: case lang_constructors_statement_enum: assign = NULL; + ignore_first = FALSE; continue; case lang_output_section_statement_enum: if (assign != NULL) diff --git a/ld/testsuite/ld-elf/pr19539.d b/ld/testsuite/ld-elf/pr19539.d index 5153229ecf..04e6791406 100644 --- a/ld/testsuite/ld-elf/pr19539.d +++ b/ld/testsuite/ld-elf/pr19539.d @@ -3,7 +3,7 @@ #ld: -pie -T pr19539.t #readelf : --dyn-syms --wide #target: *-*-linux* *-*-gnu* *-*-solaris* arm*-*-uclinuxfdpiceabi -#xfail: cris*-*-* alpha-*-* +#xfail: cris*-*-* Symbol table '\.dynsym' contains [0-9]+ entr(y|ies): #pass