summaryrefslogtreecommitdiffstats
path: root/contrib/elftoolchain
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2014-10-22 00:58:50 +0000
committermarcel <marcel@FreeBSD.org>2014-10-22 00:58:50 +0000
commit76382aeb894a5ee6019058513321db33e7aa8c58 (patch)
tree7921953c3f79c97d1c48558d831a6b4a9032e509 /contrib/elftoolchain
parent2ebe66c2905234e9e3b5057b47542a9b61d7144c (diff)
downloadFreeBSD-src-76382aeb894a5ee6019058513321db33e7aa8c58.zip
FreeBSD-src-76382aeb894a5ee6019058513321db33e7aa8c58.tar.gz
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.
Diffstat (limited to 'contrib/elftoolchain')
-rw-r--r--contrib/elftoolchain/libelf/libelf_align.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/elftoolchain/libelf/libelf_align.c b/contrib/elftoolchain/libelf/libelf_align.c
index 9550c5b..58a2adf 100644
--- a/contrib/elftoolchain/libelf/libelf_align.c
+++ b/contrib/elftoolchain/libelf/libelf_align.c
@@ -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),
OpenPOWER on IntegriCloud