Commit 473575d5 authored Mar 30, 2020 by Clement Courbet Committed by Greg Kroah-Hartman Apr 17, 2020

powerpc: Make setjmp/longjmp signature standard



commit c17eb4dca5a353a9dbbb8ad6934fe57af7165e91 upstream.

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: c9029ef9c957 ("powerpc: Avoid clang warnings around setjmp and longjmp")
Cc: stable@vger.kernel.org # v4.14+
Signed-off-by: Clement Courbet <courbet@google.com>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Tested-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200330080400.124803-1-courbet@google.com


Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 303b647b

arch/powerpc/include/asm/setjmp.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -12,7 +12,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 */

arch/powerpc/kernel/Makefile

+0 −3

Original line number	Diff line number	Diff line
		@@ -5,9 +5,6 @@

		CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"'

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

		subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror

		ifdef CONFIG_PPC64

arch/powerpc/xmon/Makefile

+0 −3

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		# Makefile for xmon

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

		subdir-ccflags-$(CONFIG_PPC_WERROR) += -Werror

		GCOV_PROFILE := n