Changes in kernel/generic/include/lib/elf.h [a8bb38c:666f492] in mainline

File:

• kernel/generic/include/lib/elf.h (modified) (8 diffs)

kernel/generic/include/lib/elf.h

@@ -106 +106 @@
 #define ELFDATA2LSB  1  /* Least significant byte first (little endian) */
 #define ELFDATA2MSB  2  /* Most signigicant byte first (big endian) */
+
+/**
+ * ELF error return codes
+ */
+#define EE_OK             0  /* No error */
+#define EE_INVALID        1  /* Invalid ELF image */
+#define EE_MEMORY         2  /* Cannot allocate address space */
+#define EE_INCOMPATIBLE   3  /* ELF image is not compatible with current architecture */
+#define EE_UNSUPPORTED    4  /* Non-supported ELF (e.g. dynamic ELFs) */
+#define EE_LOADER         5  /* The image is actually a program loader */
+#define EE_IRRECOVERABLE  6
 
 /**
@@ -138 +149 @@
 #define SHF_MASKPROC   0xf0000000
 
-/** Macros for decomposing elf_symbol.st_info into binging and type */
-#define ELF_ST_BIND(i)     ((i) >> 4)
-#define ELF_ST_TYPE(i)     ((i) & 0x0f)
-#define ELF_ST_INFO(b, t)  (((b) << 4) + ((t) & 0x0f))
-
 /**
  * Symbol binding
@@ -189 +195 @@
  * ELF object file specifications. They are the only types used
  * in ELF header.
+ *
  */
 typedef uint64_t elf_xword;
@@ -200 +207 @@
  *
  * These types are specific for 32-bit format.
+ *
  */
 typedef uint32_t elf32_addr;
@@ -208 +216 @@
  *
  * These types are specific for 64-bit format.
+ *
  */
 typedef uint64_t elf64_addr;
@@ -323 +332 @@
 };
 
-/*
- * ELF note segment entry
- */
-struct elf32_note {
-        elf_word namesz;
-        elf_word descsz;
-        elf_word type;
-};
-
-/*
- * NOTE: namesz, descsz and type should be 64-bits wide (elf_xword)
- * per the 64-bit ELF spec. The Linux kernel however screws up and
- * defines them as Elf64_Word, which is 32-bits wide(!). We are trying
- * to make our core files compatible with Linux GDB target so we copy
- * the blunder here.
- */
-struct elf64_note {
-        elf_word namesz;
-        elf_word descsz;
-        elf_word type;
-};
-
 #ifdef __32_BITS__
 typedef struct elf32_header elf_header_t;
@@ -350 +337 @@
 typedef struct elf32_section_header elf_section_header_t;
 typedef struct elf32_symbol elf_symbol_t;
-typedef struct elf32_note elf_note_t;
 #endif
 
@@ -358 +344 @@
 typedef struct elf64_section_header elf_section_header_t;
 typedef struct elf64_symbol elf_symbol_t;
-typedef struct elf64_note elf_note_t;
 #endif
+
+extern const char *elf_error(unsigned int rc);
 
 /** Interpreter string used to recognize the program loader */