diff --git a/elf/elffile.cpp b/elf/elffile.cpp --- a/elf/elffile.cpp +++ b/elf/elffile.cpp @@ -381,26 +381,30 @@ QString elfresolveMachine(Elf64_Half e_m case EM_XTENSA: machineName = " Tensilica Xtensa Architecture "; break; -#ifdef EM_AARCH64 +#ifndef EM_AARCH64 + #define EM_AARCH64 183 +#endif case EM_AARCH64: machineName = " ARM AARCH64 "; break; +#ifndef EM_TILEPRO + #define EM_TILEPRO 188 #endif -#ifdef EM_TILEPRO case EM_TILEPRO: machineName = " Tilera TILEPro "; break; +#ifndef EM_MICROBLAZE + #define EM_MICROBLAZE 189 #endif -#ifdef EM_MICROBLAZE case EM_MICROBLAZE: machineName = " Xilinx MicroBlaze "; break; +#ifndef EM_TILEGX + #define EM_TILEGX 191 #endif -#ifdef EM_TILEGX case EM_TILEGX: machineName = " Tilera TILE-Gx "; break; -#endif case EM_NUM: machineName = ""; break; @@ -497,9 +501,10 @@ QString ElfFile::getABI() if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_TRU64)return "Compaq TRU64 UNIX"; if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_MODESTO)return " Novell Modesto"; if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_OPENBSD)return "OpenBSD"; -#ifdef ELFOSABI_ARM_AEABI +#ifndef ELFOSABI_ARM_AEABI + #define ELFOSABI_ARM_AEABI 64 +#endif if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_ARM_AEABI)return "ARM EABI"; -#endif if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_ARM)return "ARM"; if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_STANDALONE)return "Standalone (embedded) application"; } diff --git a/elf/elfparser.cpp b/elf/elfparser.cpp --- a/elf/elfparser.cpp +++ b/elf/elfparser.cpp @@ -163,9 +163,10 @@ QString elfparser::getABI() if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_TRU64)return "Compaq TRU64 UNIX"; if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_MODESTO)return " Novell Modesto"; if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_OPENBSD)return "OpenBSD"; -#ifdef ELFOSABI_ARM_AEABI +#ifndef ELFOSABI_ARM_AEABI + #define ELFOSABI_ARM_AEABI 64 +#endif if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_ARM_AEABI)return "ARM EABI"; -#endif if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_ARM)return "ARM"; if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_STANDALONE)return "Standalone (embedded) application"; }