From 468fec38d7187174ef2e8fa96016284d75a080db Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser@BitWagon.com>
Date: Wed, 30 Jan 2013 13:31:35 -0800
Subject: [PATCH] Fix .e_ident[EI_OSABI] for Debian armhf.

---
 src/p_lx_elf.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index ca468734..cef0a5fc 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -2108,6 +2108,9 @@ void PackLinuxElf32armLe::pack1(OutputFile *fo, Filter &ft)
     else {
         memcpy(&h3, stub_arm_linux_elf_fold,        sizeof(Elf32_Ehdr) + 2*sizeof(Elf32_Phdr));
     }
+    // Fighting over .e_ident[EI_ABIVERSION]: Debian armhf is latest culprit.
+    // So copy from input to output; but see PackLinuxElf32::generateElfHdr
+    memcpy(&h3.ehdr.e_ident, &ehdri.e_ident, sizeof(ehdri.e_ident));
     set_te32(&h3.ehdr.e_flags, e_flags);
     generateElfHdr(fo, &h3, getbrk(phdri, e_phnum) );
 }