From: Seth R Johnson <johnsonsr@ornl.gov>
Date: Thu, 14 Nov 2019 12:26:41 +0000 (-0500)
Subject: Fix ELF detection on Intel compilers
X-Git-Tag: 0.11.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c85d828a1abdd698f8a587abe8cbbaaa80eade8;p=thirdparty%2Flibbsd.git

Fix ELF detection on Intel compilers

The Intel compiler does not define __amd64__ on x86_64 platforms;
instead, like other compilers, it defines __x86_64__ .

Closes: !8
Signed-off-by: Guillem Jover <guillem@hadrons.org>
---

diff --git a/src/local-elf.h b/src/local-elf.h
index f784b12..98a2962 100644
--- a/src/local-elf.h
+++ b/src/local-elf.h
@@ -45,7 +45,7 @@
 #define ELF_TARG_CLASS	ELFCLASS64
 #define ELF_TARG_DATA	ELFDATA2LSB
 
-#elif defined(__amd64__)
+#elif defined(__amd64__) || defined(__x86_64__)
 
 #define ELF_TARG_MACH	EM_X86_64
 #if defined(__ILP32__)