From 6582686305de16b3784e4e34cf5ef47268efc9c0 Mon Sep 17 00:00:00 2001 From: dim Date: Mon, 25 Oct 2010 19:33:45 +0000 Subject: Apply commit d3a5e914c6ff07c426b026b0cda8d044fd1cdabe from upstream (still under GPLv2 at that time): Author: Nick Clifton Date: Thu Aug 24 14:59:24 2006 +0000 * ldlang.c (lang_size_sections_1, lang_assignment_statement_enum): Adjust the current address of DEFAULT_MEMORY_REGION even when dot hasn't changed. This is a prerequisite for the fix coming just after this. --- contrib/binutils/ld/ldlang.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/binutils/ld') diff --git a/contrib/binutils/ld/ldlang.c b/contrib/binutils/ld/ldlang.c index b35ae5e..761be6f 100644 --- a/contrib/binutils/ld/ldlang.c +++ b/contrib/binutils/ld/ldlang.c @@ -4447,7 +4447,7 @@ lang_size_sections_1 output_section_statement->bfd_section, &newdot); - if (newdot != dot && !output_section_statement->ignored) + if (!output_section_statement->ignored) { if (output_section_statement == abs_output_section) { @@ -4456,7 +4456,7 @@ lang_size_sections_1 lang_memory_region_lookup (DEFAULT_MEMORY_REGION, FALSE)->current = newdot; } - else + else if (newdot != dot) { /* Insert a pad after this statement. We can't put the pad before when relaxing, in case the -- cgit v1.1