Changeset 272a293 in mainline

Timestamp:

2019-01-09T15:11:17Z (5 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

a91b828

Parents:

60c96cf (diff), 1567471 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge upstream changes

Files:

• HelenOS.config (modified) (1 diff)
• defaults/amd64/Makefile.config (modified) (1 diff)
• uspace/Makefile.common (modified) (1 diff)
• uspace/lib/c/arch/amd64/include/libarch/rtld/module.h (added)
• uspace/lib/c/arch/ia32/include/libarch/rtld/module.h (added)
• uspace/lib/c/generic/elf/elf_mod.c (modified) (2 diffs)
• uspace/lib/c/generic/rtld/module.c (modified) (2 diffs)

HelenOS.config

@@ -578 +578 @@
 
 % Dynamic linking support
-! [PLATFORM=ia32] CONFIG_RTLD (n/y)
-! [PLATFORM=abs32le|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_RTLD (n)
+! [PLATFORM=amd64|PLATFORM=ia32] CONFIG_RTLD (y/n)
+! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_RTLD (n)
 
 % Build shared libraries

defaults/amd64/Makefile.config

@@ -65 +65 @@
 CONFIG_BFB_BPP = 16
 
+# Dynamic linking support
+CONFIG_RTLD = y
+
+# Build shared libraries
+CONFIG_BUILD_SHARED_LIBS = y
+
+# Link against shared libraries
+CONFIG_USE_SHARED_LIBS = y
+
 # Include userspace unit tests (PCUT)
 CONFIG_PCUT_TESTS = y

uspace/Makefile.common

@@ -112 +112 @@
 
 AFLAGS = --fatal-warnings
-LDFLAGS = -Wl,--fatal-warnings,--warn-common
+LDFLAGS = -Wl,--fatal-warnings,--warn-common -Wl,-z,max-page-size=0x1000
 
 ifeq ($(STATIC_NEEDED),y)

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

@@ -420 +420 @@
         seg_ptr = (void *) seg_addr;
 
-        DPRINTF("Load segment at addr %p, size 0x%zx\n", (void *) seg_addr,
-            entry->p_memsz);
+        DPRINTF("Load segment at addr %p, size 0x%zx, flags %c%c%c\n", (void *) seg_addr,
+            entry->p_memsz,
+            (entry->p_flags & PF_R) ? 'r' : '-',
+            (entry->p_flags & PF_W) ? 'w' : '-',
+            (entry->p_flags & PF_X) ? 'x' : '-');
 
         if (entry->p_align > 1) {
@@ -484 +487 @@
                 return EE_OK;
 
-        rc = as_area_change_flags(seg_ptr, flags);
+        DPRINTF("as_area_change_flags(%p, %x)\n",
+            (uint8_t *) base + bias, flags);
+        rc = as_area_change_flags((uint8_t *) base + bias, flags);
         if (rc != EOK) {
                 DPRINTF("Failed to set memory area flags.\n");

uspace/lib/c/generic/rtld/module.c

@@ -50 +50 @@
 #include <rtld/rtld_arch.h>
 #include <rtld/module.h>
+#include <libarch/rtld/module.h>
 
 #include "../private/libc.h"
@@ -206 +207 @@
         DPRINTF("filename:'%s'\n", name_buf);
 
-        rc = elf_load_file_name(name_buf, ELDF_RW, &info);
+        rc = elf_load_file_name(name_buf, RTLD_MODULE_LDF, &info);
         if (rc != EE_OK) {
                 printf("Failed to load '%s'\n", name_buf);