tools: fix cross-compile var clobbering
Currently a number of Makefiles break when used with toolchains that pass extra flags in CC and other cross-compile related variables (such as --sysroot). Thus we get this error when we use a toolchain that puts --sysroot in the CC var: ~/src/linux/tools$ make iio [snip] iio_event_monitor.c:18:10: fatal error: unistd.h: No such file or directory #include <unistd.h> ^~~~~~~~~~ This occurs because we clobber several env vars related to cross-compiling with lines like this: CC = $(CROSS_COMPILE)gcc Although this will point to a valid cross-compiler, we lose any extra flags that might exist in the CC variable, which can break toolchains that rely on them (for example, those that use --sysroot). This easily shows up using a Yocto SDK: $ . [snip]/sdk/environment-setup-cortexa8hf-neon-poky-linux-gnueabi $ echo $CC arm-poky-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a8 --sysroot=[snip]/sdk/sysroots/cortexa8hf-neon-poky-linux-gnueabi $ echo $CROSS_COMPILE arm-poky-linux-gnueabi- $ echo ${CROSS_COMPILE}gcc krm-poky-linux-gnueabi-gcc Although arm-poky-linux-gnueabi-gcc is a cross-compiler, we've lost the --sysroot and other flags that enable us to find the right libraries to link against, so we can't find unistd.h and other libraries and headers. Normally with the --sysroot flag we would find unistd.h in the sdk directory in the sysroot: $ find [snip]/sdk/sysroots -path '*/usr/include/unistd.h' [snip]/sdk/sysroots/cortexa8hf-neon-poky-linux-gnueabi/usr/include/unistd.h The perf Makefile adds CC = $(CROSS_COMPILE)gcc if and only if CC is not already set, and it compiles correctly with the above toolchain. So, generalize the logic that perf uses in the common Makefile and remove the manual CC = $(CROSS_COMPILE)gcc lines from each Makefile. Note that this patch does not fix cross-compile for all the tools (some have other bugs), but it does fix it for all except usb and acpi, which still have other unrelated issues. I tested both with and without the patch on native and cross-build and there appear to be no regressions. Link: http://lkml.kernel.org/r/20180107214028.23771-1-martin@martingkelly.com Signed-off-by: Martin Kelly <martin@martingkelly.com> Acked-by: Mark Brown <broonie@kernel.org> Cc: Tejun Heo <tj@kernel.org> Cc: Li Zefan <lizefan@huawei.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Stephen Hemminger <sthemmin@microsoft.com> Cc: Jonathan Cameron <jic23@kernel.org> Cc: Pali Rohar <pali.rohar@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Robert Moore <robert.moore@intel.com> Cc: Lv Zheng <lv.zheng@intel.com> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Valentina Manea <valentina.manea.m@gmail.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Mario Limonciello <mario.limonciello@dell.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
af3e79d295
commit
7ed1c1901f
13 changed files with 18 additions and 22 deletions
|
@ -1,7 +1,6 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
# Makefile for cgroup tools
|
# Makefile for cgroup tools
|
||||||
|
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
CFLAGS = -Wall -Wextra
|
CFLAGS = -Wall -Wextra
|
||||||
|
|
||||||
all: cgroup_event_listener
|
all: cgroup_event_listener
|
||||||
|
|
|
@ -12,8 +12,6 @@ endif
|
||||||
# (this improves performance and avoids hard-to-debug behaviour);
|
# (this improves performance and avoids hard-to-debug behaviour);
|
||||||
MAKEFLAGS += -r
|
MAKEFLAGS += -r
|
||||||
|
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
LD = $(CROSS_COMPILE)ld
|
|
||||||
CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include
|
CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include
|
||||||
|
|
||||||
ALL_TARGETS := lsgpio gpio-hammer gpio-event-mon
|
ALL_TARGETS := lsgpio gpio-hammer gpio-event-mon
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
# Makefile for Hyper-V tools
|
# Makefile for Hyper-V tools
|
||||||
|
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
WARNINGS = -Wall -Wextra
|
WARNINGS = -Wall -Wextra
|
||||||
CFLAGS = $(WARNINGS) -g $(shell getconf LFS_CFLAGS)
|
CFLAGS = $(WARNINGS) -g $(shell getconf LFS_CFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -12,8 +12,6 @@ endif
|
||||||
# (this improves performance and avoids hard-to-debug behaviour);
|
# (this improves performance and avoids hard-to-debug behaviour);
|
||||||
MAKEFLAGS += -r
|
MAKEFLAGS += -r
|
||||||
|
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
LD = $(CROSS_COMPILE)ld
|
|
||||||
CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include
|
CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include
|
||||||
|
|
||||||
ALL_TARGETS := iio_event_monitor lsiio iio_generic_buffer
|
ALL_TARGETS := iio_event_monitor lsiio iio_generic_buffer
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
PREFIX ?= /usr
|
PREFIX ?= /usr
|
||||||
SBINDIR ?= sbin
|
SBINDIR ?= sbin
|
||||||
INSTALL ?= install
|
INSTALL ?= install
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
|
|
||||||
TARGET = freefall
|
TARGET = freefall
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
# Makefile for LEDs tools
|
# Makefile for LEDs tools
|
||||||
|
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
CFLAGS = -Wall -Wextra -g -I../../include/uapi
|
CFLAGS = -Wall -Wextra -g -I../../include/uapi
|
||||||
|
|
||||||
all: uledmon led_hw_brightness_mon
|
all: uledmon led_hw_brightness_mon
|
||||||
|
|
|
@ -146,12 +146,6 @@ define allow-override
|
||||||
$(eval $(1) = $(2)))
|
$(eval $(1) = $(2)))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# Allow setting CC and AR and LD, or setting CROSS_COMPILE as a prefix.
|
|
||||||
$(call allow-override,CC,$(CROSS_COMPILE)gcc)
|
|
||||||
$(call allow-override,AR,$(CROSS_COMPILE)ar)
|
|
||||||
$(call allow-override,LD,$(CROSS_COMPILE)ld)
|
|
||||||
$(call allow-override,CXX,$(CROSS_COMPILE)g++)
|
|
||||||
|
|
||||||
LD += $(EXTRA_LDFLAGS)
|
LD += $(EXTRA_LDFLAGS)
|
||||||
|
|
||||||
HOSTCC ?= gcc
|
HOSTCC ?= gcc
|
||||||
|
|
|
@ -56,9 +56,6 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||||
# to compile vs uClibc, that can be done here as well.
|
# to compile vs uClibc, that can be done here as well.
|
||||||
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
|
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
|
||||||
CROSS_COMPILE ?= $(CROSS)
|
CROSS_COMPILE ?= $(CROSS)
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
LD = $(CROSS_COMPILE)gcc
|
|
||||||
STRIP = $(CROSS_COMPILE)strip
|
|
||||||
HOSTCC = gcc
|
HOSTCC = gcc
|
||||||
|
|
||||||
# check if compiler option is supported
|
# check if compiler option is supported
|
||||||
|
|
|
@ -42,6 +42,24 @@ EXTRA_WARNINGS += -Wformat
|
||||||
|
|
||||||
CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?)
|
CC_NO_CLANG := $(shell $(CC) -dM -E -x c /dev/null | grep -Fq "__clang__"; echo $$?)
|
||||||
|
|
||||||
|
# Makefiles suck: This macro sets a default value of $(2) for the
|
||||||
|
# variable named by $(1), unless the variable has been set by
|
||||||
|
# environment or command line. This is necessary for CC and AR
|
||||||
|
# because make sets default values, so the simpler ?= approach
|
||||||
|
# won't work as expected.
|
||||||
|
define allow-override
|
||||||
|
$(if $(or $(findstring environment,$(origin $(1))),\
|
||||||
|
$(findstring command line,$(origin $(1)))),,\
|
||||||
|
$(eval $(1) = $(2)))
|
||||||
|
endef
|
||||||
|
|
||||||
|
# Allow setting various cross-compile vars or setting CROSS_COMPILE as a prefix.
|
||||||
|
$(call allow-override,CC,$(CROSS_COMPILE)gcc)
|
||||||
|
$(call allow-override,AR,$(CROSS_COMPILE)ar)
|
||||||
|
$(call allow-override,LD,$(CROSS_COMPILE)ld)
|
||||||
|
$(call allow-override,CXX,$(CROSS_COMPILE)g++)
|
||||||
|
$(call allow-override,STRIP,$(CROSS_COMPILE)strip)
|
||||||
|
|
||||||
ifeq ($(CC_NO_CLANG), 1)
|
ifeq ($(CC_NO_CLANG), 1)
|
||||||
EXTRA_WARNINGS += -Wstrict-aliasing=3
|
EXTRA_WARNINGS += -Wstrict-aliasing=3
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -11,8 +11,6 @@ endif
|
||||||
# (this improves performance and avoids hard-to-debug behaviour);
|
# (this improves performance and avoids hard-to-debug behaviour);
|
||||||
MAKEFLAGS += -r
|
MAKEFLAGS += -r
|
||||||
|
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
LD = $(CROSS_COMPILE)ld
|
|
||||||
CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include
|
CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include
|
||||||
|
|
||||||
ALL_TARGETS := spidev_test spidev_fdx
|
ALL_TARGETS := spidev_test spidev_fdx
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
# Makefile for USB tools
|
# Makefile for USB tools
|
||||||
|
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
PTHREAD_LIBS = -lpthread
|
PTHREAD_LIBS = -lpthread
|
||||||
WARNINGS = -Wall -Wextra
|
WARNINGS = -Wall -Wextra
|
||||||
CFLAGS = $(WARNINGS) -g -I../include
|
CFLAGS = $(WARNINGS) -g -I../include
|
||||||
|
|
|
@ -6,7 +6,6 @@ TARGETS=page-types slabinfo page_owner_sort
|
||||||
LIB_DIR = ../lib/api
|
LIB_DIR = ../lib/api
|
||||||
LIBS = $(LIB_DIR)/libapi.a
|
LIBS = $(LIB_DIR)/libapi.a
|
||||||
|
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
CFLAGS = -Wall -Wextra -I../lib/
|
CFLAGS = -Wall -Wextra -I../lib/
|
||||||
LDFLAGS = $(LIBS)
|
LDFLAGS = $(LIBS)
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ PREFIX ?= /usr
|
||||||
SBINDIR ?= sbin
|
SBINDIR ?= sbin
|
||||||
INSTALL ?= install
|
INSTALL ?= install
|
||||||
CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include
|
CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include
|
||||||
CC = $(CROSS_COMPILE)gcc
|
|
||||||
|
|
||||||
TARGET = dell-smbios-example
|
TARGET = dell-smbios-example
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue