From 15445c8e19dfaa3762e42c3d78f93f832b700b1b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 19 Dec 2005 15:06:40 +0000 Subject: [PATCH] 2005-12-19 H.J. Lu PR ld/2065 * ldlang.c (output_statement_newfunc): Revert the change made on 2005-11-16. (output_prev_sec_find): Likewsise. * ldlang.h (lang_statement_list_type): Likewsise. --- ld/ChangeLog | 8 ++++++++ ld/ldlang.c | 11 +++++++---- ld/ldlang.h | 1 - 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index bd68c9d..52fd1d5 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2005-12-19 H.J. Lu + + PR ld/2065 + * ldlang.c (output_statement_newfunc): Revert the change made on + 2005-11-16. + (output_prev_sec_find): Likewsise. + * ldlang.h (lang_statement_list_type): Likewsise. + 2005-12-16 Nathan Sidwell Second part of ms1 to mt renaming. diff --git a/ld/ldlang.c b/ld/ldlang.c index 0e72ab8..8ef48d1 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -912,8 +912,6 @@ output_statement_newfunc (struct bfd_hash_entry *entry, (lang_statement_union_type *) &ret->os, &ret->os.header.next); - ret->os.prev = &((*lang_output_section_statement.tail) - ->output_section_statement); /* GCC's strict aliasing rules prevent us from just casting the address, so we store the pointer in a variable and cast that instead. */ @@ -1292,15 +1290,20 @@ lang_output_section_find_by_flags (const asection *sec, static asection * output_prev_sec_find (lang_output_section_statement_type *os) { + asection *s = (asection *) NULL; lang_output_section_statement_type *lookup; - for (lookup = os->prev; lookup != NULL; lookup = lookup->prev) + for (lookup = &lang_output_section_statement.head->output_section_statement; + lookup != NULL; + lookup = lookup->next) { if (lookup->constraint == -1) continue; + if (lookup == os) + return s; if (lookup->bfd_section != NULL && lookup->bfd_section->owner != NULL) - return lookup->bfd_section; + s = lookup->bfd_section; } return NULL; diff --git a/ld/ldlang.h b/ld/ldlang.h index cf5b01f..381bb04 100644 --- a/ld/ldlang.h +++ b/ld/ldlang.h @@ -130,7 +130,6 @@ typedef struct lang_output_section_statement_struct lang_statement_header_type header; lang_statement_list_type children; struct lang_output_section_statement_struct *next; - struct lang_output_section_statement_struct *prev; const char *name; asection *bfd_section; lang_memory_region_type *region; -- 2.7.4