Răsfoiți Sursa

Merge topic 'cmELF-use-KWIML'

d462ac27 cmELF: Use KWIML ABI.h header to get endian-ness
Brad King 10 ani în urmă
părinte
comite
fc6c5074e8
1 a modificat fișierele cu 3 adăugiri și 4 ștergeri
  1. 3 4
      Source/cmELF.cxx

+ 3 - 4
Source/cmELF.cxx

@@ -16,8 +16,7 @@
 #include <cmsys/FStream.hxx>
 #include <cmsys/FStream.hxx>
 
 
 // Need the native byte order of the running CPU.
 // Need the native byte order of the running CPU.
-#define cmsys_CPU_UNKNOWN_OKAY // We can decide at runtime if not known.
-#include <cmsys/CPU.h>
+#include <cmIML/ABI.h>
 
 
 // Include the ELF format information system header.
 // Include the ELF format information system header.
 #if defined(__OpenBSD__)
 #if defined(__OpenBSD__)
@@ -102,9 +101,9 @@ public:
     // In most cases the processor-specific byte order will match that
     // In most cases the processor-specific byte order will match that
     // of the target execution environment.  If we choose wrong here
     // of the target execution environment.  If we choose wrong here
     // it is fixed when the header is read.
     // it is fixed when the header is read.
-#if cmsys_CPU_ENDIAN_ID == cmsys_CPU_ENDIAN_ID_LITTLE
+#if cmIML_ABI_ENDIAN_ID == cmIML_ABI_ENDIAN_ID_LITTLE
     this->NeedSwap = (this->ByteOrder == ByteOrderMSB);
     this->NeedSwap = (this->ByteOrder == ByteOrderMSB);
-#elif cmsys_CPU_ENDIAN_ID == cmsys_CPU_ENDIAN_ID_BIG
+#elif cmIML_ABI_ENDIAN_ID == cmIML_ABI_ENDIAN_ID_BIG
     this->NeedSwap = (this->ByteOrder == ByteOrderLSB);
     this->NeedSwap = (this->ByteOrder == ByteOrderLSB);
 #else
 #else
     this->NeedSwap = false; // Final decision is at runtime anyway.
     this->NeedSwap = false; // Final decision is at runtime anyway.