diff options
| author | Renato Botelho <renato@netgate.com> | 2018-05-18 14:53:44 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2018-05-18 14:53:44 -0300 |
| commit | 64f021cd075bbcb3042539dcebc63e7d335ec2c0 (patch) | |
| tree | 1a64375406a7b5976f98eaf4cf19f00cf2931dd1 /contrib/elftoolchain/elfcopy/segments.c | |
| parent | 8f29f1de284afe0ec8987780d5404a3e1a31712a (diff) | |
| parent | eb64daea863b1fe3320e10c6c72cbfe7e9ce967b (diff) | |
| download | FreeBSD-src-64f021cd075bbcb3042539dcebc63e7d335ec2c0.zip FreeBSD-src-64f021cd075bbcb3042539dcebc63e7d335ec2c0.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'contrib/elftoolchain/elfcopy/segments.c')
| -rw-r--r-- | contrib/elftoolchain/elfcopy/segments.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/elftoolchain/elfcopy/segments.c b/contrib/elftoolchain/elfcopy/segments.c index 9a26bba..27d5e7a 100644 --- a/contrib/elftoolchain/elfcopy/segments.c +++ b/contrib/elftoolchain/elfcopy/segments.c @@ -79,6 +79,8 @@ add_to_inseg_list(struct elfcopy *ecp, struct section *s) continue; if (s->vma + s->sz > seg->vaddr + seg->msz) continue; + if (seg->type == PT_TLS && ((s->flags & SHF_TLS) == 0)) + continue; insert_to_inseg_list(seg, s); if (seg->type == PT_LOAD) |
