Changeset bc73be3 in mainline for uspace/lib/c/arch/riscv64/src/fibril.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• uspace/lib/c/arch/riscv64/src/fibril.c (modified) (1 diff)

uspace/lib/c/arch/riscv64/src/fibril.c

@@ -33 +33 @@
 #include <stdbool.h>
 
-int __setjmp(context_t *ctx)
+int __context_save(__context_t *ctx)
 {
         return 0;
 }
 
-void __longjmp(context_t *ctx, int ret)
+void __context_restore(__context_t *ctx, int ret)
 {
         while (true)