Changeset eefdd7c in mainline

Timestamp:

2019-01-20T10:02:08Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4f13e19

Parents:

a131536d

Message:

Dynamic linking for ppc32

Files:

• HelenOS.config (modified) (1 diff)
• uspace/lib/c/arch/ppc32/Makefile.common (modified) (1 diff)
• uspace/lib/c/arch/ppc32/Makefile.inc (modified) (1 diff)
• uspace/lib/c/arch/ppc32/include/libarch/rtld/dynamic.h (added)
• uspace/lib/c/arch/ppc32/include/libarch/rtld/elf_dyn.h (added)
• uspace/lib/c/arch/ppc32/include/libarch/rtld/module.h (added)
• uspace/lib/c/arch/ppc32/include/libarch/tls.h (modified) (1 diff)
• uspace/lib/c/arch/ppc32/src/rtld/dynamic.c (added)
• uspace/lib/c/arch/ppc32/src/rtld/reloc.c (added)
• uspace/lib/c/arch/ppc32/src/tls.c (modified) (3 diffs)

HelenOS.config

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

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

@@ -33 +33 @@
 endif
 
-COMMON_CFLAGS += -mcpu=powerpc -m$(FLOATS)-float -m32
+COMMON_CFLAGS += -mcpu=powerpc -m$(FLOATS)-float -m32 -Wl,-z,max-page-size=0x1000
 AFLAGS += -a32
 LDFLAGS += -Wl,--gc-sections

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

@@ -34 +34 @@
         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/ppc32/include/libarch/tls.h

@@ -43 +43 @@
 
 typedef struct {
+        void **dtv;
+        void *pad;
         void *fibril_data;
 } tcb_t;

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

@@ -1 +1 @@
 /*
+ * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
@@ -36 +37 @@
 #include <stddef.h>
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 tcb_t *tls_alloc_arch(size_t size, size_t align)
 {
@@ -46 +51 @@
 }
 
+/*
+ * Rtld TLS support
+ */
+
+typedef struct {
+        unsigned long int ti_module;
+        unsigned long int ti_offset;
+} tls_index;
+
+int __tls_debug = 0;
+
+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) + 0x8000;
+        }
+#endif
+        /* Get address of static TLS block */
+        tls = tls_get();
+        return tls + ti->ti_offset + 0x8000;
+}
+
 /** @}
  */