Skip to contentSkip to conversation

Enable objtool multiarch build

PATCH In review Matt Helsley 4 participants 14 messages May 19, 2020 – May 27, 2020 objtool

lore
Share & tools
lore
#0 lore raw

cover Enable objtool multiarch build

As a necessary first step to adding new architecture and subcommand support to objtool enabling building of objtool for more than the x86 architecture.

Some folks have been working on enabling objtool checking functionality for arm64. Rather than repeat that work here this minimal set does not port the existing commands but replaces them with weak, not-implemented versions which exit with status 127. On x86 the check and orc subcommands will still build and operate correctly while on other architectures the commands will exit with status 127. This allows future changes to port the check command to arm64 or add new subcommands such as mcount to replace the separate recordmcount tool.

Since the series does not add support for stack validation or checking to any new architectures there's no reason to make KConfig or Makefile changes which would normally be used to test this. So I've been forcing builds of objtool with:

make O=build-foo ARCH=foo CROSS_COMPILE=foo-linux-gnu- defconfig make O=build-foo ARCH=foo CROSS_COMPILE=foo-linux-gnu- tools/objtool

And running the resulting binary to verify that it shows all objtoo subcommands are supported on x86 and unsupported on other archs.

Changes since RFC[1]:
- Removed the arch/missing pattern and put everything in weak.c (Julien Thierry and Josh Poimboeuf)
- Kept arch.h, special, etc. in the top level objtool dir (Julien)
- Dropped the patch reporting which subcommands are missing in --help output
- Postponed the rela patch
Josh asked to rename a bunch of these variables and suggested an untested improvement. Since they're necessary for recordmcount but not the current arch built support we can drop them from this set.
- Misc: Removed else (Josh) and updated the commit messages (Julien)
- Cleaned up includes
Moved the prototypes for the command entry functions and other functions that weak symbols need to be consistent with into objtool.h. (Josh)

Tested with cross-compilation for sparc, arm64, s390, and powerpc

[1] https://lore.kernel.org/lkml/[email protected]/

Matt Helsley (3):
objtool: Exit successfully when requesting help
objtool: Move struct objtool_file into arch-independent header
objtool: Enable compilation of objtool for all architectures

 tools/objtool/Build           | 13 +++++++++----
 tools/objtool/Makefile        | 11 ++++++++++-
 tools/objtool/arch.h          |  4 +++-
 tools/objtool/builtin-check.c |  2 +-
 tools/objtool/builtin-orc.c   |  3 +--
 tools/objtool/check.c         |  4 ++--
 tools/objtool/check.h         | 12 ------------
 tools/objtool/objtool.c       |  4 +++-
 tools/objtool/objtool.h       | 34 ++++++++++++++++++++++++++++++++++
 tools/objtool/orc.h           | 18 ------------------
 tools/objtool/orc_dump.c      |  3 ++-
 tools/objtool/orc_gen.c       |  1 -
 tools/objtool/weak.c          | 35 +++++++++++++++++++++++++++++++++++
 13 files changed, 100 insertions(+), 44 deletions(-)
 create mode 100644 tools/objtool/objtool.h
 delete mode 100644 tools/objtool/orc.h
 create mode 100644 tools/objtool/weak.c

base-commit: bba413deb1065f1291cb1f366247513f11215520

Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/3 objtool: Exit successfully when requesting help

When the user requests help it's not an error so do not exit with a non-zero exit code. This is not especially useful for a user but any script that might wish to check that objtool --help is at least available can't rely on the exit code to crudely check that, for example, building an objtool executable succeeds.

---
 tools/objtool/objtool.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/objtool/objtool.c +3 -1
index 0b3528f05053..58fdda510653 100644
@@ -58,7 +58,9 @@ static void cmd_usage(void)
 
 	printf("\n");
 
-	exit(129);
+	if (!help)
+		exit(129);
+	exit(0);
 }
 
 static void handle_options(int *argc, const char ***argv)
Signature · 1 line
2.20.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] objtool: Exit successfully when requesting help

Quoted 7 lines · Matt Helsley

When the user requests help it's not an error so do not exit with a non-zero exit code. This is not especially useful for a user but any script that might wish to check that objtool --help is at least available can't rely on the exit code to crudely check that, for example, building an objtool executable succeeds.

Signature · 1 line
Kamalesh
#3 lore raw

PATCH 2/3 objtool: Move struct objtool_file into arch-independent header

In reply to Matt Helsley

The objtool_file structure describes the files objtool works on, is used by the check subcommand, and the check.h header is included by the orc subcommands so it's presently used by all subcommands.

Since the structure will be useful in all subcommands besides check, and some subcommands may not want to include check.h to get the definition, split the structure out into a new header meant for use by all objtool subcommands.

---
 tools/objtool/check.h   | 10 +---------
 tools/objtool/objtool.h | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 tools/objtool/objtool.h
tools/objtool/check.h +1 -9
index 24280227ef21..3b59a1cbcff5 100644
@@ -7,11 +7,10 @@
 #define _CHECK_H
 
 #include <stdbool.h>
-#include "elf.h"
+#include "objtool.h"
 #include "cfi.h"
 #include "arch.h"
 #include "orc.h"
-#include <linux/hashtable.h>
 
 struct insn_state {
 	struct cfi_state cfi;
@@ -48,13 +47,6 @@ struct instruction {
 	struct orc_entry orc;
 };
 
-struct objtool_file {
-	struct elf *elf;
-	struct list_head insn_list;
-	DECLARE_HASHTABLE(insn_hash, 20);
-	bool ignore_unreachables, c_file, hints, rodata;
-};
-
 int check(const char *objname, bool orc);
 
 struct instruction *find_insn(struct objtool_file *file,
tools/objtool/objtool.h new file +20 -0
new file mode 100644
index 000000000000..afa52fe6f644
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2020 Matt Helsley <[email protected]>
+ */
+
+#ifndef _OBJTOOL_H
+#define _OBJTOOL_H
+#include <stdbool.h>
+#include <linux/list.h>
+#include <linux/hashtable.h>
+
+#include "elf.h"
+
+struct objtool_file {
+	struct elf *elf;
+	struct list_head insn_list;
+	DECLARE_HASHTABLE(insn_hash, 20);
+	bool ignore_unreachables, c_file, hints, rodata;
+};
+#endif
Signature · 1 line
2.20.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] objtool: Move struct objtool_file into arch-independent header

Quoted 10 lines · Matt Helsley

The objtool_file structure describes the files objtool works on, is used by the check subcommand, and the check.h header is included by the orc subcommands so it's presently used by all subcommands.

Since the structure will be useful in all subcommands besides check, and some subcommands may not want to include check.h to get the definition, split the structure out into a new header meant for use by all objtool subcommands.

Signature · 1 line
Julien Thierry
Reviewed-by on v1 2/3
#5 lore raw

Re: [PATCH 2/3] objtool: Move struct objtool_file into arch-independent header

In reply to Matt Helsley
Quoted 10 lines · Matt Helsley

The objtool_file structure describes the files objtool works on, is used by the check subcommand, and the check.h header is included by the orc subcommands so it's presently used by all subcommands.

Since the structure will be useful in all subcommands besides check, and some subcommands may not want to include check.h to get the definition, split the structure out into a new header meant for use by all objtool subcommands.

Signature · 1 line
Kamalesh
#6 lore raw

PATCH 3/3 objtool: Enable compilation of objtool for all architectures

In reply to Matt Helsley

objtool currently only compiles for x86 architectures. This is fine as it presently does not support tooling for other architectures. However, we would like to be able to convert other kernel tools to run as objtool sub commands because they too process ELF object files. This will allow us to convert tools such as recordmcount to use objtool's ELF code.

Since much of recordmcount's ELF code is copy-paste code to/from a variety of other kernel tools (look at modpost for example) this means that if we can convert recordmcount we can convert more.

We define "missing" weak definitions for subcommand entry functions and other weak definitions for shared functions critical to building existing subcommands. These return 127 when the command is missing which signify tools that do not exist on all architectures. In this case the "check" and "orc" tools do not exist on all architectures so we only add them for x86. Future changes adding support for "check", to arm64 for example, can then modify the SUBCMD_CHECK variable when building for arm64.

objtool is not currently wired in to KConfig to be built for other architectures because it's not needed for those architectures and there are no commands it supports other than those for x86. As more command support is enabled on various architectures the necessary KConfig changes can be made (e.g. adding "STACK_VALIDATION") to trigger building objtool.

Cc Julien Thierry <[email protected]>
---
 tools/objtool/Build           | 13 +++++++++----
 tools/objtool/Makefile        | 11 ++++++++++-
 tools/objtool/arch.h          |  4 +++-
 tools/objtool/builtin-check.c |  2 +-
 tools/objtool/builtin-orc.c   |  3 +--
 tools/objtool/check.c         |  4 ++--
 tools/objtool/check.h         |  4 ----
 tools/objtool/objtool.h       | 14 ++++++++++++++
 tools/objtool/orc.h           | 18 ------------------
 tools/objtool/orc_dump.c      |  3 ++-
 tools/objtool/orc_gen.c       |  1 -
 tools/objtool/weak.c          | 35 +++++++++++++++++++++++++++++++++++
 12 files changed, 77 insertions(+), 35 deletions(-)
 delete mode 100644 tools/objtool/orc.h
 create mode 100644 tools/objtool/weak.c
tools/objtool/Build +9 -4
index 66f44f5cd2a6..b7222d5cc7bc 100644
@@ -1,11 +1,16 @@
 objtool-y += arch/$(SRCARCH)/
+
+objtool-y += weak.o
+
+objtool-$(SUBCMD_CHECK) += check.o
+objtool-$(SUBCMD_CHECK) += special.o
+objtool-$(SUBCMD_ORC) += check.o
+objtool-$(SUBCMD_ORC) += orc_gen.o
+objtool-$(SUBCMD_ORC) += orc_dump.o
+
 objtool-y += builtin-check.o
 objtool-y += builtin-orc.o
-objtool-y += check.o
-objtool-y += orc_gen.o
-objtool-y += orc_dump.o
 objtool-y += elf.o
-objtool-y += special.o
 objtool-y += objtool.o
 
 objtool-y += libstring.o
tools/objtool/Makefile +10 -1
index 6b91388aecbb..12686e2f1a56 100644
@@ -46,7 +46,16 @@ elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E -
 CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
 
 AWK = awk
-export srctree OUTPUT CFLAGS SRCARCH AWK
+
+SUBCMD_CHECK := n
+SUBCMD_ORC := n
+
+ifeq ($(SRCARCH),x86)
+	SUBCMD_CHECK := y
+	SUBCMD_ORC := y
+endif
+
+export srctree OUTPUT CFLAGS SRCARCH AWK SUBCMD_CHECK SUBCMD_ORC
 include $(srctree)/tools/build/Makefile.include
 
 $(OBJTOOL_IN): fixdep FORCE
tools/objtool/arch.h +3 -1
index cd118eb4248a..eda15a5a285e 100644
@@ -8,9 +8,11 @@
 
 #include <stdbool.h>
 #include <linux/list.h>
-#include "elf.h"
+#include "objtool.h"
 #include "cfi.h"
 
+#include <asm/orc_types.h>
+
 enum insn_type {
 	INSN_JUMP_CONDITIONAL,
 	INSN_JUMP_UNCONDITIONAL,
tools/objtool/builtin-check.c +1 -1
index be42b716166b..7a44174967b5 100644
@@ -16,7 +16,7 @@
 #include <subcmd/parse-options.h>
 #include <string.h>
 #include "builtin.h"
-#include "check.h"
+#include "objtool.h"
 
 bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats, validate_dup, vmlinux;
 
tools/objtool/builtin-orc.c +1 -2
index 5f7cc6157edd..b1dfe2007962 100644
@@ -14,8 +14,7 @@
 
 #include <string.h>
 #include "builtin.h"
-#include "check.h"
-
+#include "objtool.h"
 
 static const char *orc_usage[] = {
 	"objtool orc generate [<options>] file.o",
tools/objtool/check.c +2 -2
index c735f73d271d..3065a1752fe6 100644
@@ -7,10 +7,10 @@
 #include <stdlib.h>
 
 #include "builtin.h"
+#include "cfi.h"
+#include "arch.h"
 #include "check.h"
-#include "elf.h"
 #include "special.h"
-#include "arch.h"
 #include "warn.h"
 
 #include <linux/hashtable.h>
tools/objtool/check.h +0 -4
index 3b59a1cbcff5..906b5210f7ca 100644
@@ -7,10 +7,8 @@
 #define _CHECK_H
 
 #include <stdbool.h>
-#include "objtool.h"
 #include "cfi.h"
 #include "arch.h"
-#include "orc.h"
 
 struct insn_state {
 	struct cfi_state cfi;
@@ -47,8 +45,6 @@ struct instruction {
 	struct orc_entry orc;
 };
 
-int check(const char *objname, bool orc);
-
 struct instruction *find_insn(struct objtool_file *file,
 			      struct section *sec, unsigned long offset);
 
tools/objtool/objtool.h +14 -0
index afa52fe6f644..6de791106537 100644
@@ -17,4 +17,18 @@ struct objtool_file {
 	DECLARE_HASHTABLE(insn_hash, 20);
 	bool ignore_unreachables, c_file, hints, rodata;
 };
+
+/*
+ * Prototypes for subcommands or their weak, "missing", alternatives.
+ * We use the missing_ prefix only for subcommand entry functions.
+ */
+int missing_check(const char *objname, bool orc);
+int check(const char *objname, bool orc);
+
+int missing_orc_dump(const char *objname);
+int orc_dump(const char *objname);
+
+int create_orc(struct objtool_file *file);
+int create_orc_sections(struct objtool_file *file);
+
 #endif
tools/objtool/orc.h deleted +0 -18
deleted file mode 100644
index ee2832221e62..000000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2017 Josh Poimboeuf <[email protected]>
- */
-
-#ifndef _ORC_H
-#define _ORC_H
-
-#include <asm/orc_types.h>
-
-struct objtool_file;
-
-int create_orc(struct objtool_file *file);
-int create_orc_sections(struct objtool_file *file);
-
-int orc_dump(const char *objname);
-
-#endif /* _ORC_H */
tools/objtool/orc_dump.c +2 -1
index ba4cbb1cdd63..fca46e006fc2 100644
@@ -4,7 +4,8 @@
  */
 
 #include <unistd.h>
-#include "orc.h"
+#include <asm/orc_types.h>
+#include "objtool.h"
 #include "warn.h"
 
 static const char *reg_name(unsigned int reg)
tools/objtool/orc_gen.c +0 -1
index 9d2bf2daaaa6..c9549988121a 100644
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "orc.h"
 #include "check.h"
 #include "warn.h"
 
tools/objtool/weak.c new file +35 -0
new file mode 100644
index 000000000000..c4e698f26f63
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2020 Matt Helsley <[email protected]>
+ * Weak definitions necessary to compile objtool without
+ * some subcommands (e.g. check, orc).
+ */
+
+#include <stdbool.h>
+#include "objtool.h"
+
+const char __attribute__ ((weak)) *objname;
+
+int missing_check(const char *_objname, bool orc)
+{
+	return 127;
+}
+
+int __attribute__ ((weak, alias("missing_check"))) check(const char *_objname, bool orc);
+
+int missing_orc_dump(const char *_objname)
+{
+	return 127;
+}
+
+int __attribute__ ((weak, alias("missing_orc_dump"))) orc_dump(const char *_objname);
+
+int __attribute__ ((weak)) create_orc(struct objtool_file *file)
+{
+	return 127;
+}
+
+int __attribute__ ((weak)) create_orc_sections(struct objtool_file *file)
+{
+	return 127;
+}
Signature · 1 line
2.20.1
#7 lore raw

Re: [PATCH 3/3] objtool: Enable compilation of objtool for all architectures

Quoted 15 lines · Matt Helsley
tools/objtool/weak.c new file +15 -0
+const char __attribute__ ((weak)) *objname;
+
+int missing_check(const char *_objname, bool orc)
+{
+	return 127;
+}
+
+int __attribute__ ((weak, alias("missing_check"))) check(const char *_objname, bool orc);
+
+int missing_orc_dump(const char *_objname)
+{
+	return 127;
+}
+
+int __attribute__ ((weak, alias("missing_orc_dump"))) orc_dump(const char *_objname);

tools/objtool/weak.c line 35

Quoted 10 lines
tools/objtool/weak.c new file +10 -0
+
+int __attribute__ ((weak)) create_orc(struct objtool_file *file)
+{
+	return 127;
+}
+
+int __attribute__ ((weak)) create_orc_sections(struct objtool_file *file)
+{
+	return 127;
+}

I think the aliased "missing_" functions are no longer needed, right? i.e. can we just have weak versions of check() and orc_dump()?

Otherwise everything looks good to me.

Signature · 1 line
Josh
#8 lore raw

Re: [PATCH 3/3] objtool: Enable compilation of objtool for all architectures

Quoted 21 lines · Josh Poimboeuf
Quoted 20 lines · Matt Helsley
tools/objtool/weak.c new file +20 -0
+const char __attribute__ ((weak)) *objname;
+
+int missing_check(const char *_objname, bool orc)
+{
+	return 127;
+}
+
+int __attribute__ ((weak, alias("missing_check"))) check(const char *_objname, bool orc);
+
+int missing_orc_dump(const char *_objname)
+{
+	return 127;
+}
+
+int __attribute__ ((weak, alias("missing_orc_dump"))) orc_dump(const char *_objname);
+
+int __attribute__ ((weak)) create_orc(struct objtool_file *file)
+{
+	return 127;
+}
Quoted 8 lines

tools/objtool/weak.c line 35

Quoted 5 lines
tools/objtool/weak.c new file +5 -0
+
+int __attribute__ ((weak)) create_orc_sections(struct objtool_file *file)
+{
+	return 127;
+}

I think the aliased "missing_" functions are no longer needed, right? i.e. can we just have weak versions of check() and orc_dump()?

Oops, Yeah, we can remove those aliases. I can fix and resend this one if you like.

Quoted 1 line

Otherwise everything looks good to me.

Excellent. I'm thinking I'll get the relocs patches posted as an RFC next...

Cheers,
-Matt

#9 lore raw

Re: [PATCH 3/3] objtool: Enable compilation of objtool for all architectures

Quoted 31 lines · Matt Helsley
Quoted 21 lines · Josh Poimboeuf
Quoted 20 lines · Matt Helsley
(quoted diff) +20 -0
+const char __attribute__ ((weak)) *objname;
+
+int missing_check(const char *_objname, bool orc)
+{
+	return 127;
+}
+
+int __attribute__ ((weak, alias("missing_check"))) check(const char *_objname, bool orc);
+
+int missing_orc_dump(const char *_objname)
+{
+	return 127;
+}
+
+int __attribute__ ((weak, alias("missing_orc_dump"))) orc_dump(const char *_objname);
+
+int __attribute__ ((weak)) create_orc(struct objtool_file *file)
+{
+	return 127;
+}
Quoted 8 lines

Review

Quoted 5 lines
(quoted diff) +5 -0
+
+int __attribute__ ((weak)) create_orc_sections(struct objtool_file *file)
+{
+	return 127;
+}

I think the aliased "missing_" functions are no longer needed, right? i.e. can we just have weak versions of check() and orc_dump()?

Quoted 2 lines

Oops, Yeah, we can remove those aliases. I can fix and resend this one if you like.

I made that change along with Julien's suggestion, and also made a few other changes to the weak file: a __weak macro and some error messages.

Does this look ok?

From: Matt Helsley <[email protected]>
Subject: [PATCH] objtool: Enable compilation of objtool for all architectures

Objtool currently only compiles for x86 architectures. This is fine as it presently does not support tooling for other architectures. However, we would like to be able to convert other kernel tools to run as objtool sub commands because they too process ELF object files. This will allow us to convert tools such as recordmcount to use objtool's ELF code.

Since much of recordmcount's ELF code is copy-paste code to/from a variety of other kernel tools (look at modpost for example) this means that if we can convert recordmcount we can convert more.

We define weak definitions for subcommand entry functions and other weak definitions for shared functions critical to building existing subcommands. These return 127 when the command is missing which signify tools that do not exist on all architectures. In this case the "check" and "orc" tools do not exist on all architectures so we only add them for x86. Future changes adding support for "check", to arm64 for example, can then modify the SUBCMD_CHECK variable when building for arm64.

Objtool is not currently wired in to KConfig to be built for other architectures because it's not needed for those architectures and there are no commands it supports other than those for x86. As more command support is enabled on various architectures the necessary KConfig changes can be made (e.g. adding "STACK_VALIDATION") to trigger building objtool.

[ jpoimboe: remove aliases, add __weak macro, add error messages ]

---
 tools/objtool/Build           | 13 ++++++++----
 tools/objtool/Makefile        | 10 +++++++++
 tools/objtool/arch.h          |  4 +++-
 tools/objtool/builtin-check.c |  2 +-
 tools/objtool/builtin-orc.c   |  3 +--
 tools/objtool/check.c         |  4 ++--
 tools/objtool/check.h         |  4 ----
 tools/objtool/objtool.h       |  5 +++++
 tools/objtool/orc.h           | 18 ----------------
 tools/objtool/orc_dump.c      |  3 ++-
 tools/objtool/orc_gen.c       |  1 -
 tools/objtool/weak.c          | 40 +++++++++++++++++++++++++++++++++++
 12 files changed, 73 insertions(+), 34 deletions(-)
 delete mode 100644 tools/objtool/orc.h
 create mode 100644 tools/objtool/weak.c
tools/objtool/Build +9 -4
index 66f44f5cd2a6..b7222d5cc7bc 100644
@@ -1,11 +1,16 @@
 objtool-y += arch/$(SRCARCH)/
+
+objtool-y += weak.o
+
+objtool-$(SUBCMD_CHECK) += check.o
+objtool-$(SUBCMD_CHECK) += special.o
+objtool-$(SUBCMD_ORC) += check.o
+objtool-$(SUBCMD_ORC) += orc_gen.o
+objtool-$(SUBCMD_ORC) += orc_dump.o
+
 objtool-y += builtin-check.o
 objtool-y += builtin-orc.o
-objtool-y += check.o
-objtool-y += orc_gen.o
-objtool-y += orc_dump.o
 objtool-y += elf.o
-objtool-y += special.o
 objtool-y += objtool.o
 
 objtool-y += libstring.o
tools/objtool/Makefile +10 -0
index 6b91388aecbb..7770edcda3a0 100644
@@ -46,6 +46,16 @@ elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E -
 CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
 
 AWK = awk
+
+SUBCMD_CHECK := n
+SUBCMD_ORC := n
+
+ifeq ($(SRCARCH),x86)
+	SUBCMD_CHECK := y
+	SUBCMD_ORC := y
+endif
+
+export SUBCMD_CHECK SUBCMD_ORC
 export srctree OUTPUT CFLAGS SRCARCH AWK
 include $(srctree)/tools/build/Makefile.include
 
tools/objtool/arch.h +3 -1
index cd118eb4248a..eda15a5a285e 100644
@@ -8,9 +8,11 @@
 
 #include <stdbool.h>
 #include <linux/list.h>
-#include "elf.h"
+#include "objtool.h"
 #include "cfi.h"
 
+#include <asm/orc_types.h>
+
 enum insn_type {
 	INSN_JUMP_CONDITIONAL,
 	INSN_JUMP_UNCONDITIONAL,
tools/objtool/builtin-check.c +1 -1
index be42b716166b..7a44174967b5 100644
@@ -16,7 +16,7 @@
 #include <subcmd/parse-options.h>
 #include <string.h>
 #include "builtin.h"
-#include "check.h"
+#include "objtool.h"
 
 bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats, validate_dup, vmlinux;
 
tools/objtool/builtin-orc.c +1 -2
index 5f7cc6157edd..b1dfe2007962 100644
@@ -14,8 +14,7 @@
 
 #include <string.h>
 #include "builtin.h"
-#include "check.h"
-
+#include "objtool.h"
 
 static const char *orc_usage[] = {
 	"objtool orc generate [<options>] file.o",
tools/objtool/check.c +2 -2
index 7a47ff9d39f7..63d65a702900 100644
@@ -7,10 +7,10 @@
 #include <stdlib.h>
 
 #include "builtin.h"
+#include "cfi.h"
+#include "arch.h"
 #include "check.h"
-#include "elf.h"
 #include "special.h"
-#include "arch.h"
 #include "warn.h"
 
 #include <linux/hashtable.h>
tools/objtool/check.h +0 -4
index 3b59a1cbcff5..906b5210f7ca 100644
@@ -7,10 +7,8 @@
 #define _CHECK_H
 
 #include <stdbool.h>
-#include "objtool.h"
 #include "cfi.h"
 #include "arch.h"
-#include "orc.h"
 
 struct insn_state {
 	struct cfi_state cfi;
@@ -47,8 +45,6 @@ struct instruction {
 	struct orc_entry orc;
 };
 
-int check(const char *objname, bool orc);
-
 struct instruction *find_insn(struct objtool_file *file,
 			      struct section *sec, unsigned long offset);
 
tools/objtool/objtool.h +5 -0
index d89616b2ca39..528028a66816 100644
@@ -19,4 +19,9 @@ struct objtool_file {
 	bool ignore_unreachables, c_file, hints, rodata;
 };
 
+int check(const char *objname, bool orc);
+int orc_dump(const char *objname);
+int create_orc(struct objtool_file *file);
+int create_orc_sections(struct objtool_file *file);
+
 #endif /* _OBJTOOL_H */
tools/objtool/orc.h deleted +0 -18
deleted file mode 100644
index ee2832221e62..000000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2017 Josh Poimboeuf <[email protected]>
- */
-
-#ifndef _ORC_H
-#define _ORC_H
-
-#include <asm/orc_types.h>
-
-struct objtool_file;
-
-int create_orc(struct objtool_file *file);
-int create_orc_sections(struct objtool_file *file);
-
-int orc_dump(const char *objname);
-
-#endif /* _ORC_H */
tools/objtool/orc_dump.c +2 -1
index ba4cbb1cdd63..fca46e006fc2 100644
@@ -4,7 +4,8 @@
  */
 
 #include <unistd.h>
-#include "orc.h"
+#include <asm/orc_types.h>
+#include "objtool.h"
 #include "warn.h"
 
 static const char *reg_name(unsigned int reg)
tools/objtool/orc_gen.c +0 -1
index 9d2bf2daaaa6..c9549988121a 100644
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "orc.h"
 #include "check.h"
 #include "warn.h"
 
tools/objtool/weak.c new file +40 -0
new file mode 100644
index 000000000000..3c703811a2bc
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2020 Matt Helsley <[email protected]>
+ * Weak definitions necessary to compile objtool without
+ * some subcommands (e.g. check, orc).
+ */
+
+#include <stdbool.h>
+#include <errno.h>
+#include "objtool.h"
+
+#define __weak __attribute__((weak))
+
+#define UNSUPPORTED(cmd)						\
+({									\
+	fprintf(stderr, "error: objtool: " cmd " not implemented\n");	\
+	return ENOSYS;							\
+})
+
+const char __weak *objname;
+
+int __weak check(const char *_objname, bool orc)
+{
+	UNSUPPORTED("check subcommand");
+}
+
+int __weak orc_dump(const char *_objname)
+{
+	UNSUPPORTED("orc");
+}
+
+int __weak create_orc(struct objtool_file *file)
+{
+	UNSUPPORTED("orc");
+}
+
+int __weak create_orc_sections(struct objtool_file *file)
+{
+	UNSUPPORTED("orc");
+}
Signature · 1 line
2.21.1
#10 lore raw

Re: [PATCH 3/3] objtool: Enable compilation of objtool for all architectures

Quoted 15 lines · Josh Poimboeuf
Quoted 14 lines · Matt Helsley
Quoted 13 lines · Josh Poimboeuf

tools/objtool/weak.c

Quoted 12 lines · Matt Helsley
tools/objtool/weak.c new file +12 -0
+const char __attribute__ ((weak)) *objname;
+
+int missing_check(const char *_objname, bool orc)
+{
+	return 127;
+}
+
+int __attribute__ ((weak, alias("missing_check"))) check(const char *_objname, bool orc);
+
+int missing_orc_dump(const char *_objname)
+{
+	return 127;

Just a note in case anyone reviews this thread later:

I chose to return 127 rather than an errno value because it eventually gets set as the exit status and bash, at least, uses 127 for "function not defined". ENOSYS makes more sense internally and does "fit" as an exit status so changing to ENOSYS does make more sense.

Quoted 17 lines
Quoted 17 lines
Quoted 16 lines

tools/objtool/weak.c line 40

Quoted 13 lines
tools/objtool/weak.c new file +13 -0
+}
+
+int __attribute__ ((weak, alias("missing_orc_dump"))) orc_dump(const char *_objname);
+
+int __attribute__ ((weak)) create_orc(struct objtool_file *file)
+{
+	return 127;
+}
+
+int __attribute__ ((weak)) create_orc_sections(struct objtool_file *file)
+{
+	return 127;
+}

I think the aliased "missing_" functions are no longer needed, right? i.e. can we just have weak versions of check() and orc_dump()?

Quoted 7 lines
Quoted 2 lines

Oops, Yeah, we can remove those aliases. I can fix and resend this one if you like.

I made that change along with Julien's suggestion, and also made a few other changes to the weak file: a __weak macro and some error messages.

Does this look ok?

Yes, looks great to me. Thanks!

Quoted 298 lines

From: Matt Helsley <[email protected]>
Subject: [PATCH] objtool: Enable compilation of objtool for all architectures

Objtool currently only compiles for x86 architectures. This is fine as it presently does not support tooling for other architectures. However, we would like to be able to convert other kernel tools to run as objtool sub commands because they too process ELF object files. This will allow us to convert tools such as recordmcount to use objtool's ELF code.

Since much of recordmcount's ELF code is copy-paste code to/from a variety of other kernel tools (look at modpost for example) this means that if we can convert recordmcount we can convert more.

We define weak definitions for subcommand entry functions and other weak definitions for shared functions critical to building existing subcommands. These return 127 when the command is missing which signify tools that do not exist on all architectures. In this case the "check" and "orc" tools do not exist on all architectures so we only add them for x86. Future changes adding support for "check", to arm64 for example, can then modify the SUBCMD_CHECK variable when building for arm64.

Objtool is not currently wired in to KConfig to be built for other architectures because it's not needed for those architectures and there are no commands it supports other than those for x86. As more command support is enabled on various architectures the necessary KConfig changes can be made (e.g. adding "STACK_VALIDATION") to trigger building objtool.

[ jpoimboe: remove aliases, add __weak macro, add error messages ]

---
 tools/objtool/Build           | 13 ++++++++----
 tools/objtool/Makefile        | 10 +++++++++
 tools/objtool/arch.h          |  4 +++-
 tools/objtool/builtin-check.c |  2 +-
 tools/objtool/builtin-orc.c   |  3 +--
 tools/objtool/check.c         |  4 ++--
 tools/objtool/check.h         |  4 ----
 tools/objtool/objtool.h       |  5 +++++
 tools/objtool/orc.h           | 18 ----------------
 tools/objtool/orc_dump.c      |  3 ++-
 tools/objtool/orc_gen.c       |  1 -
 tools/objtool/weak.c          | 40 +++++++++++++++++++++++++++++++++++
 12 files changed, 73 insertions(+), 34 deletions(-)
 delete mode 100644 tools/objtool/orc.h
 create mode 100644 tools/objtool/weak.c
tools/objtool/Build +9 -4
index 66f44f5cd2a6..b7222d5cc7bc 100644
@@ -1,11 +1,16 @@
 objtool-y += arch/$(SRCARCH)/
+
+objtool-y += weak.o
+
+objtool-$(SUBCMD_CHECK) += check.o
+objtool-$(SUBCMD_CHECK) += special.o
+objtool-$(SUBCMD_ORC) += check.o
+objtool-$(SUBCMD_ORC) += orc_gen.o
+objtool-$(SUBCMD_ORC) += orc_dump.o
+
 objtool-y += builtin-check.o
 objtool-y += builtin-orc.o
-objtool-y += check.o
-objtool-y += orc_gen.o
-objtool-y += orc_dump.o
 objtool-y += elf.o
-objtool-y += special.o
 objtool-y += objtool.o
 
 objtool-y += libstring.o
tools/objtool/Makefile +10 -0
index 6b91388aecbb..7770edcda3a0 100644
@@ -46,6 +46,16 @@ elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E -
 CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
 
 AWK = awk
+
+SUBCMD_CHECK := n
+SUBCMD_ORC := n
+
+ifeq ($(SRCARCH),x86)
+	SUBCMD_CHECK := y
+	SUBCMD_ORC := y
+endif
+
+export SUBCMD_CHECK SUBCMD_ORC
 export srctree OUTPUT CFLAGS SRCARCH AWK
 include $(srctree)/tools/build/Makefile.include
 
tools/objtool/arch.h +3 -1
index cd118eb4248a..eda15a5a285e 100644
@@ -8,9 +8,11 @@
 
 #include <stdbool.h>
 #include <linux/list.h>
-#include "elf.h"
+#include "objtool.h"
 #include "cfi.h"
 
+#include <asm/orc_types.h>
+
 enum insn_type {
 	INSN_JUMP_CONDITIONAL,
 	INSN_JUMP_UNCONDITIONAL,
tools/objtool/builtin-check.c +1 -1
index be42b716166b..7a44174967b5 100644
@@ -16,7 +16,7 @@
 #include <subcmd/parse-options.h>
 #include <string.h>
 #include "builtin.h"
-#include "check.h"
+#include "objtool.h"
 
 bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats, validate_dup, vmlinux;
 
tools/objtool/builtin-orc.c +1 -2
index 5f7cc6157edd..b1dfe2007962 100644
@@ -14,8 +14,7 @@
 
 #include <string.h>
 #include "builtin.h"
-#include "check.h"
-
+#include "objtool.h"
 
 static const char *orc_usage[] = {
 	"objtool orc generate [<options>] file.o",
tools/objtool/check.c +2 -2
index 7a47ff9d39f7..63d65a702900 100644
@@ -7,10 +7,10 @@
 #include <stdlib.h>
 
 #include "builtin.h"
+#include "cfi.h"
+#include "arch.h"
 #include "check.h"
-#include "elf.h"
 #include "special.h"
-#include "arch.h"
 #include "warn.h"
 
 #include <linux/hashtable.h>
tools/objtool/check.h +0 -4
index 3b59a1cbcff5..906b5210f7ca 100644
@@ -7,10 +7,8 @@
 #define _CHECK_H
 
 #include <stdbool.h>
-#include "objtool.h"
 #include "cfi.h"
 #include "arch.h"
-#include "orc.h"
 
 struct insn_state {
 	struct cfi_state cfi;
@@ -47,8 +45,6 @@ struct instruction {
 	struct orc_entry orc;
 };
 
-int check(const char *objname, bool orc);
-
 struct instruction *find_insn(struct objtool_file *file,
 			      struct section *sec, unsigned long offset);
 
tools/objtool/objtool.h +5 -0
index d89616b2ca39..528028a66816 100644
@@ -19,4 +19,9 @@ struct objtool_file {
 	bool ignore_unreachables, c_file, hints, rodata;
 };
 
+int check(const char *objname, bool orc);
+int orc_dump(const char *objname);
+int create_orc(struct objtool_file *file);
+int create_orc_sections(struct objtool_file *file);
+
 #endif /* _OBJTOOL_H */
tools/objtool/orc.h deleted +0 -18
deleted file mode 100644
index ee2832221e62..000000000000
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2017 Josh Poimboeuf <[email protected]>
- */
-
-#ifndef _ORC_H
-#define _ORC_H
-
-#include <asm/orc_types.h>
-
-struct objtool_file;
-
-int create_orc(struct objtool_file *file);
-int create_orc_sections(struct objtool_file *file);
-
-int orc_dump(const char *objname);
-
-#endif /* _ORC_H */
tools/objtool/orc_dump.c +2 -1
index ba4cbb1cdd63..fca46e006fc2 100644
@@ -4,7 +4,8 @@
  */
 
 #include <unistd.h>
-#include "orc.h"
+#include <asm/orc_types.h>
+#include "objtool.h"
 #include "warn.h"
 
 static const char *reg_name(unsigned int reg)
tools/objtool/orc_gen.c +0 -1
index 9d2bf2daaaa6..c9549988121a 100644
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "orc.h"
 #include "check.h"
 #include "warn.h"
 
tools/objtool/weak.c new file +40 -0
new file mode 100644
index 000000000000..3c703811a2bc
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2020 Matt Helsley <[email protected]>
+ * Weak definitions necessary to compile objtool without
+ * some subcommands (e.g. check, orc).
+ */
+
+#include <stdbool.h>
+#include <errno.h>
+#include "objtool.h"
+
+#define __weak __attribute__((weak))
+
+#define UNSUPPORTED(cmd)						\
+({									\
+	fprintf(stderr, "error: objtool: " cmd " not implemented\n");	\
+	return ENOSYS;							\
+})
+
+const char __weak *objname;
+
+int __weak check(const char *_objname, bool orc)
+{
+	UNSUPPORTED("check subcommand");
+}
+
+int __weak orc_dump(const char *_objname)
+{
+	UNSUPPORTED("orc");
+}
+
+int __weak create_orc(struct objtool_file *file)
+{
+	UNSUPPORTED("orc");
+}
+
+int __weak create_orc_sections(struct objtool_file *file)
+{
+	UNSUPPORTED("orc");
+}
Signature · 1 line
2.21.1
Reviewed-by
#11 lore raw

Re: [PATCH 3/3] objtool: Enable compilation of objtool for all architectures

In reply to Josh Poimboeuf

[...]

Quoted 30 lines

From: Matt Helsley <[email protected]>
Subject: [PATCH] objtool: Enable compilation of objtool for all architectures

Objtool currently only compiles for x86 architectures. This is fine as it presently does not support tooling for other architectures. However, we would like to be able to convert other kernel tools to run as objtool sub commands because they too process ELF object files. This will allow us to convert tools such as recordmcount to use objtool's ELF code.

Since much of recordmcount's ELF code is copy-paste code to/from a variety of other kernel tools (look at modpost for example) this means that if we can convert recordmcount we can convert more.

We define weak definitions for subcommand entry functions and other weak definitions for shared functions critical to building existing subcommands. These return 127 when the command is missing which signify tools that do not exist on all architectures. In this case the "check" and "orc" tools do not exist on all architectures so we only add them for x86. Future changes adding support for "check", to arm64 for example, can then modify the SUBCMD_CHECK variable when building for arm64.

Objtool is not currently wired in to KConfig to be built for other architectures because it's not needed for those architectures and there are no commands it supports other than those for x86. As more command support is enabled on various architectures the necessary KConfig changes can be made (e.g. adding "STACK_VALIDATION") to trigger building objtool.

Quoted 5 lines

[ jpoimboe: remove aliases, add __weak macro, add error messages ]

A minor nit-pick in objtool.h

Quoted 1 line

---

[...]

Quoted 5 lines
tools/objtool/objtool.h +0 -0
index d89616b2ca39..528028a66816 100644

tools/objtool/objtool.h struct objtool_file { · line 27

Quoted 9 lines
tools/objtool/objtool.h +5 -0
@@ -19,4 +19,9 @@ struct objtool_file {
 	bool ignore_unreachables, c_file, hints, rodata;
 };
 
+int check(const char *objname, bool orc);
+int orc_dump(const char *objname);
+int create_orc(struct objtool_file *file);
+int create_orc_sections(struct objtool_file *file);
+
 #endif /* _OBJTOOL_H */

above hunk will not apply cleanly on patch 2 of the series, it expects a new line after struct objtool which is missing in patch 2.

Signature · 1 line
Kamalesh
#12 lore raw

Re: [PATCH 3/3] objtool: Enable compilation of objtool for all architectures

In reply to Matt Helsley
Quoted 80 lines · Matt Helsley

objtool currently only compiles for x86 architectures. This is fine as it presently does not support tooling for other architectures. However, we would like to be able to convert other kernel tools to run as objtool sub commands because they too process ELF object files. This will allow us to convert tools such as recordmcount to use objtool's ELF code.

Since much of recordmcount's ELF code is copy-paste code to/from a variety of other kernel tools (look at modpost for example) this means that if we can convert recordmcount we can convert more.

We define "missing" weak definitions for subcommand entry functions and other weak definitions for shared functions critical to building existing subcommands. These return 127 when the command is missing which signify tools that do not exist on all architectures. In this case the "check" and "orc" tools do not exist on all architectures so we only add them for x86. Future changes adding support for "check", to arm64 for example, can then modify the SUBCMD_CHECK variable when building for arm64.

objtool is not currently wired in to KConfig to be built for other architectures because it's not needed for those architectures and there are no commands it supports other than those for x86. As more command support is enabled on various architectures the necessary KConfig changes can be made (e.g. adding "STACK_VALIDATION") to trigger building objtool.

Cc Julien Thierry <[email protected]>
---
  tools/objtool/Build           | 13 +++++++++----
  tools/objtool/Makefile        | 11 ++++++++++-
  tools/objtool/arch.h          |  4 +++-
  tools/objtool/builtin-check.c |  2 +-
  tools/objtool/builtin-orc.c   |  3 +--
  tools/objtool/check.c         |  4 ++--
  tools/objtool/check.h         |  4 ----
  tools/objtool/objtool.h       | 14 ++++++++++++++
  tools/objtool/orc.h           | 18 ------------------
  tools/objtool/orc_dump.c      |  3 ++-
  tools/objtool/orc_gen.c       |  1 -
  tools/objtool/weak.c          | 35 +++++++++++++++++++++++++++++++++++
  12 files changed, 77 insertions(+), 35 deletions(-)

delete mode 100644 tools/objtool/orc.h
create mode 100644 tools/objtool/weak.c

tools/objtool/Build +9 -4
index 66f44f5cd2a6..b7222d5cc7bc 100644
@@ -1,11 +1,16 @@
  objtool-y += arch/$(SRCARCH)/
+
+objtool-y += weak.o
+
+objtool-$(SUBCMD_CHECK) += check.o
+objtool-$(SUBCMD_CHECK) += special.o
+objtool-$(SUBCMD_ORC) += check.o
+objtool-$(SUBCMD_ORC) += orc_gen.o
+objtool-$(SUBCMD_ORC) += orc_dump.o
+
  objtool-y += builtin-check.o
  objtool-y += builtin-orc.o
-objtool-y += check.o
-objtool-y += orc_gen.o
-objtool-y += orc_dump.o
  objtool-y += elf.o
-objtool-y += special.o
  objtool-y += objtool.o
 
  objtool-y += libstring.o
tools/objtool/Makefile +0 -1
index 6b91388aecbb..12686e2f1a56 100644
@@ -46,7 +46,16 @@ elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E -
  CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
 
  AWK = awk
-export srctree OUTPUT CFLAGS SRCARCH AWK

tools/objtool/Makefile elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - · line 58

Quoted 10 lines
tools/objtool/Makefile +10 -0
+
+SUBCMD_CHECK := n
+SUBCMD_ORC := n
+
+ifeq ($(SRCARCH),x86)
+	SUBCMD_CHECK := y
+	SUBCMD_ORC := y
+endif
+
+export srctree OUTPUT CFLAGS SRCARCH AWK SUBCMD_CHECK SUBCMD_ORC

Nit: I was thinking, since the list of SUBCMD_* is only going to grow
maybe it would be nicer to have a single export line for the SUBCMD_* variables and leave the export line of [srctree..AWK] untouched.

Just a suggestion, and only in case you respin this taking into account Josh's comment.

Otherwise things look good to me.

Cheers,

Signature · 1 line
Julien Thierry
#13 lore raw

Re: [PATCH 3/3] objtool: Enable compilation of objtool for all architectures

Quoted 87 lines · Julien Thierry
Quoted 84 lines · Matt Helsley

objtool currently only compiles for x86 architectures. This is fine as it presently does not support tooling for other architectures. However, we would like to be able to convert other kernel tools to run as objtool sub commands because they too process ELF object files. This will allow us to convert tools such as recordmcount to use objtool's ELF code.

Since much of recordmcount's ELF code is copy-paste code to/from a variety of other kernel tools (look at modpost for example) this means that if we can convert recordmcount we can convert more.

We define "missing" weak definitions for subcommand entry functions and other weak definitions for shared functions critical to building existing subcommands. These return 127 when the command is missing which signify tools that do not exist on all architectures. In this case the "check" and "orc" tools do not exist on all architectures so we only add them for x86. Future changes adding support for "check", to arm64 for example, can then modify the SUBCMD_CHECK variable when building for arm64.

objtool is not currently wired in to KConfig to be built for other architectures because it's not needed for those architectures and there are no commands it supports other than those for x86. As more command support is enabled on various architectures the necessary KConfig changes can be made (e.g. adding "STACK_VALIDATION") to trigger building objtool.

Cc Julien Thierry <[email protected]>
---
  tools/objtool/Build           | 13 +++++++++----
  tools/objtool/Makefile        | 11 ++++++++++-
  tools/objtool/arch.h          |  4 +++-
  tools/objtool/builtin-check.c |  2 +-
  tools/objtool/builtin-orc.c   |  3 +--
  tools/objtool/check.c         |  4 ++--
  tools/objtool/check.h         |  4 ----
  tools/objtool/objtool.h       | 14 ++++++++++++++
  tools/objtool/orc.h           | 18 ------------------
  tools/objtool/orc_dump.c      |  3 ++-
  tools/objtool/orc_gen.c       |  1 -
  tools/objtool/weak.c          | 35 +++++++++++++++++++++++++++++++++++
  12 files changed, 77 insertions(+), 35 deletions(-)

delete mode 100644 tools/objtool/orc.h
create mode 100644 tools/objtool/weak.c

tools/objtool/Build +9 -4
index 66f44f5cd2a6..b7222d5cc7bc 100644
@@ -1,11 +1,16 @@
  objtool-y += arch/$(SRCARCH)/
+
+objtool-y += weak.o
+
+objtool-$(SUBCMD_CHECK) += check.o
+objtool-$(SUBCMD_CHECK) += special.o
+objtool-$(SUBCMD_ORC) += check.o
+objtool-$(SUBCMD_ORC) += orc_gen.o
+objtool-$(SUBCMD_ORC) += orc_dump.o
+
  objtool-y += builtin-check.o
  objtool-y += builtin-orc.o
-objtool-y += check.o
-objtool-y += orc_gen.o
-objtool-y += orc_dump.o
  objtool-y += elf.o
-objtool-y += special.o
  objtool-y += objtool.o
  objtool-y += libstring.o
tools/objtool/Makefile +6 -1
index 6b91388aecbb..12686e2f1a56 100644
@@ -46,7 +46,16 @@ elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E -
  CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
  AWK = awk
-export srctree OUTPUT CFLAGS SRCARCH AWK
+
+SUBCMD_CHECK := n
+SUBCMD_ORC := n
+
+ifeq ($(SRCARCH),x86)
+	SUBCMD_CHECK := y
Quoted 8 lines

tools/objtool/Makefile elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - · line 58

Quoted 4 lines
tools/objtool/Makefile +4 -0
+	SUBCMD_ORC := y
+endif
+
+export srctree OUTPUT CFLAGS SRCARCH AWK SUBCMD_CHECK SUBCMD_ORC

Nit: I was thinking, since the list of SUBCMD_* is only going to grow maybe it would be nicer to have a single export line for the SUBCMD_* variables and leave the export line of [srctree..AWK] untouched.

That's a really good idea actually. Glad to see Josh included it in the changed patch.

Quoted 5 lines

Just a suggestion, and only in case you respin this taking into account Josh's comment.

Otherwise things look good to me.

Thanks for all the reviews and good ideas!

Cheers,
-Matt Helsley