| Message ID | c02ce4a573f3bac907e2c70957a2d1275f910013.1567605586.git.segher@kernel.crashing.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | aa497d4352414aad22e792b35d0aaaa12bbc37c5 |
| Headers | show |
| Series | powerpc: Add attributes for setjmp/longjmp | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (c317052c95bef1f977b023158e5aa929215f443d) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | warning | total: 0 errors, 3 warnings, 2 checks, 9 lines checked |
On Wed, 2019-09-04 at 14:11:07 UTC, Segher Boessenkool wrote: > The setjmp function should be declared as "returns_twice", or bad > things can happen[1]. This does not actually change generated code > in my testing. > > The longjmp function should be declared as "noreturn", so that the > compiler can optimise calls to it better. This makes the generated > code a little shorter. > > Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/aa497d4352414aad22e792b35d0aaaa12bbc37c5 cheers
diff --git a/arch/powerpc/include/asm/setjmp.h b/arch/powerpc/include/asm/setjmp.h index d995061..e9f81bb 100644 --- a/arch/powerpc/include/asm/setjmp.h +++ b/arch/powerpc/include/asm/setjmp.h @@ -7,7 +7,7 @@ #define JMP_BUF_LEN 23 -extern long setjmp(long *); -extern void longjmp(long *, long); +extern long setjmp(long *) __attribute__((returns_twice)); +extern void longjmp(long *, long) __attribute__((noreturn)); #endif /* _ASM_POWERPC_SETJMP_H */
The setjmp function should be declared as "returns_twice", or bad things can happen[1]. This does not actually change generated code in my testing. The longjmp function should be declared as "noreturn", so that the compiler can optimise calls to it better. This makes the generated code a little shorter. Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> [1] See https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-returns_005ftwice-function-attribute --- arch/powerpc/include/asm/setjmp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)