diff options
| author | dim <dim@FreeBSD.org> | 2010-10-25 19:33:45 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-10-25 19:33:45 +0000 |
| commit | 6582686305de16b3784e4e34cf5ef47268efc9c0 (patch) | |
| tree | 4cb70c2d4c23aaf373727fbf0542801a56096d78 /contrib/binutils/ld | |
| parent | 926cfb4a95c17eb94dffaeb1c87829c00ca24f75 (diff) | |
| download | FreeBSD-src-6582686305de16b3784e4e34cf5ef47268efc9c0.zip FreeBSD-src-6582686305de16b3784e4e34cf5ef47268efc9c0.tar.gz | |
Apply commit d3a5e914c6ff07c426b026b0cda8d044fd1cdabe from upstream
(still under GPLv2 at that time):
Author: Nick Clifton <nickc@redhat.com>
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.
Diffstat (limited to 'contrib/binutils/ld')
| -rw-r--r-- | contrib/binutils/ld/ldlang.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |
