Changeset e175d69 in mainline for uspace/lib/c/arch

Timestamp:

2011-05-01T13:08:18Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

042fbe0

Parents:

a41577e (diff), e515a827 (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 dynamic linking support (ia32-only, off by default). Very limited TLS
support. Executables which use TLS should set STATIC_ONLY = y in Makefile.

Location:

uspace/lib/c/arch/ia32

Files:

• Makefile.inc (modified) (1 diff)
• _link.ld.in (modified) (5 diffs)
• include/rtld/dynamic.h (added)
• include/rtld/elf_dyn.h (added)
• src/rtld/dynamic.c (added)
• src/rtld/reloc.c (added)
• src/syscall.S (modified) (3 diffs)
• src/tls.c (modified) (2 diffs)

uspace/lib/c/arch/ia32/Makefile.inc

@@ -36 +36 @@
         arch/$(UARCH)/src/setjmp.S \
         arch/$(UARCH)/src/stacktrace.c \
-        arch/$(UARCH)/src/stacktrace_asm.S
+        arch/$(UARCH)/src/stacktrace_asm.S \
+        arch/$(UARCH)/src/rtld/dynamic.c \
+        arch/$(UARCH)/src/rtld/reloc.c
 
 .PRECIOUS: arch/$(UARCH)/src/entry.o

uspace/lib/c/arch/ia32/_link.ld.in

@@ +1 @@
+#ifndef SHLIB
 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
+#endif
 
 PHDRS {
-#ifdef LOADER
+#if defined(LOADER) || defined(DLEXE)
         interp PT_INTERP;
         text PT_LOAD FILEHDR PHDRS FLAGS(5);
@@ -10 +12 @@
 #endif
         data PT_LOAD FLAGS(6);
+#if defined(SHLIB) || defined(DLEXE)
+        dynamic PT_DYNAMIC;
+#endif
         debug PT_NOTE;
 }
 
 SECTIONS {
-#ifdef LOADER
+#if defined(LOADER) || defined(DLEXE)
         .interp : {
                 *(.interp);
         } :interp
-
+#endif
+#ifdef LOADER
         . = 0x70001000 + SIZEOF_HEADERS;
 #else
@@ -31 +37 @@
                 *(.rodata .rodata.*);
         } :text
+
+#if defined(SHLIB) || defined(DLEXE)
+        .rel.plt : {
+                *(.rel.plt);
+        }
+        /* 
+         *.rel.dyn MUST FOLLOW IMMEDIATELY after .rel.plt 
+         * without alignment gap or DT_REL will be broken
+         */
+        .rel.dyn : {
+                *(.rel.*);
+        } :text
         
+        .plt : {
+                *(.plt);
+        } :text
+        
+        .dynsym : {
+                *(.dynsym);
+        } :text
+        
+        .dynstr : {
+                *(.dynstr);
+        } :text
+        
+        .hash : {
+                *(.hash);
+        } :text
+#endif
         . = . + 0x1000;
+        
+#if defined(SHLIB) || defined(DLEXE)
+        .dynamic : {
+                *(.dynamic);
+        } :data :dynamic
+#endif
         
         .data : {
@@ -38 +78 @@
         } :data
         
+#if defined(SHLIB) || defined(DLEXE)
+        .data.rel : {
+                *(.data.rel .data.rel.*);
+        } :data
+
+        .got : {
+                *(.got);
+        } :data
+        .got.plt : {
+                *(.got.plt);
+        } :data
+#endif
+        
+#ifndef DLEXE
         .tdata : {
                 _tdata_start = .;
@@ -49 +103 @@
         
         _tls_alignment = ALIGNOF(.tdata);
+#endif
         
         .bss : {
+                *(.dynbss);
                 *(COMMON);
                 *(.bss);

uspace/lib/c/arch/ia32/src/syscall.S

@@ -32 +32 @@
 __syscall_fast_func:
         .long __syscall_slow
+        .size __syscall_fast_func, . - __syscall_fast_func
 
 .text
@@ -71 +72 @@
  */
 .global __syscall_fast
+        .type __syscall_fast, @function
+
 __syscall_fast:
         pushl %ebx
@@ -95 +98 @@
         popl %ebx
         ret
+
+        .size __syscall_fast, . - __syscall_fast

uspace/lib/c/arch/ia32/src/tls.c

@@ -37 +37 @@
 #include <tls.h>
 #include <sys/types.h>
+#include <align.h>
 
 tcb_t * __alloc_tls(void **data, size_t size)
@@ -48 +49 @@
 }
 
+/*
+ * Rtld TLS support
+ */
+
+typedef struct {
+        unsigned long int ti_module;
+        unsigned long int ti_offset;
+} tls_index;
+
+void __attribute__ ((__regparm__ (1)))
+    *___tls_get_addr(tls_index *ti);
+
+void __attribute__ ((__regparm__ (1)))
+    *___tls_get_addr(tls_index *ti)
+{
+        size_t tls_size;
+        uint8_t *tls;
+
+        /* Calculate size of TLS block */
+        tls_size = ALIGN_UP(&_tbss_end - &_tdata_start, &_tls_alignment);
+
+        /* The TLS block is just before TCB */
+        tls = (uint8_t *)__tcb_get() - tls_size;
+
+        return tls + ti->ti_offset;
+}
+
 /** @}
  */