Changes in Makefile

eb9b9a6f - tools: Drop nonsensical -O6

Sun, 08 Sep 2024 18:46:41 +0000

tools: Drop nonsensical -O6-O6 is very much not-a-thing. Really, this should've been droppedentirely in 49b3cd306e60b9d8 ("tools: Set the maximum optimization levelaccording to the compiler being used") instead of just passing it fornot-Clang.Just collapse it down to -O3, instead of "-O6 unless Clang, in which case-O3".GCC interprets > -O3 as -O3. It doesn't even interpret > -O3 as -Ofast,which is a good thing, given -Ofast has specific (non-)requirements forcode built using it. So, this does nothing except look a bit daft.Remove the silliness and also save a few lines in the Makefiles accordingly.Reviewed-by: Ian Rogers Reviewed-by: Jesper Juhl Signed-off-by: Sam James Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Bill Wendling Cc: Ingo Molnar Cc: Jiri Olsa Cc: Justin Stitt Cc: Kan Liang Cc: Mark Rutland Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Peter Zijlstra Cc: llvm@lists.linux.devLink: https://lore.kernel.org/r/4f01524fa4ea91c7146a41e26ceaf9dae4c127e4.1725821201.git.sam@gentoo.orgSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

96f30c8f - tools build: Correct libsubcmd fixdep dependencies

Mon, 15 Jul 2024 20:32:42 +0000

tools build: Correct libsubcmd fixdep dependenciesAll built targets need fixdep to be built first, before handling objectdependencies [1]. We're missing one such dependency before the libsubcmdtarget.This resolves .cmd file generation issues such that the followingsequence produces many fewer results: $ git clean -xfd tools/ $ make tools/objtool $ grep "cannot find fixdep" $(find tools/objtool -name '*.cmd')In particular, only a buggy tools/objtool/libsubcmd/.fixdep.o.cmdremains, due to circular dependencies of fixdep on itself.Such incomplete .cmd files don't usually cause a direct problem, sincethey're designed to fail "open", but they can cause some subtle problemsthat would otherwise be handled by proper fixdep'd dependency files. [2][1] This problem is better described in commit abb26210a395 ("perftools: Force fixdep compilation at the start of the build"). I don'tapply its solution here, because additional recursive make can be a bitof overkill.[2] Example failure case: cp -arl linux-src linux-src2 cd linux-src2 make O=/path/to/out cd ../linux-src rm -rf ../linux-src2 make O=/path/to/outPreviously, we'd see errors like: make[6]: *** No rule to make target '/path/to/linux-src2/tools/include/linux/compiler.h', needed by '/path/to/out/tools/bpf/resolve_btfids/libsubcmd/exec-cmd.o'. Stop.Now, the properly-fixdep'd .cmd files will ignore a missing/path/to/linux-src2/...Signed-off-by: Brian Norris Acked-by: Jiri Olsa Cc: Ian Rogers Cc: Josh Poimboeuf Cc: Masahiro Yamada Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Thomas Richter Link: https://lore.kernel.org/all/ZGVi9HbI43R5trN8@bhelgaas/Link: https://lore.kernel.org/all/Zk-C5Eg84yt6_nml@google.com/Link: https://lore.kernel.org/r/20240715203325.3832977-2-briannorris@chromium.orgSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

5d890591 - tools lib subcmd: Add dependency test to install_headers

Fri, 02 Dec 2022 04:57:41 +0000

tools lib subcmd: Add dependency test to install_headersCompute the headers to be installed from their source headers and makeeach have its own build target to install it. Using dependenciesavoids headers being reinstalled and getting a new timestamp whichthen causes files that depend on the header to be rebuilt.Signed-off-by: Ian Rogers Cc: Alexander Shishkin Cc: Ingo Molnar Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Mark Rutland Cc: Masahiro Yamada Cc: Namhyung Kim Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Nicolas Schier Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Rix Cc: bpf@vger.kernel.orgCc: llvm@lists.linux.devLink: https://lore.kernel.org/r/20221202045743.2639466-4-irogers@google.comSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

77dce689 - tools lib subcmd: Make install_headers clearer

Thu, 17 Nov 2022 00:43:55 +0000

tools lib subcmd: Make install_headers clearerAdd libsubcmd to the name so that this install_headers build appearsdifferent to similar targets in different libraries.Signed-off-by: Ian Rogers Cc: Alexander Shishkin Cc: Alexei Starovoitov Cc: Andrii Nakryiko Cc: Daniel Borkmann Cc: Hao Luo Cc: Ingo Molnar Cc: Jiri Olsa Cc: John Fastabend Cc: KP Singh Cc: Mark Rutland Cc: Martin KaFai Lau Cc: Masahiro Yamada Cc: Namhyung Kim Cc: Nicolas Schier Cc: Peter Zijlstra Cc: Song Liu Cc: Stanislav Fomichev Cc: Stephane Eranian Cc: Yonghong Song Cc: bpf@vger.kernel.orgLink: https://lore.kernel.org/r/20221117004356.279422-6-irogers@google.comSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

630ae80e - tools lib subcmd: Add install target

Wed, 09 Nov 2022 18:49:02 +0000

tools lib subcmd: Add install targetThis allows libsubcmd to be installed as a dependency.Signed-off-by: Ian Rogers Acked-by: Namhyung Kim Cc: Alexander Shishkin Cc: Andrii Nakryiko Cc: Jiri Olsa Cc: Mark Rutland Cc: Masahiro Yamada Cc: Nick Desaulniers Cc: Nicolas Schier Cc: Peter Zijlstra Cc: Stephane Eranian Cc: bpf@vger.kernel.orgLink: http://lore.kernel.org/lkml/20221109184914.1357295-3-irogers@google.comSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

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

Fri, 11 Feb 2022 05:14:11 +0000

kbuild: replace $(if A,A,B) with $(or A,B)$(or ...) is available since GNU Make 3.81, and useful to shorten thecode 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 becauseGNU 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: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/tools/lib/subcmd/Makefile

22bd8f1b - libsubcmd: Use -O0 with DEBUG=1

Mon, 28 Oct 2019 11:34:01 +0000

libsubcmd: Use -O0 with DEBUG=1When a 'make DEBUG=1' build is done, the command parser is still builtwith -O6 and is hard to step through, fix it making it use -O0 in thatcase.Signed-off-by: James Clark Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: nd Link: http://lore.kernel.org/lkml/20191028113340.4282-1-james.clark@arm.com[ split from a larger patch ]Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

d894967f - libsubcmd: Move EXTRA_FLAGS to the end to allow overriding existing flags

Mon, 28 Oct 2019 11:34:01 +0000

libsubcmd: Move EXTRA_FLAGS to the end to allow overriding existing flagsMove EXTRA_WARNINGS and EXTRA_FLAGS to the end of the compilation line,otherwise they cannot be used to override the default values.Signed-off-by: James Clark Cc: Adrian Hunter Cc: Ian Rogers Cc: James Clark Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: nd Link: http://lore.kernel.org/lkml/20191028113340.4282-1-james.clark@arm.com[ split from a larger patch ]Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

4b0b2b09 - libsubcmd: Make _FORTIFY_SOURCE defines dependent on the feature

Wed, 25 Sep 2019 19:59:23 +0000

libsubcmd: Make _FORTIFY_SOURCE defines dependent on the featureUnconditionally defining _FORTIFY_SOURCE can break tools that don't workwith it, such as memory sanitizers: https://github.com/google/sanitizers/wiki/AddressSanitizer#faqFixes: 4b6ab94eabe4 ("perf subcmd: Create subcmd library")Signed-off-by: Ian Rogers Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lore.kernel.org/lkml/20190925195924.152834-1-irogers@google.comSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

ece98049 - tools lib subcmd: Don't add the kernel sources to the include path

Tue, 11 Dec 2018 18:00:52 +0000

tools lib subcmd: Don't add the kernel sources to the include pathAt some point we decided not to directly include kernel sources fileswhen building tools/perf/, but when tools/lib/subcmd/ was forked fromtools/perf it somehow ended up adding it via these two lines in itsMakefile: CFLAGS += -I$(srctree)/include/uapi CFLAGS += -I$(srctree)/includeAs $(srctree) points to the kernel sources.Removing those lines and keeping just: CFLAGS += -I$(srctree)/tools/include/Is enough to build tools/perf and tools/objtool.This fixes the build when building from the sources in environments suchas the Android NDK crossbuilding from a fedora:26 system: subcmd-util.h:11:15: error: expected ',' or ';' before 'void' static inline void report(const char *prefix, const char *err, va_list params) ^ In file included from /git/perf/include/uapi/linux/stddef.h:2:0, from /git/perf/include/uapi/linux/posix_types.h:5, from /opt/android-ndk-r12b/platforms/android-24/arch-arm/usr/include/sys/types.h:36, from /opt/android-ndk-r12b/platforms/android-24/arch-arm/usr/include/unistd.h:33, from run-command.c:2: subcmd-util.h:18:17: error: '__no_instrument_function__' attribute applies only to functionsThe /opt/android-ndk-r12b/platforms/android-24/arch-arm/usr/include/sys/types.hfile that includes linux/posix_types.h ends up getting the one in the kernelsources causing the breakage. Fix it.Test built tools/objtool/ too.Reported-by: Jiri Olsa Tested-by: Jiri Olsa Cc: Adrian Hunter Cc: Josh Poimboeuf Cc: Namhyung Kim Fixes: 4b6ab94eabe4 ("perf subcmd: Create subcmd library")Link: https://lkml.kernel.org/n/tip-5lhaoecrj12t0bqwvpiu14sm@git.kernel.orgSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

b2441318 - License cleanup: add SPDX GPL-2.0 license identifier to files with no license

Wed, 01 Nov 2017 14:07:57 +0000

License cleanup: add SPDX GPL-2.0 license identifier to files with no licenseMany source files in the tree are missing licensing information, whichmakes it harder for compliance tools to determine the correct license.By default all files without license information are under the defaultlicense of the kernel, which is GPL version 2.Update the files which contain no license information with the 'GPL-2.0'SPDX license identifier. The SPDX identifier is a legally bindingshorthand, which can be used instead of the full boiler plate text.This patch is based on work done by Thomas Gleixner and Kate Stewart andPhilippe Ombredanne.How this work was done:Patches were generated and checked against linux-4.14-rc6 for a subset ofthe use cases: - file had no licensing information it it. - file was a */uapi/* one with no licensing information in it, - file was a */uapi/* one with existing licensing information,Further patches will be generated in subsequent months to fix up caseswhere non-standard license headers were used, and references to licensehad to be inferred by heuristics based on keywords.The analysis to determine which SPDX License Identifier to be applied toa file was done in a spreadsheet of side by side results from of theoutput of two independent scanners (ScanCode & Windriver) producing SPDXtag:value files created by Philippe Ombredanne. Philippe prepared thebase worksheet, and did an initial spot review of a few 1000 files.The 4.13 kernel was the starting point of the analysis with 60,537 filesassessed. Kate Stewart did a file by file comparison of the scannerresults in the spreadsheet to determine which SPDX license identifier(s)to be applied to the file. She confirmed any determination that was notimmediately clear with lawyers working with the Linux Foundation.Criteria used to select files for SPDX license identifier tagging was: - Files considered eligible had to be source code files. - Make and config files were included as candidates if they contained >5 lines of source - File already had some variant of a license header in it (even if <5 lines).All documentation files were explicitly excluded.The following heuristics were used to determine which SPDX licenseidentifiers to apply. - when both scanners couldn't find any license traces, file was considered to have no license information in it, and the top level COPYING file license applied. For non */uapi/* files that summary was: SPDX license identifier # files ---------------------------------------------------|------- GPL-2.0 11139 and resulted in the first patch in this series. If that file was a */uapi/* path one, it was "GPL-2.0 WITH Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was: SPDX license identifier # files ---------------------------------------------------|------- GPL-2.0 WITH Linux-syscall-note 930 and resulted in the second patch in this series. - if a file had some form of licensing information in it, and was one of the */uapi/* ones, it was denoted with the Linux-syscall-note if any GPL family license was found in the file or had no licensing in it (per prior point). Results summary: SPDX license identifier # files ---------------------------------------------------|------ GPL-2.0 WITH Linux-syscall-note 270 GPL-2.0+ WITH Linux-syscall-note 169 ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21 ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17 LGPL-2.1+ WITH Linux-syscall-note 15 GPL-1.0+ WITH Linux-syscall-note 14 ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5 LGPL-2.0+ WITH Linux-syscall-note 4 LGPL-2.1 WITH Linux-syscall-note 3 ((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3 ((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1 and that resulted in the third patch in this series. - when the two scanners agreed on the detected license(s), that became the concluded license(s). - when there was disagreement between the two scanners (one detected a license but the other didn't, or they both detected different licenses) a manual inspection of the file occurred. - In most cases a manual inspection of the information in the file resulted in a clear resolution of the license that should apply (and which scanner probably needed to revisit its heuristics). - When it was not immediately clear, the license identifier was confirmed with lawyers working with the Linux Foundation. - If there was any question as to the appropriate license identifier, the file was flagged for further research and to be revisited later in time.In total, over 70 hours of logged manual review was done on thespreadsheet to determine the SPDX license identifiers to apply to thesource files by Kate, Philippe, Thomas and, in some cases, confirmationby lawyers working with the Linux Foundation.Kate also obtained a third independent scan of the 4.13 code base fromFOSSology, and compared selected files where the other two scannersdisagreed against that SPDX file, to see if there was new insights. TheWindriver scanner is based on an older version of FOSSology in part, sothey are related.Thomas did random spot checks in about 500 files from the spreadsheetsfor the uapi headers and agreed with SPDX license identifier in thefiles he inspected. For the non-uapi files Thomas did random spot checksin about 15000 files.In initial set of patches against 4.14-rc6, 3 files were found to havecopy/paste license identifier errors, and have been fixed to reflect thecorrect identifier.Additionally Philippe spent 10 hours this week doing a detailed manualinspection and review of the 12,461 patched files from the initial patchversion early this week with: - a full scancode scan run, collecting the matched texts, detected license ids and scores - reviewing anything where there was a license detected (about 500+ files) to ensure that the applied SPDX license was correct - reviewing anything where there was no detection but the patch license was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied SPDX license was correctThis produced a worksheet with 20 files needing minor correction. Thisworksheet was then exported into 3 different .csv files for thedifferent types of files to be modified.These .csv files were then reviewed by Greg. Thomas wrote a script toparse the csv files and add the proper SPDX tag to the file, in theformat that the file expected. This script was further refined by Gregbased on the output to detect more types of files automatically and todistinguish between header and source .c files (which need differentcomment types.) Finally Greg ran the script using the .csv files togenerate the patches.Reviewed-by: Kate Stewart Reviewed-by: Philippe Ombredanne Reviewed-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman List of files: /linux-6.15/tools/lib/subcmd/Makefile

3866058e - perf tools: Robustify detection of clang binary

Sun, 27 Aug 2017 07:54:40 +0000

perf tools: Robustify detection of clang binaryPrior to this patch, make scripts tested for CLANG with ifeq ($(CC),clang), failing to detect CLANG binaries with different names. Fix it bytesting for the existence of __clang__ macro in the list of compilerdefined macros.Signed-off-by: David Carrillo-Cisneros Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Paul Turner Cc: Stephane Eranian Link: http://lkml.kernel.org/r/20170827075442.108534-5-davidcc@google.comSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

49b3cd30 - tools: Set the maximum optimization level according to the compiler being used

Tue, 14 Feb 2017 13:55:27 +0000

tools: Set the maximum optimization level according to the compiler being usedTo avoid this when using clang: warning: optimization level '-O6' is not supported; using '-O3' insteadCc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-kaghp8ddvzdsg03putemcq96@git.kernel.orgSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

e19b7cee - make use of make variable CURDIR instead of calling pwd

Tue, 22 Nov 2016 08:30:26 +0000

make use of make variable CURDIR instead of calling pwdmake already provides the current working directory in a variable, so makeuse of it instead of forking a shell. Also replace usage of PWD byCURDIR. PWD is provided by most shells, but not all, so this makes thebuild system more robust.Signed-off-by: Uwe Kleine-König Signed-off-by: Michal Marek List of files: /linux-6.15/tools/lib/subcmd/Makefile

fd01d06a - tools lib subcmd: Respect WERROR=0 for build

Fri, 01 Jul 2016 05:12:33 +0000

tools lib subcmd: Respect WERROR=0 for buildthis enables the workaround for compilers that generate warnings whencompiling libsubcmd.Signed-off-by: Chris Phlipot Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1467349955-1135-3-git-send-email-cphlipot0@gmail.comSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

ca70c24f - tools: Move utilities.mak from perf to tools/scripts/

Fri, 18 Mar 2016 16:57:20 +0000

tools: Move utilities.mak from perf to tools/scripts/As it is used by several other tools, better move it outside tools/perf.Cc: Adrian Hunter Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-34s9kue3xq9w5mijdmfrfx8s@git.kernel.orgSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile

c1d45c3a - objtool: Support CROSS_COMPILE

Thu, 03 Mar 2016 00:39:37 +0000

objtool: Support CROSS_COMPILEWhen building with CONFIG_STACK_VALIDATION on a ppc64le host with an x86cross-compiler, Stephen Rothwell saw the following objtool build errors: DESCEND objtool CC /home/sfr/next/x86_64_allmodconfig/tools/objtool/builtin-check.o CC /home/sfr/next/x86_64_allmodconfig/tools/objtool/special.o CC /home/sfr/next/x86_64_allmodconfig/tools/objtool/elf.o CC /home/sfr/next/x86_64_allmodconfig/tools/objtool/objtool.o MKDIR /home/sfr/next/x86_64_allmodconfig/tools/objtool/arch/x86/insn/ CC /home/sfr/next/x86_64_allmodconfig/tools/objtool/libstring.o elf.c:22:23: fatal error: sys/types.h: No such file or directory compilation terminated. CC /home/sfr/next/x86_64_allmodconfig/tools/objtool/exec-cmd.o CC /home/sfr/next/x86_64_allmodconfig/tools/objtool/help.o builtin-check.c:28:20: fatal error: string.h: No such file or directory compilation terminated. objtool.c:28:19: fatal error: stdio.h: No such file or directory compilation terminated.It fails to build because it tries to compile objtool with thecross-compiler instead of the host compiler.Ensure that it always uses the host compiler by ignoring CROSS_COMPILE.In order to do that properly, the libsubcmd.a library needs to be builtin tools/objtool/ rather than tools/lib/subcmd/. The latter directorycontains the cross-compiled version which is needed for perf andpossibly other tools.Note that cross-compiling for x86 on a _big_ endian system would resultin a bunch of false positive objtool warnings during the kernel buildbecause it isn't endian-aware. But that's generally a rare edge caseand there haven't been any reports of anybody needing that.Reported-by: Stephen Rothwell Signed-off-by: Josh Poimboeuf Cc: Adrian Hunter Cc: Linus Torvalds Cc: Masami Hiramatsu Cc: Michael Ellerman Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/55b63eefc347f1bb28573f972d8d1adbf1f1c31d.1456962210.git.jpoimboe@redhat.comSigned-off-by: Ingo Molnar List of files: /linux-6.15/tools/lib/subcmd/Makefile

4b6ab94e - perf subcmd: Create subcmd library

Tue, 15 Dec 2015 15:39:39 +0000

perf subcmd: Create subcmd libraryMove the subcommand-related files from perf to a new library namedlibsubcmd.a.Since we're moving files anyway, go ahead and rename 'exec_cmd.*' to'exec-cmd.*' to be consistent with the naming of all the other files.Signed-off-by: Josh Poimboeuf Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/c0a838d4c878ab17fee50998811612b2281355c1.1450193761.git.jpoimboe@redhat.comSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux-6.15/tools/lib/subcmd/Makefile