diff options
| -rw-r--r-- | mark_rts.c | 8 | ||||
| -rw-r--r-- | tools/setjmp_t.c | 4 |
2 files changed, 9 insertions, 3 deletions
@@ -386,13 +386,15 @@ STATIC void GC_remove_tmp_roots(void) GC_INNER ptr_t GC_approx_sp(void) { volatile word sp; - sp = (word)&sp; +# if defined(__GNUC__) && (__GNUC__ >= 4) + sp = (word)__builtin_frame_address(0); +# else + sp = (word)&sp; +# endif /* Also force stack to grow if necessary. Otherwise the */ /* later accesses might cause the kernel to think we're */ /* doing something wrong. */ return((ptr_t)sp); - /* GNU C: alternatively, we may return the value of */ - /*__builtin_frame_address(0). */ } /* diff --git a/tools/setjmp_t.c b/tools/setjmp_t.c index 1bd715dd..c71aea63 100644 --- a/tools/setjmp_t.c +++ b/tools/setjmp_t.c @@ -62,9 +62,13 @@ struct { word nested_sp(void) { +# if defined(__GNUC__) && (__GNUC__ >= 4) + return (word)__builtin_frame_address(0); +# else volatile word sp; sp = (word)(&sp); return sp; +# endif } /* To prevent nested_sp inlining. */ |