From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 16 May 2020 15:58:42 +0000 (-0700)
Subject: multilib_header_wrapper: Drop using __MHWORDSIZE
X-Git-Tag: uninative-2.9~787
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3a6ba47ede9b1d66f6cb58a776255047a5d069ab;p=openembedded-core.git

multilib_header_wrapper: Drop using __MHWORDSIZE

This is not needed as __WORDSIZE already represents same value and is
directly defined in wordsize.h, this simplifies the multlib headers

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/multilib_header_wrapper.h b/scripts/multilib_header_wrapper.h
index df01b56a72..88f3193812 100644
--- a/scripts/multilib_header_wrapper.h
+++ b/scripts/multilib_header_wrapper.h
@@ -5,22 +5,9 @@
  * 
  */
 
-#if defined (__arm__)
-#define __MHWORDSIZE			32
-#elif defined (__aarch64__) && defined ( __LP64__)
-#define __MHWORDSIZE			64
-#elif defined (__aarch64__)
-#define __MHWORDSIZE			32
-#else
 #include <bits/wordsize.h>
-#if defined (__WORDSIZE)
-#define __MHWORDSIZE			__WORDSIZE
-#else
-#error "__WORDSIZE is not defined"
-#endif
-#endif
 
-#if __MHWORDSIZE == 32
+#if __WORDSIZE == 32
 
 #ifdef _MIPS_SIM
 
@@ -36,7 +23,7 @@
 #include <ENTER_HEADER_FILENAME_HERE-32.h>
 #endif
 
-#elif __MHWORDSIZE == 64
+#elif __WORDSIZE == 64
 #include <ENTER_HEADER_FILENAME_HERE-64.h>
 #else
 #error "Unknown __WORDSIZE detected"