selftests/harness: Handle timeouts cleanly

[mirror_ubuntu-jammy-kernel.git] / scripts / Makefile

diff --git a/scripts/Makefile b/scripts/Makefile
index 00c47901cb0691802cee2d41519856e6d71d68d8..5e75802b1a4425270bc237101e0a2abdcf84919a 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -4,30 +4,36 @@
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
 # kallsyms:      Find all symbols in vmlinux
-# conmakehash:   Create chartable
-# conmakehash:  Create arrays for initializing the kernel console tables
 
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
-hostprogs-$(CONFIG_BUILD_BIN2C)  += bin2c
-hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
-hostprogs-$(CONFIG_VT)           += conmakehash
-hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
-hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable
-hostprogs-$(CONFIG_ASN1)        += asn1_compiler
-hostprogs-$(CONFIG_MODULE_SIG_FORMAT) += sign-file
-hostprogs-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert
-hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
-
-HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
+always-$(CONFIG_BUILD_BIN2C)                   += bin2c
+always-$(CONFIG_KALLSYMS)                      += kallsyms
+always-$(BUILD_C_RECORDMCOUNT)                 += recordmcount
+always-$(CONFIG_BUILDTIME_TABLE_SORT)          += sorttable
+always-$(CONFIG_ASN1)                          += asn1_compiler
+always-$(CONFIG_MODULE_SIG_FORMAT)             += sign-file
+always-$(CONFIG_SYSTEM_TRUSTED_KEYRING)                += extract-cert
+always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE)      += insert-sys-cert
+
+HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
 HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
 HOSTLDLIBS_sign-file = -lcrypto
 HOSTLDLIBS_extract-cert = -lcrypto
 
-always         := $(hostprogs-y) $(hostprogs-m)
+ifdef CONFIG_UNWINDER_ORC
+ifeq ($(ARCH),x86_64)
+ARCH := x86
+endif
+HOSTCFLAGS_sorttable.o += -I$(srctree)/tools/arch/x86/include
+HOSTCFLAGS_sorttable.o += -DUNWINDER_ORC_ENABLED
+HOSTLDLIBS_sorttable = -lpthread
+endif
+
+hostprogs := $(always-y) $(always-m)
 
-# The following hostprogs-y programs are only build on demand
-hostprogs-y += unifdef
+# The following programs are only built on demand
+hostprogs += unifdef
 
 subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins
 subdir-$(CONFIG_MODVERSIONS) += genksyms