Skip to content

Commit 28b2439

Browse files
committed
scripts/sorttable: Remove unused macro defines
The code of sorttable.h was copied from the recordmcount.h which defined a bunch of Elf MACROs so that they could be used between 32bit and 64bit functions. But there's several MACROs that sorttable.h does not use but was copied over. Remove them to clean up the code. Cc: bpf <[email protected]> Cc: Masami Hiramatsu <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Mathieu Desnoyers <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Masahiro Yamada <[email protected]> Cc: Nathan Chancellor <[email protected]> Cc: Nicolas Schier <[email protected]> Cc: Zheng Yejian <[email protected]> Cc: Martin Kelly <[email protected]> Cc: Christophe Leroy <[email protected]> Cc: Josh Poimboeuf <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 9d89551 commit 28b2439

File tree

1 file changed

+0
-27
lines changed

1 file changed

+0
-27
lines changed

scripts/sorttable.h

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,10 @@
2727
#undef Elf_Ehdr
2828
#undef Elf_Shdr
2929
#undef Elf_Rel
30-
#undef Elf_Rela
3130
#undef Elf_Sym
32-
#undef ELF_R_SYM
33-
#undef Elf_r_sym
34-
#undef ELF_R_INFO
35-
#undef Elf_r_info
36-
#undef ELF_ST_BIND
3731
#undef ELF_ST_TYPE
38-
#undef fn_ELF_R_SYM
39-
#undef fn_ELF_R_INFO
4032
#undef uint_t
4133
#undef _r
42-
#undef _w
4334

4435
#ifdef SORTTABLE_64
4536
# define extable_ent_size 16
@@ -52,19 +43,10 @@
5243
# define Elf_Ehdr Elf64_Ehdr
5344
# define Elf_Shdr Elf64_Shdr
5445
# define Elf_Rel Elf64_Rel
55-
# define Elf_Rela Elf64_Rela
5646
# define Elf_Sym Elf64_Sym
57-
# define ELF_R_SYM ELF64_R_SYM
58-
# define Elf_r_sym Elf64_r_sym
59-
# define ELF_R_INFO ELF64_R_INFO
60-
# define Elf_r_info Elf64_r_info
61-
# define ELF_ST_BIND ELF64_ST_BIND
6247
# define ELF_ST_TYPE ELF64_ST_TYPE
63-
# define fn_ELF_R_SYM fn_ELF64_R_SYM
64-
# define fn_ELF_R_INFO fn_ELF64_R_INFO
6548
# define uint_t uint64_t
6649
# define _r r8
67-
# define _w w8
6850
#else
6951
# define extable_ent_size 8
7052
# define compare_extable compare_extable_32
@@ -76,19 +58,10 @@
7658
# define Elf_Ehdr Elf32_Ehdr
7759
# define Elf_Shdr Elf32_Shdr
7860
# define Elf_Rel Elf32_Rel
79-
# define Elf_Rela Elf32_Rela
8061
# define Elf_Sym Elf32_Sym
81-
# define ELF_R_SYM ELF32_R_SYM
82-
# define Elf_r_sym Elf32_r_sym
83-
# define ELF_R_INFO ELF32_R_INFO
84-
# define Elf_r_info Elf32_r_info
85-
# define ELF_ST_BIND ELF32_ST_BIND
8662
# define ELF_ST_TYPE ELF32_ST_TYPE
87-
# define fn_ELF_R_SYM fn_ELF32_R_SYM
88-
# define fn_ELF_R_INFO fn_ELF32_R_INFO
8963
# define uint_t uint32_t
9064
# define _r r
91-
# define _w w
9265
#endif
9366

9467
#if defined(SORTTABLE_64) && defined(UNWINDER_ORC_ENABLED)

0 commit comments

Comments
 (0)