Changeset 1c3c287 in mainline for uspace/lib/c/arch/sparc64

Timestamp:

2019-01-14T16:52:47Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d4ceba0

Parents:

8e3bc063

git-author:

Jiri Svoboda <jiri@…> (2018-01-19 19:52:43)

git-committer:

Jiri Svoboda <jiri@…> (2019-01-14 16:52:47)

Message:

Dynamic linking on sparc64

Location:

uspace/lib/c/arch/sparc64

Files:

• Makefile.common (modified) (1 diff)
• 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/tls.c (modified) (2 diffs)

uspace/lib/c/arch/sparc64/Makefile.common

@@ -52 +52 @@
 ifeq ($(PROCESSOR),sun4v)
         DEFS += -DSUN4V
+        COMMON_CFLAGS += -Wl,-z,max-page-size=0x2000
+else
+        COMMON_CFLAGS += -Wl,-z,max-page-size=0x4000
 endif

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

@@ -33 +33 @@
         arch/$(UARCH)/src/tls.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/sparc64/include/libarch/tls.h

@@ -46 +46 @@
         void *self;
         void *fibril_data;
+        void **dtv;
+        void *pad;
 } tcb_t;
 

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

@@ -38 +38 @@
 #include <stddef.h>
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 tcb_t *tls_alloc_arch(size_t size, size_t align)
 {
@@ -48 +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;
+}
+
 /** @}
  */