x86: fix longjmp() implementation

If longjmp(jmp_buf env, int val) is called with val = 0, the setjmp()
macro must return 1.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/i386/setjmp.S b/arch/x86/cpu/i386/setjmp.S
index 40b10dc8df1fec31eb9c56dda693ed4ca82d00c0..eceeafa7c8b779cd1bec9f76e1a541a59ee8fe15 100644 (file)
--- a/arch/x86/cpu/i386/setjmp.S
+++ b/arch/x86/cpu/i386/setjmp.S
@@ -49,12 +49,17 @@ longjmp:
        xchgl %eax, %edx
 #else
        movl 4(%esp), %edx      /* jmp_ptr address */
+       movl 8(%esp), %eax      /* Return value */
 #endif
        movl (%edx), %ebx
        movl 4(%edx), %esp
        movl 8(%edx), %ebp
        movl 12(%edx), %esi
        movl 16(%edx), %edi
+       test %eax, %eax
+       jnz nz
+       inc %eax
+nz:
        jmp *20(%edx)
 
        .size longjmp, .-longjmp