| From c8a950d0d3b926a02c7b2e713850d38217cec3d1 Mon Sep 17 00:00:00 2001 |
| From: Jean-Philippe Brucker <jean-philippe@linaro.org> |
| Date: Tue, 10 Nov 2020 17:43:05 +0100 |
| Subject: tools: Factor HOSTCC, HOSTLD, HOSTAR definitions |
| |
| From: Jean-Philippe Brucker <jean-philippe@linaro.org> |
| |
| commit c8a950d0d3b926a02c7b2e713850d38217cec3d1 upstream. |
| |
| Several Makefiles in tools/ need to define the host toolchain variables. |
| Move their definition to tools/scripts/Makefile.include |
| |
| Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> |
| Signed-off-by: Andrii Nakryiko <andrii@kernel.org> |
| Acked-by: Jiri Olsa <jolsa@redhat.com> |
| Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Link: https://lore.kernel.org/bpf/20201110164310.2600671-2-jean-philippe@linaro.org |
| Cc: Alistair Delva <adelva@google.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/build/Makefile | 4 ---- |
| tools/objtool/Makefile | 9 --------- |
| tools/perf/Makefile.perf | 4 ---- |
| tools/power/acpi/Makefile.config | 1 - |
| tools/scripts/Makefile.include | 10 ++++++++++ |
| 5 files changed, 10 insertions(+), 18 deletions(-) |
| |
| --- a/tools/build/Makefile |
| +++ b/tools/build/Makefile |
| @@ -15,10 +15,6 @@ endef |
| $(call allow-override,CC,$(CROSS_COMPILE)gcc) |
| $(call allow-override,LD,$(CROSS_COMPILE)ld) |
| |
| -HOSTCC ?= gcc |
| -HOSTLD ?= ld |
| -HOSTAR ?= ar |
| - |
| export HOSTCC HOSTLD HOSTAR |
| |
| ifeq ($(V),1) |
| --- a/tools/objtool/Makefile |
| +++ b/tools/objtool/Makefile |
| @@ -3,15 +3,6 @@ include ../scripts/Makefile.include |
| include ../scripts/Makefile.arch |
| |
| # always use the host compiler |
| -ifneq ($(LLVM),) |
| -HOSTAR ?= llvm-ar |
| -HOSTCC ?= clang |
| -HOSTLD ?= ld.lld |
| -else |
| -HOSTAR ?= ar |
| -HOSTCC ?= gcc |
| -HOSTLD ?= ld |
| -endif |
| AR = $(HOSTAR) |
| CC = $(HOSTCC) |
| LD = $(HOSTLD) |
| --- a/tools/perf/Makefile.perf |
| +++ b/tools/perf/Makefile.perf |
| @@ -163,10 +163,6 @@ endef |
| |
| LD += $(EXTRA_LDFLAGS) |
| |
| -HOSTCC ?= gcc |
| -HOSTLD ?= ld |
| -HOSTAR ?= ar |
| - |
| PKG_CONFIG = $(CROSS_COMPILE)pkg-config |
| LLVM_CONFIG ?= llvm-config |
| |
| --- a/tools/power/acpi/Makefile.config |
| +++ b/tools/power/acpi/Makefile.config |
| @@ -54,7 +54,6 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} |
| CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- |
| CROSS_COMPILE ?= $(CROSS) |
| LD = $(CC) |
| -HOSTCC = gcc |
| |
| # check if compiler option is supported |
| cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -x c /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} |
| --- a/tools/scripts/Makefile.include |
| +++ b/tools/scripts/Makefile.include |
| @@ -59,6 +59,16 @@ $(call allow-override,LD,$(CROSS_COMPILE |
| $(call allow-override,CXX,$(CROSS_COMPILE)g++) |
| $(call allow-override,STRIP,$(CROSS_COMPILE)strip) |
| |
| +ifneq ($(LLVM),) |
| +HOSTAR ?= llvm-ar |
| +HOSTCC ?= clang |
| +HOSTLD ?= ld.lld |
| +else |
| +HOSTAR ?= ar |
| +HOSTCC ?= gcc |
| +HOSTLD ?= ld |
| +endif |
| + |
| ifeq ($(CC_NO_CLANG), 1) |
| EXTRA_WARNINGS += -Wstrict-aliasing=3 |
| endif |
