D2292.id4827.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2292.id4827.diff
View Options

	Index: elfcopy/sections.c
	===================================================================
	--- elfcopy/sections.c
	+++ elfcopy/sections.c
	@@ -765,6 +765,43 @@
	elf_errmsg(-1));
	}

	+static int
	+section_type_alignment(int sht, int class)
	+{
	+ switch (sht)
	+ {
	+ case SHT_DYNAMIC:
	+ case SHT_DYNSYM:
	+ case SHT_FINI_ARRAY:
	+ case SHT_GNU_HASH:
	+ case SHT_INIT_ARRAY:
	+ case SHT_PREINIT_ARRAY:
	+ case SHT_REL:
	+ case SHT_RELA:
	+ case SHT_SYMTAB:
	+ return (class == ELFCLASS64 ? 8 : 4);
	+ case SHT_SUNW_move:
	+ return (8);
	+ case SHT_GNU_LIBLIST:
	+ case SHT_GROUP:
	+ case SHT_HASH:
	+ case SHT_NOTE:
	+ case SHT_SUNW_verdef: /* == SHT_GNU_verdef */
	+ case SHT_SUNW_verneed: /* == SHT_GNU_verneed */
	+ case SHT_SYMTAB_SHNDX:
	+ return (4);
	+ case SHT_SUNW_syminfo:
	+ case SHT_SUNW_versym: /* == SHT_GNU_versym */
	+ return (2);
	+ case SHT_NOBITS:
	+ case SHT_PROGBITS:
	+ case SHT_STRTAB:
	+ case SHT_SUNW_dof:
	+ return (1);
	+ }
	+ return (1);
	+}
	+
	void
	resync_sections(struct elfcopy *ecp)
	{
	@@ -772,6 +809,7 @@
	GElf_Shdr osh;
	uint64_t off;
	int first;
	+ int min_alignment;

	ps = NULL;
	first = 1;
	@@ -794,6 +832,12 @@
	/* Align section offset. */
	if (s->align == 0)
	s->align = 1;
	+ min_alignment = section_type_alignment(s->type, ecp->oec);
	+ if (s->align < INT_MAX && (int)s->align < min_alignment) {
	+ warnx("section %s alignment %d increased to %d",
	+ s->name, (int)s->align, min_alignment);
	+ s->align = min_alignment;
	+ }
	if (off <= s->off) {
	if (!s->loadable)
	s->off = roundup(off, s->align);