Changeset 888a2c6 in mainline

Timestamp:

2018-05-02T19:48:42Z (8 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

66262a1b

Parents:

6e33c2f

Message:

Ignore GNU program headers.

Files:

• abi/include/abi/elf.h (modified) (1 diff)
• uspace/lib/c/generic/elf/elf_mod.c (modified) (1 diff)

abi/include/abi/elf.h

@@ -167 +167 @@
  * Program segment types
  */
-#define PT_NULL     0
-#define PT_LOAD     1
-#define PT_DYNAMIC  2
-#define PT_INTERP   3
-#define PT_NOTE     4
-#define PT_SHLIB    5
-#define PT_PHDR     6
-#define PT_TLS      7
-#define PT_LOPROC   0x70000000
-#define PT_HIPROC   0x7fffffff
+#define PT_NULL          0
+#define PT_LOAD          1
+#define PT_DYNAMIC       2
+#define PT_INTERP        3
+#define PT_NOTE          4
+#define PT_SHLIB         5
+#define PT_PHDR          6
+#define PT_TLS           7
+#define PT_LOOS          0x60000000
+#define PT_GNU_EH_FRAME  0x6474e550
+#define PT_GNU_STACK     0x6474e551
+#define PT_GNU_RELRO     0x6474e552
+#define PT_HIOS          0x6fffffff
+#define PT_LOPROC        0x70000000
+#define PT_HIPROC        0x7fffffff
 
 /**

uspace/lib/c/generic/elf/elf_mod.c

@@ -342 +342 @@
         case PT_NOTE:
                 break;
+        case PT_GNU_EH_FRAME:
+        case PT_GNU_STACK:
+        case PT_GNU_RELRO:
+                /* Ignore GNU headers, if present. */
+                break;
         case PT_INTERP:
                 elf->info->interp =