HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r49:d9c54528bd30

Fixed Win32 build but lppmonplot python wrapper still broken!

Jeandet Alexis -

r49:d9c54528bd30 Win32 build Ok default

parent child

Context file:

r49:d9c54528bd30

src/common/elf/elffile.cpp +2 -2

             ----------------------------------------------------------------------------*/
             #include "elffile.h"
             #include "srec/srecfile.h"
+            #include <stdint.h>
             ElfFile::ElfFile()
                 :abstractBinFile()
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_SYSV)return "Alias";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_HPUX)return "HP-UX";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_NETBSD)return "NetBSD";
-                    if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_GNU)return "Object uses GNU ELF extensions";
+                    if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_LINUX)return "Object uses GNU ELF extensions";
-                    if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_LINUX)return "Compatibility alias";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_SOLARIS)return "Sun Solaris";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_AIX)return "IBM AIX";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_IRIX)return "SGI Irix";

src/common/elf/elfparser.cpp +1 -2

                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_SYSV)return "Alias";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_HPUX)return "HP-UX";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_NETBSD)return "NetBSD";
-                    if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_GNU)return "Object uses GNU ELF extensions";
+                    if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_LINUX)return "Object uses GNU ELF extensions";
-                    if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_LINUX)return "Compatibility alias";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_SOLARIS)return "Sun Solaris";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_AIX)return "IBM AIX";
                     if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_IRIX)return "SGI Irix";

src/common/elf/libelfWin32/include/libelf/elf_repl.h +8 -2

             #define ELFOSABI_NSK		14	/* Hewlett-Packard Non-Stop Kernel */
             #define ELFOSABI_AROS	 	15 	/* Amiga Research OS */
             /* these are probably obsolete: */
+            #define ELFOSABI_ARM_AEABI	64	/* ARM EABI */
             #define ELFOSABI_ARM		97	/* ARM */
             #define ELFOSABI_STANDALONE	255	/* standalone (embedded) application */
             #define EM_RH32		38	/* TRW RH-32 */
             #define EM_RCE		39	/* Motorola RCE */
             #define EM_ARM		40	/* Advanced RISC Machines ARM */
-            #define EM_ALPHA	41	/* Digital Alpha */
+            #define EM_FAKE_ALPHA	41	/* Digital Alpha */
             #define EM_SH		42	/* Hitachi SH */
             #define EM_SPARCV9	43	/* SPARC Version 9 */
             #define EM_TRICORE	44	/* Siemens TriCore embedded processor */
             #define EM_SEP 		108 	/* Sharp embedded microprocessor */
             #define EM_ARCA 	109 	/* Arca RISC Microprocessor */
             #define EM_UNICORE 	110 	/* Microprocessor series from PKU-Unity Ltd. and MPRC of Peking University */
-            #define EM_NUM		111
+            #define EM_AARCH64	183		/* ARM AARCH64 */
+            #define EM_TILEPRO	188		/* Tilera TILEPro */
+            #define EM_MICROBLAZE	189		/* Xilinx MicroBlaze */
+            #define EM_TILEGX	191		/* Tilera TILE-Gx */
+            #define EM_NUM		192
             /*
              * e_ident[EI_VERSION], e_version

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages