From 421f8526637845da72bc7f044303e7d72b80f0c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Fri, 26 Aug 2022 12:08:09 +0200
Subject: Use __WORDSIZE instead of BFD_HOST_64BIT_LONG to verify the
 conformity of architecture.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This resolves FTBFS with binutils >= 2.39 on amd64.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7671e683909a3d8dbabab6584f7bcddc983b6831)
---
 src/libr-bfd.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libr-bfd.h b/src/libr-bfd.h
index 7b6ea3e..9fae8f5 100644
--- a/src/libr-bfd.h
+++ b/src/libr-bfd.h
@@ -7,11 +7,12 @@
 #include <stdint.h>
 #include <bfd.h>
 
-#if BFD_HOST_64BIT_LONG
+#if (__WORDSIZE == 64)
 	#if defined(__i386)
 		#error "Using incorrect binutils header file for architecture."
 	#endif
-#else
+#endif
+#if (__WORDSIZE == 32)
 	#if defined(__amd64)
 		#error "Using incorrect binutils header file for architecture."
 	#endif
-- 
cgit v1.2.1