Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1c48bb1 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Michal Marek
Browse files

Makefile: Fix unrecognized cross-compiler command line options 



On architectures that setup CROSS_COMPILE in their arch/*/Makefile
(arc, blackfin, m68k, mips, parisc, score, sh, tile, unicore32, xtensa),
cc-option and cc-disable-warning may check against the wrong compiler,
causing errors like

    cc1: error: unrecognized command line option "-Wno-maybe-uninitialized"

if the host gcc supports a compiler option, while the cross compiler
doesn't support that option.

Move all logic using cc-option or cc-disable-warning below the inclusion
of the arch's Makefile to fix this.

Introduced by
  - commit e74fc973 ("Turn off
    -Wmaybe-uninitialized when building with -Os"),
  - commit 61163efa ("kbuild: LLVMLinux:
    Add Kbuild support for building kernel with Clang").

As -Wno-maybe-uninitialized requires a quite recent gcc (gcc 4.6.3 on
Ubuntu 12.04 LTS doesn't support it), this only showed up recently (gcc
4.8.2 on Ubuntu 14.04 LTS does support it).

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent c43cecad

Makefile

+6 −4
Original line number Diff line number Diff line
@@ -400,8 +400,8 @@ KBUILD_CPPFLAGS := -D__KERNEL__ 
KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

		   -fno-strict-aliasing -fno-common \

		   -Werror-implicit-function-declaration \

		   -Wno-format-security \

		   $(call cc-option,-fno-delete-null-pointer-checks,)

		   -Wno-format-security



KBUILD_AFLAGS_KERNEL :=

KBUILD_CFLAGS_KERNEL :=

KBUILD_AFLAGS   := -D__ASSEMBLY__
@@ -607,14 +607,16 @@ endif # $(dot-config) 
# Defaults to vmlinux, but the arch makefile usually adds further targets

all: vmlinux



include $(srctree)/arch/$(SRCARCH)/Makefile



KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)

else

KBUILD_CFLAGS	+= -O2

endif



include $(srctree)/arch/$(SRCARCH)/Makefile



ifdef CONFIG_READABLE_ASM

# Disable optimizations that make assembler listings hard to read.

# reorder blocks reorders the control in the function