Skip to content

Commit

Permalink
powerpc: Make setjmp/longjmp signature standard
Browse files Browse the repository at this point in the history
Declaring setjmp()/longjmp() as taking longs makes the signature
non-standard, and makes clang complain. In the past, this has been
worked around by adding -ffreestanding to the compile flags.

The implementation looks like it only ever propagates the value
(in longjmp) or sets it to 1 (in setjmp), and we only call longjmp
with integer parameters.

This allows removing -ffreestanding from the compilation flags.

Fixes: c9029ef ("powerpc: Avoid clang warnings around setjmp and longjmp")
Cc: [email protected] # v4.14+
Signed-off-by: Clement Courbet <[email protected]>
Reviewed-by: Nathan Chancellor <[email protected]>
Tested-by: Nathan Chancellor <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
legrosbuffle authored and mpe committed Apr 1, 2020
1 parent 41b8426 commit c17eb4d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
6 changes: 4 additions & 2 deletions arch/powerpc/include/asm/setjmp.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

#define JMP_BUF_LEN 23

extern long setjmp(long *) __attribute__((returns_twice));
extern void longjmp(long *, long) __attribute__((noreturn));
typedef long jmp_buf[JMP_BUF_LEN];

extern int setjmp(jmp_buf env) __attribute__((returns_twice));
extern void longjmp(jmp_buf env, int val) __attribute__((noreturn));

#endif /* _ASM_POWERPC_SETJMP_H */
3 changes: 0 additions & 3 deletions arch/powerpc/kexec/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
# Makefile for the linux kernel.
#

# Avoid clang warnings around longjmp/setjmp declarations
CFLAGS_crash.o += -ffreestanding

obj-y += core.o crash.o core_$(BITS).o

obj-$(CONFIG_PPC32) += relocate_32.o
Expand Down
3 changes: 0 additions & 3 deletions arch/powerpc/xmon/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# Makefile for xmon

# Avoid clang warnings around longjmp/setjmp declarations
subdir-ccflags-y := -ffreestanding

GCOV_PROFILE := n
KCOV_INSTRUMENT := n
UBSAN_SANITIZE := n
Expand Down

0 comments on commit c17eb4d

Please sign in to comment.