Changeset a949f4a in mainline for uspace/lib/c/arch/ia64

Timestamp:

2019-07-16T15:07:01Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2cc569a3, 9fb280c

Parents:

fa603e99

git-author:

Jiri Svoboda <jiri@…> (2019-07-15 17:03:31)

git-committer:

Jiri Svoboda <jiri@…> (2019-07-16 15:07:01)

Message:

Dynamic linking on IA-64 (WIP)

Location:

uspace/lib/c/arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• include/libarch/rtld/dynamic.h (added)
• include/libarch/rtld/elf_dyn.h (added)
• include/libarch/rtld/module.h (added)
• include/libarch/tls.h (modified) (1 diff)
• src/rtld/dynamic.c (added)
• src/rtld/reloc.c (added)
• src/thread_entry.S (modified) (3 diffs)
• src/tls.c (modified) (3 diffs)

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

@@ -35 +35 @@
         arch/$(UARCH)/src/ddi.c \
         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
 
 ARCH_AUTOCHECK_HEADERS = \

uspace/lib/c/arch/ia64/include/libarch/tls.h

@@ -42 +42 @@
 /* This structure must be exactly 16 bytes long */
 typedef struct {
-        void *dtv; /* unused in static linking*/
+        void **dtv;
         void *fibril_data;
 } tcb_t;

uspace/lib/c/arch/ia64/src/thread_entry.S

@@ -34 +34 @@
 #
 #
-SYMBOL(__thread_entry)
+SYMBOL_BEGIN(__thread_entry)
         alloc loc0 = ar.pfs, 0, 1, 1, 0
 
+#ifndef CONFIG_RTLD
+        # XXX This does not work in a shared library
         movl gp = __gp
+#endif
 
         #
@@ -44 +47 @@
 
         mov out0 = r8 ;;
+        # XXX br.call.sptk.many b0 = FUNCTION_REF(__thread_main)
         br.call.sptk.many b0 = __thread_main
 
@@ -50 +54 @@
         #
 
+SYMBOL_END(__thread_entry)

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

@@ -1 +1 @@
 /*
+ * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
@@ -37 +38 @@
 #include <tls.h>
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 tcb_t *tls_alloc_arch(size_t size, size_t align)
 {
@@ -47 +52 @@
 }
 
+/*
+ * Rtld TLS support
+ */
+
+typedef struct {
+        unsigned long int ti_module;
+        unsigned long int ti_offset;
+} tls_index;
+
+void *__tls_get_addr(tls_index *ti);
+
+void *__tls_get_addr(tls_index *ti)
+{
+        uint8_t *tls;
+
+#ifdef CONFIG_RTLD
+        if (runtime_env != NULL) {
+                return rtld_tls_get_addr(runtime_env, __tcb_get(),
+                    ti->ti_module, ti->ti_offset);
+        }
+#endif
+        /* Get address of static TLS block */
+        tls = tls_get();
+        return tls + ti->ti_offset;
+}
+
 /** @}
  */