From 2e07c956a80d24bf546121052187803283c5df66 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Thu, 28 Nov 2013 18:31:34 +0400 Subject: Add cross-build support to tools/lib/lk library Signed-off-by: Wookey --- tools/perf/Makefile.perf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 9670a16fa577..e34c0f5b2580 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -767,13 +767,13 @@ LIBAPIKFS_SOURCES = $(wildcard $(LIB_PATH)fs/*.[ch]) # already $(LIBAPIKFS): $(LIBAPIKFS_SOURCES) ifeq ($(subdir),) - $(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libapikfs.a + $(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) libapikfs.a endif $(LIBAPIKFS)-clean: ifeq ($(subdir),) $(call QUIET_CLEAN, libapikfs) - @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null + @$(MAKE) -C $(LIB_DIR) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) clean >/dev/null endif help: -- cgit v1.2.3 From 09e19681a8d2a3e05af2bcc9bc0c030322a8ca11 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 7 Feb 2014 17:15:27 +0000 Subject: Makefile: Unset stack-protector gcc flag if it is not supported In case the compiler does not support the stack-protector option, unset the flag to avoid build failures. Printing a warning is enough to let the user know that this flag will not be used. Fixes the following build problem when using a toolchain which does not support the -fstack-protector-strong flag: Makefile:614: Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: -fstack-protector-strong not supported by compiler mips-linux-gnu-gcc: error: unrecognized command line option '-fstack-protector-strong' scripts/Makefile.build:308: recipe for target 'scripts/mod/empty.o' failed make[2]: *** [scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... scripts/Makefile.build:455: recipe for target 'scripts/mod' failed Cc: Michal Marek Cc: linux-kbuild@vger.kernel.org Signed-off-by: Markos Chandras --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index b11e2d504a00..4916d15eed79 100644 --- a/Makefile +++ b/Makefile @@ -635,6 +635,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_REGULAR ifeq ($(call cc-option, $(stackp-flag)),) $(warning Cannot use CONFIG_CC_STACKPROTECTOR_REGULAR: \ -fstack-protector not supported by compiler) + stackp-flag := endif else ifdef CONFIG_CC_STACKPROTECTOR_STRONG @@ -642,6 +643,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_STRONG ifeq ($(call cc-option, $(stackp-flag)),) $(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \ -fstack-protector-strong not supported by compiler) + stackp-flag := endif else # Force off for distro compilers that enable stack protector by default. -- cgit v1.2.3 From 1db32bd60a868224244d15924ce1a50a4c8053f2 Mon Sep 17 00:00:00 2001 From: Victor Kamensky Date: Fri, 18 Apr 2014 08:55:46 -0700 Subject: ARM64: disable DCACHE_WORD_ACCESS in big endian case If DCACHE_WORD_ACCESS is enabled big endian image failed to boot. commit 7bc13fd33adb9536bd73965cd46bbf7377df097c "arm64: dcache: select DCACHE_WORD_ACCESS for little-endian CPUs" enabled this setting for both big endian and little endian cpus. And code in commit itself seems to be endian agnostic, however other, i.e C, code that sits under DCACHE_WORD_ACCESS seems to be not endian agnostic, I could not figure out where though. Solution is to enable DCACHE_WORD_ACCESS only if little endian mode is enabled (default). Signed-off-by: Victor Kamensky --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a474de346be6..479689a37d53 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -14,7 +14,7 @@ config ARM64 select CLONE_BACKWARDS select COMMON_CLK select CPU_PM if (SUSPEND || CPU_IDLE) - select DCACHE_WORD_ACCESS + select DCACHE_WORD_ACCESS if !CPU_BIG_ENDIAN select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_CPU_AUTOPROBE -- cgit v1.2.3 From cdbef9715d86453cd9d377bf3b3450ff449ecc2d Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Mon, 30 Jun 2014 20:18:30 +0400 Subject: Revert "kbuild: Use relative path when building in a subdir of the source tree" This reverts commit 9da0763bdd82572be243fcf5161734f11568960f. That commit broke 'make deb-pkg' when building in a subdir of the source tree. Signed-off-by: Andrey Konovalov --- Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 4916d15eed79..e10228b6da2a 100644 --- a/Makefile +++ b/Makefile @@ -149,17 +149,7 @@ else _all: modules endif -ifeq ($(KBUILD_SRC),) - # building in the source tree - srctree := . -else - ifeq ($(KBUILD_SRC)/,$(dir $(CURDIR))) - # building in a subdirectory of the source tree - srctree := .. - else - srctree := $(KBUILD_SRC) - endif -endif +srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),.) objtree := . src := $(srctree) obj := $(objtree) -- cgit v1.2.3