From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 25 Jan 2017 08:00:50 +0000 (+0000)
Subject: [efi] Fix building elf2efi.c when -fpic is enabled by default
X-Git-Tag: v1.20.1~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=941c53a3bf0f0c1c276996e2a68b0fa6263ce410;p=thirdparty%2Fipxe.git

[efi] Fix building elf2efi.c when -fpic is enabled by default

The x86_64 EDK2 headers include a #pragma to mark all subsequent
symbol declarations and references as hidden if position-independent
code is being generated.  Since libgen.h is currently included only
after the EDK2 headers, this results in __xpg_basename() being
erroneously marked as having hidden visibility (if the compiler
defaults to building position-independent code); this eventually
results in a failure to link the elf2efi binary.

Fix by including libgen.h prior to including the EDK2 headers.

Originally-fixed-by: Doug Goldstein <cardoe@cardoe.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/util/elf2efi.c b/src/util/elf2efi.c
index 152bf5333..27f37d98a 100644
--- a/src/util/elf2efi.c
+++ b/src/util/elf2efi.c
@@ -32,9 +32,9 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <elf.h>
+#include <libgen.h>
 #include <ipxe/efi/Uefi.h>
 #include <ipxe/efi/IndustryStandard/PeImage.h>
-#include <libgen.h>
 
 #define eprintf(...) fprintf ( stderr, __VA_ARGS__ )