Changeset 32573ff in mainline for uspace/lib/c/arch/amd64/src/fibril.S

Timestamp:

2016-05-02T20:58:16Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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 mainline, which has dltest and fixes.

File:

• uspace/lib/c/arch/amd64/src/fibril.S (modified) (2 diffs)

uspace/lib/c/arch/amd64/src/fibril.S

@@ -51 +51 @@
         movq %r15, CONTEXT_OFFSET_R15(%rdi)
         
-        # save TLS
         movq %fs:0, %rax
         movq %rax, CONTEXT_OFFSET_TLS(%rdi)
@@ -79 +78 @@
         movq %rdx,(%rsp)
         
-        # Set thread local storage
-        movq CONTEXT_OFFSET_TLS(%rdi), %rdi  # Set arg1 to TLS addr
-        movl $1, %eax                        # SYS_TLS_SET
-        syscall
+        movq CONTEXT_OFFSET_TLS(%rdi), %rdi
+        movq %rdi, %fs:0
         
         xorl %eax, %eax                      # context_restore returns 0