37c37
< ELFTC_VCSID("$Id: segments.c 3269 2015-12-11 18:38:43Z kaiwang27 $");
---
> ELFTC_VCSID("$Id: segments.c 3397 2016-02-12 14:35:19Z emaste $");
110c110
< if (!s->loadable || s->seg == NULL)
---
> if (!s->loadable)
114c114
< if (ecp->change_addr != 0)
---
> if (ecp->change_addr != 0 && s->seg != NULL)
138c138,141
< /* Only adjust loadable section's LMA. */
---
> /*
> * Only loadable section that's inside a segment can have
> * LMA adjusted.
> */
176c179
< (uintmax_t) lma, s->name, s->align);
---
> (uintmax_t) lma, s->name, (uintmax_t) s->align);
217c220,221
< s->name, seg->addr, seg->addr + seg->msz);
---
> s->name, (uintmax_t) seg->addr,
> (uintmax_t) (seg->addr + seg->msz));
488c492
< err(EXIT_FAILURE, "gelf_update_phdr failed :%s",
---
> errx(EXIT_FAILURE, "gelf_update_phdr failed: %s",