summaryrefslogtreecommitdiff
path: root/arch/sandbox/cpu/cpu.c
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2018-06-22 14:44:12 +0200
committerAlexander Graf <agraf@suse.de>2018-09-23 21:55:30 +0200
commit3fcb7147584f8cf5128e1c5eb6b7e49dd86a5473 (patch)
treecfb9d1d68617f94ae1ff2f17c949fc6498689695 /arch/sandbox/cpu/cpu.c
parentaaace4b0860fbe22b2b08f761b3c6ea12af94d5e (diff)
downloadu-boot-3fcb7147584f8cf5128e1c5eb6b7e49dd86a5473.tar.gz
sandbox: Fix setjmp/longjmp
In sandbox, longjmp returns to itself in an endless loop because os_longjmp() calls into longjmp() which is provided by U-Boot which again calls os_longjmp(). Setjmp on the other hand must not return because otherwise the return freees up stack elements that we need during longjmp(). The only straight forward fix that doesn't involve nasty hacks I could find is to directly link against the system setjmp/longjmp implementations. That means we just provide the compiler with hints that the symbol will be available and actually fill them out with versions from libc. This approach should be reasonably platform agnostic Signed-off-by: Alexander Graf <agraf@suse.de> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/sandbox/cpu/cpu.c')
-rw-r--r--arch/sandbox/cpu/cpu.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index e523223ebf..6098945049 100644
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -288,15 +288,3 @@ ulong timer_get_boot_us(void)
return (count - base_count) / 1000;
}
-
-int setjmp(jmp_buf jmp)
-{
- return os_setjmp((ulong *)jmp, sizeof(*jmp));
-}
-
-void longjmp(jmp_buf jmp, int ret)
-{
- os_longjmp((ulong *)jmp, ret);
- while (1)
- ;
-}