Commit 5c816641 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: replace $(if A,A,B) with $(or A,B) 



$(or ...) is available since GNU Make 3.81, and useful to shorten the
code in some places.

Covert as follows:

  $(if A,A,B)  -->  $(or A,B)

This patch also converts:

  $(if A, A, B) --> $(or A, B)

Strictly speaking, the latter is not an equivalent conversion because
GNU Make keeps spaces after commas; if A is not empty, $(if A, A, B)
expands to " A", while $(or A, B) expands to "A".

Anyway, preceding spaces are not significant in the code hunks I touched.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNicolas Schier <nicolas@fjasle.eu>
parent f67695c9

Makefile

+4 −4
Original line number Diff line number Diff line
@@ -1240,8 +1240,8 @@ define filechk_version.h 
	echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)

endef



$(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0)

$(version_h): SUBLEVEL := $(if $(SUBLEVEL), $(SUBLEVEL), 0)

$(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0)

$(version_h): SUBLEVEL := $(or $(SUBLEVEL), 0)

$(version_h): FORCE

	$(call filechk,version.h)
@@ -1624,7 +1624,7 @@ help: 
	@$(MAKE) -f $(srctree)/Documentation/Makefile dochelp

	@echo  ''

	@echo  'Architecture specific targets ($(SRCARCH)):'

	@$(if $(archhelp),$(archhelp),\

	@$(or $(archhelp),\

		echo '  No architecture specific help defined for $(SRCARCH)')

	@echo  ''

	@$(if $(boards), \
@@ -1841,7 +1841,7 @@ $(clean-dirs): 


clean: $(clean-dirs)

	$(call cmd,rmfiles)

	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \

	@find $(or $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \

		\( -name '*.[aios]' -o -name '*.ko' -o -name '.*.cmd' \

		-o -name '*.ko.*' \

		-o -name '*.dtb' -o -name '*.dtbo' -o -name '*.dtb.S' -o -name '*.dt.yaml' \

scripts/Makefile.build

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ include $(srctree)/scripts/Makefile.compiler 


# The filename Kbuild has precedence over Makefile

kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))

kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)

include $(kbuild-file)

include $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefile)



include $(srctree)/scripts/Makefile.lib

scripts/Makefile.clean

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ include $(srctree)/scripts/Kbuild.include 


# The filename Kbuild has precedence over Makefile

kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))

include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)

include $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefile)



# Figure out what we need to build from the various variables

# ==========================================================================

scripts/Makefile.lib

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ subdir-ym := $(addprefix $(obj)/,$(subdir-ym)) 
modname-multi = $(sort $(foreach m,$(multi-obj-ym),\

		$(if $(filter $*.o, $(call suffix-search, $m, .o, -objs -y -m)),$(m:.o=))))



__modname = $(if $(modname-multi),$(modname-multi),$(basetarget))

__modname = $(or $(modname-multi),$(basetarget))



modname = $(subst $(space),:,$(__modname))

modfile = $(addprefix $(obj)/,$(__modname))
@@ -434,7 +434,7 @@ MKIMAGE := $(srctree)/scripts/mkuboot.sh 
# SRCARCH just happens to match slightly more than ARCH (on sparc), so reduces

# the number of overrides in arch makefiles

UIMAGE_ARCH ?= $(SRCARCH)

UIMAGE_COMPRESSION ?= $(if $(2),$(2),none)

UIMAGE_COMPRESSION ?= $(or $(2),none)

UIMAGE_OPTS-y ?=

UIMAGE_TYPE ?= kernel

UIMAGE_LOADADDR ?= arch_must_set_this

tools/bpf/bpftool/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ CFLAGS += -O2 
CFLAGS += -W -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers

CFLAGS += $(filter-out -Wswitch-enum -Wnested-externs,$(EXTRA_WARNINGS))

CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \

	-I$(if $(OUTPUT),$(OUTPUT),.) \

	-I$(or $(OUTPUT),.) \

	-I$(LIBBPF_INCLUDE) \

	-I$(srctree)/kernel/bpf/ \

	-I$(srctree)/tools/include \
@@ -186,7 +186,7 @@ endif 


$(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUTPUT)vmlinux.h $(LIBBPF_BOOTSTRAP)

	$(QUIET_CLANG)$(CLANG) \

		-I$(if $(OUTPUT),$(OUTPUT),.) \

		-I$(or $(OUTPUT),.) \

		-I$(srctree)/tools/include/uapi/ \

		-I$(LIBBPF_BOOTSTRAP_INCLUDE) \

		-g -O2 -Wall -target bpf -c $< -o $@