Changeset ab936440 in mainline for uspace/lib/c/generic/setjmp.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/c/generic/setjmp.c (modified) (1 diff)

uspace/lib/c/generic/setjmp.c

@@ -38 +38 @@
 void longjmp(jmp_buf env, int val)
 {
-        /* __longjmp defined in assembly doesn't "correct" the value. */
-        __longjmp(env, val == 0 ? 1 : val);
+        /*
+         * The standard requires that longjmp() ensures that val is not zero.
+         * __context_restore doesn't do that, so we do it here.
+         */
+        __context_restore(env, val == 0 ? 1 : val);
 }