Changeset 1567471 in mainline
- Timestamp:
- 2019-01-09T12:38:13Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 272a293, 2d156bb
- Parents:
- d3e938c
- git-author:
- Jiri Svoboda <jiri@…> (2018-01-08 19:37:57)
- git-committer:
- Jiri Svoboda <jiri@…> (2019-01-09 12:38:13)
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
rd3e938c r1567471 578 578 579 579 % Dynamic linking support 580 ! [PLATFORM= ia32] CONFIG_RTLD (n/y)581 ! [PLATFORM=abs32le|PLATFORM=a md64|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_RTLD (n)580 ! [PLATFORM=amd64|PLATFORM=ia32] CONFIG_RTLD (y/n) 581 ! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_RTLD (n) 582 582 583 583 % Build shared libraries -
defaults/amd64/Makefile.config
rd3e938c r1567471 65 65 CONFIG_BFB_BPP = 16 66 66 67 # Dynamic linking support 68 CONFIG_RTLD = y 69 70 # Build shared libraries 71 CONFIG_BUILD_SHARED_LIBS = y 72 73 # Link against shared libraries 74 CONFIG_USE_SHARED_LIBS = y 75 67 76 # Include development files (headers, libraries) 68 77 CONFIG_DEVEL_FILES = y -
uspace/Makefile.common
rd3e938c r1567471 112 112 113 113 AFLAGS = --fatal-warnings 114 LDFLAGS = -Wl,--fatal-warnings,--warn-common 114 LDFLAGS = -Wl,--fatal-warnings,--warn-common -Wl,-z,max-page-size=0x1000 115 115 116 116 ifeq ($(STATIC_NEEDED),y) -
uspace/lib/c/generic/elf/elf_mod.c
rd3e938c r1567471 420 420 seg_ptr = (void *) seg_addr; 421 421 422 DPRINTF("Load segment at addr %p, size 0x%zx\n", (void *) seg_addr, 423 entry->p_memsz); 422 DPRINTF("Load segment at addr %p, size 0x%zx, flags %c%c%c\n", (void *) seg_addr, 423 entry->p_memsz, 424 (entry->p_flags & PF_R) ? 'r' : '-', 425 (entry->p_flags & PF_W) ? 'w' : '-', 426 (entry->p_flags & PF_X) ? 'x' : '-'); 424 427 425 428 if (entry->p_align > 1) { … … 484 487 return EE_OK; 485 488 486 rc = as_area_change_flags(seg_ptr, flags); 489 DPRINTF("as_area_change_flags(%p, %x)\n", 490 (uint8_t *) base + bias, flags); 491 rc = as_area_change_flags((uint8_t *) base + bias, flags); 487 492 if (rc != EOK) { 488 493 DPRINTF("Failed to set memory area flags.\n"); -
uspace/lib/c/generic/rtld/module.c
rd3e938c r1567471 50 50 #include <rtld/rtld_arch.h> 51 51 #include <rtld/module.h> 52 #include <libarch/rtld/module.h> 52 53 53 54 #include "../private/libc.h" … … 206 207 DPRINTF("filename:'%s'\n", name_buf); 207 208 208 rc = elf_load_file_name(name_buf, ELDF_RW, &info);209 rc = elf_load_file_name(name_buf, RTLD_MODULE_LDF, &info); 209 210 if (rc != EE_OK) { 210 211 printf("Failed to load '%s'\n", name_buf);
Note:
See TracChangeset
for help on using the changeset viewer.