scripts/sorttable: Rename 'sortextable' to 'sorttable'
authorShile Zhang <shile.zhang@linux.alibaba.com>
Wed, 4 Dec 2019 00:46:31 +0000 (08:46 +0800)
committerIngo Molnar <mingo@kernel.org>
Fri, 13 Dec 2019 09:47:58 +0000 (10:47 +0100)
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>
16 files changed:
arch/arc/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/microblaze/Kconfig
arch/mips/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/x86/Kconfig
arch/xtensa/Kconfig
init/Kconfig
scripts/.gitignore
scripts/Makefile
scripts/link-vmlinux.sh
scripts/sorttable.c [moved from scripts/sortextable.c with 97% similarity]
scripts/sorttable.h [moved from scripts/sortextable.h with 99% similarity]

index 26108ea785c2644d653c6f3e2228521b3f0d0f82..5f448201955bc53bc217c92fc717a3409480d92f 100644 (file)
@@ -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
index ba75e3661a4159afa45ac15516db9e16d2fdae29..cb3493b4db8330ceb57789b628d1dd439b263b3c 100644 (file)
@@ -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
index b1b4476ddb834ba64a8ba93e55e88d3a7282fed1..6f360dd2b1ad7d8fb391539dc1ea403f25910e11 100644 (file)
@@ -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)
index 5f46ebe7bfe3c641512e560c18f1cf240799c894..a105f113fd67c690ffd387dd5c377af44c31b9ed 100644 (file)
@@ -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
index add388236f4ef2cdf2558b0d282605fadce6912a..5531942baf5db2930f4de0e4e36fa1183f8a3304 100644 (file)
@@ -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
index b16237c95ea33bd1fb75f50b91fbd6ae053b1687..e1ef610a5a2bc2884fb7ee0b09407e81d8bbad77 100644 (file)
@@ -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
index 1ec34e16ed65d38c1e7a7d0c44e11c01a1fa7a71..18a21b4f371140f867cd801cc60da35628c8cba4 100644 (file)
@@ -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
index d4051e88e6250ddbb621b18c0dc6f8356411ffd8..884194fab698a5d00969b895e61313c5835b2ca8 100644 (file)
@@ -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
index 5e894995366064ca3a3d3b58143a61057f99095e..e71158af8dd5ffa653a3b8a5a18b158cb9459cba 100644 (file)
@@ -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
index 4a3fa295d8fed4a9427ea8c1eecf9832040d766a..fb9746db0a6d240d72a9393f2a657ff6883c1437 100644 (file)
@@ -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
index a34064a031a5ed785eb4c7bab830408f1fb2608a..ad9b6c5eaf1d8787852f3cc681c1e29aee388655 100644 (file)
@@ -58,7 +58,7 @@ config CONSTRUCTORS
 config IRQ_WORK
        bool
 
-config BUILDTIME_EXTABLE_SORT
+config BUILDTIME_TABLE_SORT
        bool
 
 config THREAD_INFO_IN_TASK
index 4aa1806c59c2a1cdcfcea105df3899d0e5109646..306054ef340f73466c17b945bc8bdb038bd2218b 100644 (file)
@@ -6,7 +6,7 @@ conmakehash
 kallsyms
 unifdef
 recordmcount
-sortextable
+sorttable
 asn1_compiler
 extract-cert
 sign-file
index 00c47901cb0691802cee2d41519856e6d71d68d8..7491241e3a0d088bf16f361d67446164bf2de4a2 100644 (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
index 436379940356130eb1cd4b2a20ded511e4a8b4c8..a81aa76bbe186b9cb96ac703339e94e66e178755 100755 (executable)
@@ -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
similarity index 97%
rename from scripts/sortextable.c
rename to scripts/sorttable.c
index efa2839865cdb09b5f3deb9e105746efb12defa0..ff98b7db20c6793f6dca2d338959264f23692c54 100644 (file)
@@ -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;
        }
 
similarity index 99%
rename from scripts/sortextable.h
rename to scripts/sorttable.h
index 6485513f7caebe264c68046599f8ad86c4299e83..82589ff90e259feda49d4f83dff5afbfdc88234b 100644 (file)
@@ -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