scripts/sorttable: Rename 'sortextable' to 'sorttable'
Use a more generic name for additional table sorting usecases, such as the upcoming ORC table sorting feature. This tool is not tied to exception table sorting anymore. No functional changes intended. [ mingo: Rewrote the changelog. ] Signed-off-by: Shile Zhang <shile.zhang@linux.alibaba.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Michal Marek <michal.lkml@markovi.net> Cc: linux-kbuild@vger.kernel.org Link: https://lkml.kernel.org/r/20191204004633.88660-6-shile.zhang@linux.alibaba.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Родитель
57cafdf2a0
Коммит
1091670637
|
@ -13,7 +13,7 @@ config ARC
|
|||
select ARCH_HAS_SYNC_DMA_FOR_DEVICE
|
||||
select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC
|
||||
select ARCH_32BIT_OFF_T
|
||||
select BUILDTIME_EXTABLE_SORT
|
||||
select BUILDTIME_TABLE_SORT
|
||||
select CLONE_BACKWARDS
|
||||
select COMMON_CLK
|
||||
select DMA_DIRECT_REMAP
|
||||
|
|
|
@ -36,7 +36,7 @@ config ARM
|
|||
select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
|
||||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
|
||||
select BUILDTIME_EXTABLE_SORT if MMU
|
||||
select BUILDTIME_TABLE_SORT if MMU
|
||||
select CLONE_BACKWARDS
|
||||
select CPU_PM if SUSPEND || CPU_IDLE
|
||||
select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
|
||||
|
|
|
@ -81,7 +81,7 @@ config ARM64
|
|||
select ARM_GIC_V3
|
||||
select ARM_GIC_V3_ITS if PCI
|
||||
select ARM_PSCI_FW
|
||||
select BUILDTIME_EXTABLE_SORT
|
||||
select BUILDTIME_TABLE_SORT
|
||||
select CLONE_BACKWARDS
|
||||
select COMMON_CLK
|
||||
select CPU_PM if (SUSPEND || CPU_IDLE)
|
||||
|
|
|
@ -11,7 +11,7 @@ config MICROBLAZE
|
|||
select ARCH_HAS_UNCACHED_SEGMENT if !MMU
|
||||
select ARCH_MIGHT_HAVE_PC_PARPORT
|
||||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select BUILDTIME_EXTABLE_SORT
|
||||
select BUILDTIME_TABLE_SORT
|
||||
select TIMER_OF
|
||||
select CLONE_BACKWARDS3
|
||||
select COMMON_CLK
|
||||
|
|
|
@ -15,7 +15,7 @@ config MIPS
|
|||
select ARCH_USE_QUEUED_SPINLOCKS
|
||||
select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
|
||||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select BUILDTIME_EXTABLE_SORT
|
||||
select BUILDTIME_TABLE_SORT
|
||||
select CLONE_BACKWARDS
|
||||
select CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1)
|
||||
select CPU_PM if CPU_IDLE
|
||||
|
|
|
@ -18,7 +18,7 @@ config PARISC
|
|||
select RTC_DRV_GENERIC
|
||||
select INIT_ALL_POSSIBLE
|
||||
select BUG
|
||||
select BUILDTIME_EXTABLE_SORT
|
||||
select BUILDTIME_TABLE_SORT
|
||||
select HAVE_PCI
|
||||
select HAVE_PERF_EVENTS
|
||||
select HAVE_KERNEL_BZIP2
|
||||
|
|
|
@ -149,7 +149,7 @@ config PPC
|
|||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select ARCH_WEAK_RELEASE_ACQUIRE
|
||||
select BINFMT_ELF
|
||||
select BUILDTIME_EXTABLE_SORT
|
||||
select BUILDTIME_TABLE_SORT
|
||||
select CLONE_BACKWARDS
|
||||
select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN
|
||||
select DYNAMIC_FTRACE if FUNCTION_TRACER
|
||||
|
|
|
@ -110,7 +110,7 @@ config S390
|
|||
select ARCH_USE_CMPXCHG_LOCKREF
|
||||
select ARCH_WANTS_DYNAMIC_TASK_STRUCT
|
||||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select BUILDTIME_EXTABLE_SORT
|
||||
select BUILDTIME_TABLE_SORT
|
||||
select CLONE_BACKWARDS2
|
||||
select DYNAMIC_FTRACE if FUNCTION_TRACER
|
||||
select GENERIC_CLOCKEVENTS
|
||||
|
|
|
@ -96,7 +96,7 @@ config X86
|
|||
select ARCH_WANTS_DYNAMIC_TASK_STRUCT
|
||||
select ARCH_WANT_HUGE_PMD_SHARE
|
||||
select ARCH_WANTS_THP_SWAP if X86_64
|
||||
select BUILDTIME_EXTABLE_SORT
|
||||
select BUILDTIME_TABLE_SORT
|
||||
select CLKEVT_I8253
|
||||
select CLOCKSOURCE_VALIDATE_LAST_CYCLE
|
||||
select CLOCKSOURCE_WATCHDOG
|
||||
|
|
|
@ -11,7 +11,7 @@ config XTENSA
|
|||
select ARCH_USE_QUEUED_SPINLOCKS
|
||||
select ARCH_WANT_FRAME_POINTERS
|
||||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select BUILDTIME_EXTABLE_SORT
|
||||
select BUILDTIME_TABLE_SORT
|
||||
select CLONE_BACKWARDS
|
||||
select COMMON_CLK
|
||||
select DMA_REMAP if MMU
|
||||
|
|
|
@ -58,7 +58,7 @@ config CONSTRUCTORS
|
|||
config IRQ_WORK
|
||||
bool
|
||||
|
||||
config BUILDTIME_EXTABLE_SORT
|
||||
config BUILDTIME_TABLE_SORT
|
||||
bool
|
||||
|
||||
config THREAD_INFO_IN_TASK
|
||||
|
|
|
@ -6,7 +6,7 @@ conmakehash
|
|||
kallsyms
|
||||
unifdef
|
||||
recordmcount
|
||||
sortextable
|
||||
sorttable
|
||||
asn1_compiler
|
||||
extract-cert
|
||||
sign-file
|
||||
|
|
|
@ -13,13 +13,13 @@ 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_BUILDTIME_TABLE_SORT) += sorttable
|
||||
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
|
||||
HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
|
||||
HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
|
||||
HOSTLDLIBS_sign-file = -lcrypto
|
||||
HOSTLDLIBS_extract-cert = -lcrypto
|
||||
|
|
|
@ -180,9 +180,9 @@ mksysmap()
|
|||
${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2}
|
||||
}
|
||||
|
||||
sortextable()
|
||||
sorttable()
|
||||
{
|
||||
${objtree}/scripts/sortextable ${1}
|
||||
${objtree}/scripts/sorttable ${1}
|
||||
}
|
||||
|
||||
# Delete output files in case of error
|
||||
|
@ -304,9 +304,9 @@ fi
|
|||
|
||||
vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o}
|
||||
|
||||
if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
|
||||
info SORTEX vmlinux
|
||||
sortextable vmlinux
|
||||
if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
|
||||
info SORTTAB vmlinux
|
||||
sorttable vmlinux
|
||||
fi
|
||||
|
||||
info SYSMAP System.map
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* sortextable.c: Sort the kernel's exception table
|
||||
* sorttable.c: Sort the kernel's table
|
||||
*
|
||||
* Copyright 2011 - 2012 Cavium, Inc.
|
||||
*
|
||||
|
@ -182,9 +182,9 @@ static inline unsigned int get_secindex(unsigned int shndx,
|
|||
}
|
||||
|
||||
/* 32 bit and 64 bit are very similar */
|
||||
#include "sortextable.h"
|
||||
#define SORTEXTABLE_64
|
||||
#include "sortextable.h"
|
||||
#include "sorttable.h"
|
||||
#define SORTTABLE_64
|
||||
#include "sorttable.h"
|
||||
|
||||
static int compare_relative_table(const void *a, const void *b)
|
||||
{
|
||||
|
@ -351,7 +351,7 @@ int main(int argc, char *argv[])
|
|||
void *addr = NULL;
|
||||
|
||||
if (argc < 2) {
|
||||
fprintf(stderr, "usage: sortextable vmlinux...\n");
|
||||
fprintf(stderr, "usage: sorttable vmlinux...\n");
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* sortextable.h
|
||||
* sorttable.h
|
||||
*
|
||||
* Copyright 2011 - 2012 Cavium, Inc.
|
||||
*
|
||||
|
@ -31,7 +31,7 @@
|
|||
#undef _r
|
||||
#undef _w
|
||||
|
||||
#ifdef SORTEXTABLE_64
|
||||
#ifdef SORTTABLE_64
|
||||
# define extable_ent_size 16
|
||||
# define compare_extable compare_extable_64
|
||||
# define do_sort do_sort_64
|
Загрузка…
Ссылка в новой задаче