diff options
| author | Shile Zhang <shile.zhang@linux.alibaba.com> | 2019-12-04 08:46:31 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-13 10:47:58 +0100 |
| commit | 1091670637be8bd34a39dd1ddcc0a10a7c88d4e2 (patch) | |
| tree | a2d3f545b8c33d71f620ba2dacd495ca44fd295a /scripts | |
| parent | 57cafdf2a04e161b9654c4ae3888a7549594c499 (diff) | |
| download | linux-1091670637be8bd34a39dd1ddcc0a10a7c88d4e2.tar.bz2 | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/.gitignore | 2 | ||||
| -rw-r--r-- | scripts/Makefile | 4 | ||||
| -rwxr-xr-x | scripts/link-vmlinux.sh | 10 | ||||
| -rw-r--r-- | scripts/sorttable.c (renamed from scripts/sortextable.c) | 10 | ||||
| -rw-r--r-- | scripts/sorttable.h (renamed from scripts/sortextable.h) | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore index 4aa1806c59c2..306054ef340f 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -6,7 +6,7 @@ conmakehash kallsyms unifdef recordmcount -sortextable +sorttable asn1_compiler extract-cert sign-file diff --git a/scripts/Makefile b/scripts/Makefile index 00c47901cb06..7491241e3a0d 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -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 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 436379940356..a81aa76bbe18 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -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 diff --git a/scripts/sortextable.c b/scripts/sorttable.c index efa2839865cd..ff98b7db20c6 100644 --- a/scripts/sortextable.c +++ b/scripts/sorttable.c @@ -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; } diff --git a/scripts/sortextable.h b/scripts/sorttable.h index 6485513f7cae..82589ff90e25 100644 --- a/scripts/sortextable.h +++ b/scripts/sorttable.h @@ -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 |