diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2020-11-15 20:35:30 -0800 |
|---|---|---|
| committer | Gustavo A. R. Silva <gustavoars@kernel.org> | 2020-11-18 14:02:13 -0600 |
| commit | 77433830ed164a0bc38dd43877bab3f7f7fd7fa3 (patch) | |
| tree | 97e5197e4316cd4abc5830ed1b29efe84a4505bd | |
| parent | 09162bc32c880a791c6c0668ce0745cf7958f576 (diff) | |
| download | linux-77433830ed164a0bc38dd43877bab3f7f7fd7fa3.tar.gz | |
powerpc: boot: include compiler_attributes.h
The kernel uses `-include` to include include/linux/compiler_types.h into all translation units (see scripts/Makefile.lib), which #includes compiler_attributes.h. arch/powerpc/boot/ uses different compiler flags from the rest of the kernel. As such, it doesn't contain the definitions from these headers, and redefines a few that it needs. For the purpose of enabling -Wimplicit-fallthrough for ppc, include compiler_attributes.h via `-include`. It was also noted in 6a9dc5fd6170 that we could -D__KERNEL__ and -include compiler_types.h like the main kernel does, though testing that produces a whole sea of warnings to cleanup. This approach is minimally invasive. And it also helps to entice a cleanup. Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Tested-by: Nathan Chancellor <natechancellor@gmail.com> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Gustavo A. R. Silva <gustavoars@kernel.org> Acked-by: Miguel Ojeda <ojeda@kernel.org> Acked-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://github.com/ClangBuiltLinux/linux/issues/236 [ Gustavo: Massage a bit as per Miguel's suggestion. ] Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
| -rw-r--r-- | arch/powerpc/boot/Makefile | 1 | ||||
| -rw-r--r-- | arch/powerpc/boot/decompress.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index f8ce6d2dde7b..1659963a8f1d 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -31,6 +31,7 @@ endif BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \ -pipe -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ + -include $(srctree)/include/linux/compiler_attributes.h \ $(LINUXINCLUDE) ifdef CONFIG_PPC64_BOOT_WRAPPER diff --git a/arch/powerpc/boot/decompress.c b/arch/powerpc/boot/decompress.c index 8bf39ef7d2df..6098b879ac97 100644 --- a/arch/powerpc/boot/decompress.c +++ b/arch/powerpc/boot/decompress.c @@ -21,7 +21,6 @@ #define STATIC static #define INIT -#define __always_inline inline /* * The build process will copy the required zlib source files and headers |