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

Commit cd49a48d authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 4a1a4fb5 on remote branch 

Change-Id: Ie77691d2a639aab60b95b61ad928ecfcc516a958
parents cc5a71d5 4a1a4fb5

AndroidKernel.mk

+2 −0
Original line number Diff line number Diff line
@@ -187,9 +187,11 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) 
			echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \

			$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) oldconfig; fi



.PHONY: kerneltags

kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) tags



.PHONY: kernelconfig

kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG)

	env KCONFIG_NOTIMESTAMP=true \

	     $(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) menuconfig

Makefile

+12 −9
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ $(call cc-option,-fno-PIE) 
KBUILD_AFLAGS_MODULE  := -DMODULE

KBUILD_CFLAGS_MODULE  := -DMODULE

KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds

CLANG_FLAGS :=



# Read KERNELRELEASE from include/config/kernel.release (if it exists)

KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
@@ -618,21 +619,23 @@ all: vmlinux 
ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE	?= $(CROSS_COMPILE)

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

ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_TARGET)), y)

CLANG_FLAGS    += --target=$(notdir $(CLANG_TRIPLE:%-=%))

ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)

$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")

endif

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))

CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

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

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

CLANG_FLAGS	+= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

CLANG_FLAGS	+= -no-integrated-as

CLANG_FLAGS	+= -Werror=unknown-warning-option

CLANG_FLAGS    += $(call cc-option, -Wno-misleading-indentation)

CLANG_FLAGS    += $(call cc-option, -Wno-bool-operation)

KBUILD_CFLAGS	+= $(CLANG_FLAGS)

KBUILD_AFLAGS	+= $(CLANG_FLAGS)

endif



# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default

arch/arm64/configs/vendor/msm-perf_defconfig

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../msm-perf_defconfig
 
 No newline at end of file

arch/arm64/configs/vendor/msm_defconfig

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../msm_defconfig
 
 No newline at end of file

arch/arm64/configs/vendor/msmcortex-perf_defconfig

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../msmcortex-perf_defconfig
 
 No newline at end of file