summaryrefslogtreecommitdiff
path: root/ld/ldlang.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2011-05-23 05:40:59 +0000
committerAlan Modra <amodra@bigpond.net.au>2011-05-23 05:40:59 +0000
commitef88e8e245a8d61afbe17fe8d9b02b3a11f4e197 (patch)
treecb77e7be36bdc1d730574578f3c3fa7fa4b2b3f7 /ld/ldlang.c
parentf30faf81057393bb5121622ea25820391d6a20b6 (diff)
downloadbinutils-redhat-ef88e8e245a8d61afbe17fe8d9b02b3a11f4e197.tar.gz
PR 12763
bfd/ * elf.c (assign_file_positions_for_load_sections): Set sh_offset for .tbss, and page align same for all SHT_NOBITS sections. ld/ * ldlang.c (lang_output_section_find_by_flags): Match orphan .sdata2 like sections to existing .sdata2, and similarly for orphan TLS sections. * emultempl/elf32.em (place_orphan): Exclude .tbss from orphan_bss.
Diffstat (limited to 'ld/ldlang.c')
-rw-r--r--ld/ldlang.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 5ccb36f514..7cf5108e47 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1579,8 +1579,14 @@ lang_output_section_find_by_flags (const asection *sec,
}
flags ^= sec->flags;
if (!(flags & (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD
- | SEC_READONLY))
- && !(look->flags & (SEC_SMALL_DATA | SEC_THREAD_LOCAL)))
+ | SEC_READONLY | SEC_SMALL_DATA))
+ || (!(flags & (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD
+ | SEC_READONLY))
+ && !(look->flags & SEC_SMALL_DATA))
+ || (!(flags & (SEC_THREAD_LOCAL | SEC_ALLOC))
+ && (look->flags & SEC_THREAD_LOCAL)
+ && (!(flags & SEC_LOAD)
+ || (look->flags & SEC_LOAD))))
found = look;
}
}