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

Commit 2957a4c7 authored by Prasad Sodagudi's avatar Prasad Sodagudi
Browse files

kbuild: Fix merge conflict in Makefile file properly 



'commit 3ba3c6ce ("Merge remote-tracking branch
'remotes/origin/tmp-df0daba8' into msm-4.14")'
merge conflict resolution was not proper and causing
compile time issues. Resolved merge conflict and necessary
clean up to the Makefile.

Change-Id: Idb0cb690fb5c940006cd565b358dc92aa5f2648a
Signed-off-by: default avatarPrasad Sodagudi <psodagud@codeaurora.org>
parent a275d6d4

Makefile

+0 −13
Original line number Diff line number Diff line
@@ -739,24 +739,11 @@ endif 
KBUILD_CFLAGS += $(stackp-flag)



ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE	?= $(CROSS_COMPILE)

CLANG_TARGET	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))

GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) -meabi gnu

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)



KBUILD_CFLAGS += -Wno-asm-operand-widths

KBUILD_CFLAGS += -Wno-initializer-overrides

KBUILD_CFLAGS += -fno-builtin

KBUILD_CFLAGS += $(call cc-option, -Wno-undefined-optimized)

KBUILD_CFLAGS += $(call cc-option, -Wno-tautological-constant-out-of-range-compare)