Skip to content

Commit

Permalink
Merge branch 'gperf-removal'
Browse files Browse the repository at this point in the history
Remove our use of 'gperf' for generating perfect hashes from some of our
build tools.

This removal was prompted by Masahiro Yamada sending out a patch that
removes all our pre-generated files, and when I tested it, I noticed
that the gperf version I have (3.1) apparently generates code that no
longer works with out code-base because the function interfaces
generated by gperf have changed.

We really don't care that much, and the gperf people changed their
interfaces in ways that makes it annoying to work with them.  Tools that
make it hard to use them should not be used, and the kernel is not at
all interested in some autoconf mess.  So remove the gperf dependency
entirely.

It turns out that if you ignore the pre-generated files, the use of
gperf apparently saved us a whopping fifteen lines of code.  It
obviously wasn't worth it, considering that the pre-generated files are
about 500 lines.

I sent this out as a patch about three weeks ago, and got absolutely
zero responses.  So let's see if anybody notices now that I merge it.
Because there might be serious bugs here, but it WorksForMe(tm).

* gperf-removal:
  Remove gperf usage from toolchain
  • Loading branch information
torvalds committed Sep 8, 2017
2 parents 572c01b + bb3290d commit 5969d1b
Show file tree
Hide file tree
Showing 15 changed files with 151 additions and 663 deletions.
1 change: 0 additions & 1 deletion Documentation/dontdiff
Original file line number Diff line number Diff line change
Expand Up @@ -259,5 +259,4 @@ wakeup.bin
wakeup.elf
wakeup.lds
zImage*
zconf.hash.c
zoffset.h
4 changes: 2 additions & 2 deletions scripts/genksyms/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ HOSTCFLAGS_parse.tab.o := -I$(src)
HOSTCFLAGS_lex.lex.o := -I$(src)

# dependencies on generated files need to be listed explicitly
$(obj)/lex.lex.o: $(obj)/keywords.hash.c $(obj)/parse.tab.h
$(obj)/lex.lex.o: $(obj)/parse.tab.h

clean-files := keywords.hash.c lex.lex.c parse.tab.c parse.tab.h
clean-files := lex.lex.c parse.tab.c parse.tab.h
74 changes: 74 additions & 0 deletions scripts/genksyms/keywords.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
static struct resword {
const char *name;
int token;
} keywords[] = {
{ "EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW },
{ "EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW },
{ "EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW },
{ "EXPORT_UNUSED_SYMBOL", EXPORT_SYMBOL_KEYW },
{ "EXPORT_UNUSED_SYMBOL_GPL", EXPORT_SYMBOL_KEYW },
{ "__asm", ASM_KEYW },
{ "__asm__", ASM_KEYW },
{ "__attribute", ATTRIBUTE_KEYW },
{ "__attribute__", ATTRIBUTE_KEYW },
{ "__const", CONST_KEYW },
{ "__const__", CONST_KEYW },
{ "__extension__", EXTENSION_KEYW },
{ "__inline", INLINE_KEYW },
{ "__inline__", INLINE_KEYW },
{ "__signed", SIGNED_KEYW },
{ "__signed__", SIGNED_KEYW },
{ "__typeof", TYPEOF_KEYW },
{ "__typeof__", TYPEOF_KEYW },
{ "__volatile", VOLATILE_KEYW },
{ "__volatile__", VOLATILE_KEYW },
{ "__builtin_va_list", VA_LIST_KEYW },

// According to rth, c99 defines "_Bool", __restrict", __restrict__", "restrict". KAO
{ "_Bool", BOOL_KEYW },
{ "_restrict", RESTRICT_KEYW },
{ "__restrict__", RESTRICT_KEYW },
{ "restrict", RESTRICT_KEYW },
{ "asm", ASM_KEYW },

// attribute commented out in modutils 2.4.2. People are using 'attribute' as a
// field name which breaks the genksyms parser. It is not a gcc keyword anyway.
// KAO. },
// { "attribute", ATTRIBUTE_KEYW },

{ "auto", AUTO_KEYW },
{ "char", CHAR_KEYW },
{ "const", CONST_KEYW },
{ "double", DOUBLE_KEYW },
{ "enum", ENUM_KEYW },
{ "extern", EXTERN_KEYW },
{ "float", FLOAT_KEYW },
{ "inline", INLINE_KEYW },
{ "int", INT_KEYW },
{ "long", LONG_KEYW },
{ "register", REGISTER_KEYW },
{ "short", SHORT_KEYW },
{ "signed", SIGNED_KEYW },
{ "static", STATIC_KEYW },
{ "struct", STRUCT_KEYW },
{ "typedef", TYPEDEF_KEYW },
{ "typeof", TYPEOF_KEYW },
{ "union", UNION_KEYW },
{ "unsigned", UNSIGNED_KEYW },
{ "void", VOID_KEYW },
{ "volatile", VOLATILE_KEYW },
};

#define NR_KEYWORDS (sizeof(keywords)/sizeof(struct resword))

static int is_reserved_word(register const char *str, register unsigned int len)
{
int i;
for (i = 0; i < NR_KEYWORDS; i++) {
struct resword *r = keywords + i;
int l = strlen(r->name);
if (len == l && !memcmp(str, r->name, len))
return r->token;
}
return -1;
}
61 changes: 0 additions & 61 deletions scripts/genksyms/keywords.gperf

This file was deleted.

230 changes: 0 additions & 230 deletions scripts/genksyms/keywords.hash.c_shipped

This file was deleted.

Loading

0 comments on commit 5969d1b

Please sign in to comment.