svn commit: r273442 - head/contrib/elftoolchain/libelf

[Marcel Moolenaar]

Author: marcel
Date: Wed Oct 22 00:58:50 2014
New Revision: 273442
URL: https://svnweb.freebsd.org/changeset/base/273442

Log:
  GCC for PowerPC does not align  .note sections to 4 bytes.  When
  running ctfmerge on its objects, libelf asserts as it expects
  .note sections to be 4-byte aligned.  Change that expectation.
  
  Approved by:	jkoshy@
  Obtained from:	Juniper Networks, Inc.

Modified:
  head/contrib/elftoolchain/libelf/libelf_align.c

Modified: head/contrib/elftoolchain/libelf/libelf_align.c
==============================================================================
--- head/contrib/elftoolchain/libelf/libelf_align.c	Wed Oct 22 00:23:43 2014	(r273441)
+++ head/contrib/elftoolchain/libelf/libelf_align.c	Wed Oct 22 00:58:50 2014	(r273442)
@@ -109,7 +109,7 @@ static struct align falign[ELF_T_NUM] = 
 	[ELF_T_LWORD]	= FALIGN(8,8),
 	[ELF_T_MOVE]	= FALIGN(8,8),
 	[ELF_T_MOVEP] 	= UNSUPPORTED(),
-	[ELF_T_NOTE]	= FALIGN(4,4),
+	[ELF_T_NOTE]	= FALIGN(1,1),
 	[ELF_T_OFF]	= FALIGN(4,8),
 	[ELF_T_PHDR]	= FALIGN(4,8),
 	[ELF_T_REL]	= FALIGN(4,8),