hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools build: Move tabs to spaces where suitable 

We've been hit several times by a Makefile bug where line indented by
tab was falsely considered as target command.

We prevent this by always using space indentation for everything except
for the target commands.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1480884178-8072-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2016-12-04 21:42:53 +01:00 committed by Arnaldo Carvalho de Melo
parent a5ba0a1a5a
commit 2fedf79b69
3 changed files with 126 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/build/Build.include
View File

@ -72,15 +72,15 @@ dep-cmd = $(if $(wildcard $(fixdep)),
# target, or command line has changed and update # target, or command line has changed and update
# dependencies in the cmd file # dependencies in the cmd file
if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)), \ if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)), \
@set -e; \ @set -e; \
$(echo-cmd) $(cmd_$(1)) && $(dep-cmd)) $(echo-cmd) $(cmd_$(1)) && $(dep-cmd))
# if_changed - execute command if any prerequisite is newer than # if_changed - execute command if any prerequisite is newer than
# target, or command line has changed # target, or command line has changed
if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \
@set -e; \ @set -e; \
$(echo-cmd) $(cmd_$(1)); \ $(echo-cmd) $(cmd_$(1)); \
printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd) printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd)
### ###
# C flags to be used in rule definitions, includes: # C flags to be used in rule definitions, includes:

138
tools/build/Makefile.feature
View File

@ -27,58 +27,58 @@ endef
# the rule that uses them - an example for that is the 'bionic' # the rule that uses them - an example for that is the 'bionic'
# feature check. ] # feature check. ]
# #
FEATURE_TESTS_BASIC := \ FEATURE_TESTS_BASIC := \
backtrace \ backtrace \
dwarf \ dwarf \
dwarf_getlocations \ dwarf_getlocations \
fortify-source \ fortify-source \
sync-compare-and-swap \ sync-compare-and-swap \
glibc \ glibc \
gtk2 \ gtk2 \
gtk2-infobar \ gtk2-infobar \
libaudit \ libaudit \
libbfd \ libbfd \
libelf \ libelf \
libelf-getphdrnum \ libelf-getphdrnum \
libelf-gelf_getnote \ libelf-gelf_getnote \
libelf-getshdrstrndx \ libelf-getshdrstrndx \
libelf-mmap \ libelf-mmap \
libnuma \ libnuma \
numa_num_possible_cpus \ numa_num_possible_cpus \
libperl \ libperl \
libpython \ libpython \
libpython-version \ libpython-version \
libslang \ libslang \
libcrypto \ libcrypto \
libunwind \ libunwind \
libunwind-x86 \ libunwind-x86 \
libunwind-x86_64 \ libunwind-x86_64 \
libunwind-arm \ libunwind-arm \
libunwind-aarch64 \ libunwind-aarch64 \
pthread-attr-setaffinity-np \ pthread-attr-setaffinity-np \
stackprotector-all \ stackprotector-all \
timerfd \ timerfd \
libdw-dwarf-unwind \ libdw-dwarf-unwind \
zlib \ zlib \
lzma \ lzma \
get_cpuid \ get_cpuid \
bpf \ bpf \
sdt sdt
# FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list
# of all feature tests # of all feature tests
FEATURE_TESTS_EXTRA := \ FEATURE_TESTS_EXTRA := \
bionic \ bionic \
compile-32 \ compile-32 \
compile-x32 \ compile-x32 \
cplus-demangle \ cplus-demangle \
hello \ hello \
libbabeltrace \ libbabeltrace \
liberty \ liberty \
liberty-z \ liberty-z \
libunwind-debug-frame \ libunwind-debug-frame \
libunwind-debug-frame-arm \ libunwind-debug-frame-arm \
libunwind-debug-frame-aarch64 libunwind-debug-frame-aarch64
FEATURE_TESTS ?= $(FEATURE_TESTS_BASIC) FEATURE_TESTS ?= $(FEATURE_TESTS_BASIC)
@ -86,26 +86,26 @@ ifeq ($(FEATURE_TESTS),all)
FEATURE_TESTS := $(FEATURE_TESTS_BASIC) $(FEATURE_TESTS_EXTRA) FEATURE_TESTS := $(FEATURE_TESTS_BASIC) $(FEATURE_TESTS_EXTRA)
endif endif
FEATURE_DISPLAY ?= \ FEATURE_DISPLAY ?= \
dwarf \ dwarf \
dwarf_getlocations \ dwarf_getlocations \
glibc \ glibc \
gtk2 \ gtk2 \
libaudit \ libaudit \
libbfd \ libbfd \
libelf \ libelf \
libnuma \ libnuma \
numa_num_possible_cpus \ numa_num_possible_cpus \
libperl \ libperl \
libpython \ libpython \
libslang \ libslang \
libcrypto \ libcrypto \
libunwind \ libunwind \
libdw-dwarf-unwind \ libdw-dwarf-unwind \
zlib \ zlib \
lzma \ lzma \
get_cpuid \ get_cpuid \
bpf bpf
# Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features. # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.
# If in the future we need per-feature checks/flags for features not # If in the future we need per-feature checks/flags for features not

102
tools/build/feature/Makefile
View File

@ -1,54 +1,54 @@
FILES= \ FILES= \
test-all.bin \ test-all.bin \
test-backtrace.bin \ test-backtrace.bin \
test-bionic.bin \ test-bionic.bin \
test-dwarf.bin \ test-dwarf.bin \
test-dwarf_getlocations.bin \ test-dwarf_getlocations.bin \
test-fortify-source.bin \ test-fortify-source.bin \
test-sync-compare-and-swap.bin \ test-sync-compare-and-swap.bin \
test-glibc.bin \ test-glibc.bin \
test-gtk2.bin \ test-gtk2.bin \
test-gtk2-infobar.bin \ test-gtk2-infobar.bin \
test-hello.bin \ test-hello.bin \
test-libaudit.bin \ test-libaudit.bin \
test-libbfd.bin \ test-libbfd.bin \
test-liberty.bin \ test-liberty.bin \
test-liberty-z.bin \ test-liberty-z.bin \
test-cplus-demangle.bin \ test-cplus-demangle.bin \
test-libelf.bin \ test-libelf.bin \
test-libelf-getphdrnum.bin \ test-libelf-getphdrnum.bin \
test-libelf-gelf_getnote.bin \ test-libelf-gelf_getnote.bin \
test-libelf-getshdrstrndx.bin \ test-libelf-getshdrstrndx.bin \
test-libelf-mmap.bin \ test-libelf-mmap.bin \
test-libnuma.bin \ test-libnuma.bin \
test-numa_num_possible_cpus.bin \ test-numa_num_possible_cpus.bin \
test-libperl.bin \ test-libperl.bin \
test-libpython.bin \ test-libpython.bin \
test-libpython-version.bin \ test-libpython-version.bin \
test-libslang.bin \ test-libslang.bin \
test-libcrypto.bin \ test-libcrypto.bin \
test-libunwind.bin \ test-libunwind.bin \
test-libunwind-debug-frame.bin \ test-libunwind-debug-frame.bin \
test-libunwind-x86.bin \ test-libunwind-x86.bin \
test-libunwind-x86_64.bin \ test-libunwind-x86_64.bin \
test-libunwind-arm.bin \ test-libunwind-arm.bin \
test-libunwind-aarch64.bin \ test-libunwind-aarch64.bin \
test-libunwind-debug-frame-arm.bin \ test-libunwind-debug-frame-arm.bin \
test-libunwind-debug-frame-aarch64.bin \ test-libunwind-debug-frame-aarch64.bin \
test-pthread-attr-setaffinity-np.bin \ test-pthread-attr-setaffinity-np.bin \
test-stackprotector-all.bin \ test-stackprotector-all.bin \
test-timerfd.bin \ test-timerfd.bin \
test-libdw-dwarf-unwind.bin \ test-libdw-dwarf-unwind.bin \
test-libbabeltrace.bin \ test-libbabeltrace.bin \
test-compile-32.bin \ test-compile-32.bin \
test-compile-x32.bin \ test-compile-x32.bin \
test-zlib.bin \ test-zlib.bin \
test-lzma.bin \ test-lzma.bin \
test-bpf.bin \ test-bpf.bin \
test-get_cpuid.bin \ test-get_cpuid.bin \
test-sdt.bin \ test-sdt.bin \
test-cxx.bin \ test-cxx.bin \
test-jvmti.bin test-jvmti.bin
FILES := $(addprefix $(OUTPUT),$(FILES)) FILES := $(addprefix $(OUTPUT),$(FILES))