The header logic for pulling in ELF defines mixes common ELF headers and

target specific headers.  In the Blackfin case, we always want to pull in
the bfin.h since most of the time, the common ELF headers do not have our
relocation defines.  This fixes building for mingw targets.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/elf2flt.c b/elf2flt.c
index 9b1ea37..a120cc9 100644 (file)
--- a/elf2flt.c
+++ b/elf2flt.c
@@ -62,12 +62,17 @@
 #include "cygwin-elf.h"        /* Cygwin uses a local copy */
 #elif defined(TARGET_microblaze)
 #include <elf/microblaze.h>    /* TARGET_* ELF support for the BFD library */
-#elif defined(TARGET_bfin)
-#include "elf/bfin.h"
 #else
 #include <elf.h>      /* TARGET_* ELF support for the BFD library            */
 #endif
 
+/* Always include Blackfin-specific defines in addition to common ELF stuff
+ * above as the common elf headers often do not have our relocs.
+ */
+#ifdef TARGET_bfin
+#include "elf/bfin.h"
+#endif
+
 #if defined(__MINGW32__)
 #include <getopt.h>
 #endif