diff options
| author | Brad King <brad.king@kitware.com> | 2015-12-10 14:30:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-12-10 14:30:14 (GMT) |
| commit | fc6c5074e800fb7fe3f829564d7a7e284133cdd9 (patch) | |
| tree | 63f29d739bb4032360f0d6151c7b2d32c24ff797 | |
| parent | a657b324822b5bd549706b337a74fa3bfd7bc1c6 (diff) | |
| parent | d462ac27d814e966c54bb638444e4b125d1d665f (diff) | |
| download | CMake-fc6c5074e800fb7fe3f829564d7a7e284133cdd9.zip CMake-fc6c5074e800fb7fe3f829564d7a7e284133cdd9.tar.gz CMake-fc6c5074e800fb7fe3f829564d7a7e284133cdd9.tar.bz2 | |
Merge topic 'cmELF-use-KWIML'
d462ac27 cmELF: Use KWIML ABI.h header to get endian-ness
| -rw-r--r-- | Source/cmELF.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 37dd328..fda6e02 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -16,8 +16,7 @@ #include <cmsys/FStream.hxx> // 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. #if defined(__OpenBSD__) @@ -102,9 +101,9 @@ public: // In most cases the processor-specific byte order will match that // of the target execution environment. If we choose wrong here // 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); -#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); #else this->NeedSwap = false; // Final decision is at runtime anyway. |