Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jiri Olsa and committed by
Arnaldo Carvalho de Melo
2fedf79b a5ba0a1a

+126 -126
+6 -6
tools/build/Build.include
··· 72 72 # target, or command line has changed and update 73 73 # dependencies in the cmd file 74 74 if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)), \ 75 - @set -e; \ 76 - $(echo-cmd) $(cmd_$(1)) && $(dep-cmd)) 75 + @set -e; \ 76 + $(echo-cmd) $(cmd_$(1)) && $(dep-cmd)) 77 77 78 78 # if_changed - execute command if any prerequisite is newer than 79 79 # target, or command line has changed 80 - if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ 81 - @set -e; \ 82 - $(echo-cmd) $(cmd_$(1)); \ 83 - printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd) 80 + if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ 81 + @set -e; \ 82 + $(echo-cmd) $(cmd_$(1)); \ 83 + printf '%s\n' 'cmd_$@ := $(make-cmd)' > $(dot-target).cmd) 84 84 85 85 ### 86 86 # C flags to be used in rule definitions, includes:
+69 -69
tools/build/Makefile.feature
··· 27 27 # the rule that uses them - an example for that is the 'bionic' 28 28 # feature check. ] 29 29 # 30 - FEATURE_TESTS_BASIC := \ 31 - backtrace \ 32 - dwarf \ 33 - dwarf_getlocations \ 34 - fortify-source \ 35 - sync-compare-and-swap \ 36 - glibc \ 37 - gtk2 \ 38 - gtk2-infobar \ 39 - libaudit \ 40 - libbfd \ 41 - libelf \ 42 - libelf-getphdrnum \ 43 - libelf-gelf_getnote \ 44 - libelf-getshdrstrndx \ 45 - libelf-mmap \ 46 - libnuma \ 47 - numa_num_possible_cpus \ 48 - libperl \ 49 - libpython \ 50 - libpython-version \ 51 - libslang \ 52 - libcrypto \ 53 - libunwind \ 54 - libunwind-x86 \ 55 - libunwind-x86_64 \ 56 - libunwind-arm \ 57 - libunwind-aarch64 \ 58 - pthread-attr-setaffinity-np \ 59 - stackprotector-all \ 60 - timerfd \ 61 - libdw-dwarf-unwind \ 62 - zlib \ 63 - lzma \ 64 - get_cpuid \ 65 - bpf \ 66 - sdt 30 + FEATURE_TESTS_BASIC := \ 31 + backtrace \ 32 + dwarf \ 33 + dwarf_getlocations \ 34 + fortify-source \ 35 + sync-compare-and-swap \ 36 + glibc \ 37 + gtk2 \ 38 + gtk2-infobar \ 39 + libaudit \ 40 + libbfd \ 41 + libelf \ 42 + libelf-getphdrnum \ 43 + libelf-gelf_getnote \ 44 + libelf-getshdrstrndx \ 45 + libelf-mmap \ 46 + libnuma \ 47 + numa_num_possible_cpus \ 48 + libperl \ 49 + libpython \ 50 + libpython-version \ 51 + libslang \ 52 + libcrypto \ 53 + libunwind \ 54 + libunwind-x86 \ 55 + libunwind-x86_64 \ 56 + libunwind-arm \ 57 + libunwind-aarch64 \ 58 + pthread-attr-setaffinity-np \ 59 + stackprotector-all \ 60 + timerfd \ 61 + libdw-dwarf-unwind \ 62 + zlib \ 63 + lzma \ 64 + get_cpuid \ 65 + bpf \ 66 + sdt 67 67 68 68 # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list 69 69 # of all feature tests 70 - FEATURE_TESTS_EXTRA := \ 71 - bionic \ 72 - compile-32 \ 73 - compile-x32 \ 74 - cplus-demangle \ 75 - hello \ 76 - libbabeltrace \ 77 - liberty \ 78 - liberty-z \ 79 - libunwind-debug-frame \ 80 - libunwind-debug-frame-arm \ 81 - libunwind-debug-frame-aarch64 70 + FEATURE_TESTS_EXTRA := \ 71 + bionic \ 72 + compile-32 \ 73 + compile-x32 \ 74 + cplus-demangle \ 75 + hello \ 76 + libbabeltrace \ 77 + liberty \ 78 + liberty-z \ 79 + libunwind-debug-frame \ 80 + libunwind-debug-frame-arm \ 81 + libunwind-debug-frame-aarch64 82 82 83 83 FEATURE_TESTS ?= $(FEATURE_TESTS_BASIC) 84 84 ··· 86 86 FEATURE_TESTS := $(FEATURE_TESTS_BASIC) $(FEATURE_TESTS_EXTRA) 87 87 endif 88 88 89 - FEATURE_DISPLAY ?= \ 90 - dwarf \ 91 - dwarf_getlocations \ 92 - glibc \ 93 - gtk2 \ 94 - libaudit \ 95 - libbfd \ 96 - libelf \ 97 - libnuma \ 98 - numa_num_possible_cpus \ 99 - libperl \ 100 - libpython \ 101 - libslang \ 102 - libcrypto \ 103 - libunwind \ 104 - libdw-dwarf-unwind \ 105 - zlib \ 106 - lzma \ 107 - get_cpuid \ 108 - bpf 89 + FEATURE_DISPLAY ?= \ 90 + dwarf \ 91 + dwarf_getlocations \ 92 + glibc \ 93 + gtk2 \ 94 + libaudit \ 95 + libbfd \ 96 + libelf \ 97 + libnuma \ 98 + numa_num_possible_cpus \ 99 + libperl \ 100 + libpython \ 101 + libslang \ 102 + libcrypto \ 103 + libunwind \ 104 + libdw-dwarf-unwind \ 105 + zlib \ 106 + lzma \ 107 + get_cpuid \ 108 + bpf 109 109 110 110 # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features. 111 111 # If in the future we need per-feature checks/flags for features not
+51 -51
tools/build/feature/Makefile
··· 1 - FILES= \ 2 - test-all.bin \ 3 - test-backtrace.bin \ 4 - test-bionic.bin \ 5 - test-dwarf.bin \ 6 - test-dwarf_getlocations.bin \ 7 - test-fortify-source.bin \ 8 - test-sync-compare-and-swap.bin \ 9 - test-glibc.bin \ 10 - test-gtk2.bin \ 11 - test-gtk2-infobar.bin \ 12 - test-hello.bin \ 13 - test-libaudit.bin \ 14 - test-libbfd.bin \ 15 - test-liberty.bin \ 16 - test-liberty-z.bin \ 17 - test-cplus-demangle.bin \ 18 - test-libelf.bin \ 19 - test-libelf-getphdrnum.bin \ 20 - test-libelf-gelf_getnote.bin \ 21 - test-libelf-getshdrstrndx.bin \ 22 - test-libelf-mmap.bin \ 23 - test-libnuma.bin \ 24 - test-numa_num_possible_cpus.bin \ 25 - test-libperl.bin \ 26 - test-libpython.bin \ 27 - test-libpython-version.bin \ 28 - test-libslang.bin \ 29 - test-libcrypto.bin \ 30 - test-libunwind.bin \ 31 - test-libunwind-debug-frame.bin \ 32 - test-libunwind-x86.bin \ 33 - test-libunwind-x86_64.bin \ 34 - test-libunwind-arm.bin \ 35 - test-libunwind-aarch64.bin \ 36 - test-libunwind-debug-frame-arm.bin \ 37 - test-libunwind-debug-frame-aarch64.bin \ 38 - test-pthread-attr-setaffinity-np.bin \ 39 - test-stackprotector-all.bin \ 40 - test-timerfd.bin \ 41 - test-libdw-dwarf-unwind.bin \ 42 - test-libbabeltrace.bin \ 43 - test-compile-32.bin \ 44 - test-compile-x32.bin \ 45 - test-zlib.bin \ 46 - test-lzma.bin \ 47 - test-bpf.bin \ 48 - test-get_cpuid.bin \ 49 - test-sdt.bin \ 50 - test-cxx.bin \ 51 - test-jvmti.bin 1 + FILES= \ 2 + test-all.bin \ 3 + test-backtrace.bin \ 4 + test-bionic.bin \ 5 + test-dwarf.bin \ 6 + test-dwarf_getlocations.bin \ 7 + test-fortify-source.bin \ 8 + test-sync-compare-and-swap.bin \ 9 + test-glibc.bin \ 10 + test-gtk2.bin \ 11 + test-gtk2-infobar.bin \ 12 + test-hello.bin \ 13 + test-libaudit.bin \ 14 + test-libbfd.bin \ 15 + test-liberty.bin \ 16 + test-liberty-z.bin \ 17 + test-cplus-demangle.bin \ 18 + test-libelf.bin \ 19 + test-libelf-getphdrnum.bin \ 20 + test-libelf-gelf_getnote.bin \ 21 + test-libelf-getshdrstrndx.bin \ 22 + test-libelf-mmap.bin \ 23 + test-libnuma.bin \ 24 + test-numa_num_possible_cpus.bin \ 25 + test-libperl.bin \ 26 + test-libpython.bin \ 27 + test-libpython-version.bin \ 28 + test-libslang.bin \ 29 + test-libcrypto.bin \ 30 + test-libunwind.bin \ 31 + test-libunwind-debug-frame.bin \ 32 + test-libunwind-x86.bin \ 33 + test-libunwind-x86_64.bin \ 34 + test-libunwind-arm.bin \ 35 + test-libunwind-aarch64.bin \ 36 + test-libunwind-debug-frame-arm.bin \ 37 + test-libunwind-debug-frame-aarch64.bin \ 38 + test-pthread-attr-setaffinity-np.bin \ 39 + test-stackprotector-all.bin \ 40 + test-timerfd.bin \ 41 + test-libdw-dwarf-unwind.bin \ 42 + test-libbabeltrace.bin \ 43 + test-compile-32.bin \ 44 + test-compile-x32.bin \ 45 + test-zlib.bin \ 46 + test-lzma.bin \ 47 + test-bpf.bin \ 48 + test-get_cpuid.bin \ 49 + test-sdt.bin \ 50 + test-cxx.bin \ 51 + test-jvmti.bin 52 52 53 53 FILES := $(addprefix $(OUTPUT),$(FILES)) 54 54