scripts/config: sync with latest linux upstream

Signed-off-by: Felix Fietkau <nbd@nbd.name>

1 files changed, 49 insertions, 41 deletions

diff --git a/scripts/config/zconf.hash.c_shipped b/scripts/config/zconf.hash.c_shipped
index 73b5c8cebd..2c6ae7be1c 100644
--- a/scripts/config/zconf.hash.c_shipped
+++ b/scripts/config/zconf.hash.c_shipped
@@ -1,5 +1,5 @@
 /* ANSI-C code produced by gperf version 3.0.3 */
-/* Command-line: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/gperf  */
+/* Command-line: gperf  */
 /* Computed positions: -k'1,3' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -48,7 +48,7 @@ kconf_id_hash (register const char *str, register unsigned int len)
       49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
       49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
       49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 10, 49, 49, 49, 49,
       49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
       49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
       49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
@@ -71,7 +71,7 @@ kconf_id_hash (register const char *str, register unsigned int len)
       49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
       49, 49, 49, 49, 49, 49
     };
-  register unsigned int hval = len;
+  register int hval = len;
 
   switch (hval)
     {
@@ -111,6 +111,7 @@ struct kconf_id_strings_t
     char kconf_id_strings_str27[sizeof("modules")];
     char kconf_id_strings_str28[sizeof("tristate")];
     char kconf_id_strings_str29[sizeof("menu")];
+    char kconf_id_strings_str30[sizeof("---help---")];
     char kconf_id_strings_str31[sizeof("source")];
     char kconf_id_strings_str32[sizeof("comment")];
     char kconf_id_strings_str33[sizeof("hex")];
@@ -148,6 +149,7 @@ static struct kconf_id_strings_t kconf_id_strings_contents =
     "modules",
     "tristate",
     "menu",
+    "---help---",
     "source",
     "comment",
     "hex",
@@ -161,12 +163,18 @@ static struct kconf_id_strings_t kconf_id_strings_contents =
     "mainmenu"
   };
 #define kconf_id_strings ((const char *) &kconf_id_strings_contents)
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
 struct kconf_id *
 kconf_id_lookup (register const char *str, register unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 34,
+      TOTAL_KEYWORDS = 35,
       MIN_WORD_LENGTH = 2,
       MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 2,
@@ -176,56 +184,56 @@ kconf_id_lookup (register const char *str, register unsigned int len)
   static struct kconf_id wordlist[] =
     {
       {-1}, {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str2),		T_ON,		TF_PARAM},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,		T_ON,		TF_PARAM},
       {-1}, {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str5),		T_ENDIF,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str6),		T_OPTION,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str7),	T_ENDMENU,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str8),	T_OPTIONAL,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str9),	T_ENDCHOICE,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str10),		T_RANGE,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str11),		T_CHOICE,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str12),	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str13),	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str14),		T_HELP,		TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,		T_ENDIF,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,		T_OPTION,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,	T_ENDMENU,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,	T_OPTIONAL,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,	T_ENDCHOICE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,		T_RANGE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,		T_CHOICE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,		T_HELP,		TF_COMMAND},
       {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str16),		T_CONFIG,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str17),	T_DEFAULT,	TF_COMMAND, S_TRISTATE},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str18),		T_OPT_ENV,	TF_OPTION},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str19),	T_OPT_DEFCONFIG_LIST,TF_OPTION},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str20),		T_RESET,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str21),		T_TYPE,		TF_COMMAND, S_STRING},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str22),		T_IF,		TF_COMMAND|TF_PARAM},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str23),		T_TYPE,		TF_COMMAND, S_INT},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,		T_CONFIG,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,	T_DEFAULT,	TF_COMMAND, S_TRISTATE},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,		T_OPT_ENV,	TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str19,	T_OPT_DEFCONFIG_LIST,TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20,		T_RESET,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,		T_TYPE,		TF_COMMAND, S_STRING},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,		T_IF,		TF_COMMAND|TF_PARAM},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,		T_TYPE,		TF_COMMAND, S_INT},
       {-1}, {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str26),		T_SELECT,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str27),	T_OPT_MODULES,	TF_OPTION},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str28),	T_TYPE,		TF_COMMAND, S_TRISTATE},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str29),		T_MENU,		TF_COMMAND},
-      {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str31),		T_SOURCE,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str32),	T_COMMENT,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str33),		T_TYPE,		TF_COMMAND, S_HEX},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26,		T_SELECT,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,	T_OPT_MODULES,	TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,	T_TYPE,		TF_COMMAND, S_TRISTATE},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29,		T_MENU,		TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str30,	T_HELP,		TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,		T_SOURCE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,	T_COMMENT,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,		T_TYPE,		TF_COMMAND, S_HEX},
       {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str35),	T_MENUCONFIG,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35,	T_MENUCONFIG,	TF_COMMAND},
       {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str37),	T_VISIBLE,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str38),	T_OPT_ALLNOCONFIG_Y,TF_OPTION},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37,	T_VISIBLE,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str38,	T_OPT_ALLNOCONFIG_Y,TF_OPTION},
       {-1}, {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str41),		T_PROMPT,	TF_COMMAND},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str42),	T_DEPENDS,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,		T_PROMPT,	TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42,	T_DEPENDS,	TF_COMMAND},
       {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str44),		T_TYPE,		TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str44,		T_TYPE,		TF_COMMAND, S_BOOLEAN},
       {-1}, {-1},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str47),	T_TYPE,		TF_COMMAND, S_BOOLEAN},
-      {offsetof(struct kconf_id_strings_t, kconf_id_strings_str48),	T_MAINMENU,	TF_COMMAND}
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47,	T_TYPE,		TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str48,	T_MAINMENU,	TF_COMMAND}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      unsigned int key = kconf_id_hash (str, len);
+      register int key = kconf_id_hash (str, len);
 
-      if (key <= MAX_HASH_VALUE)
+      if (key <= MAX_HASH_VALUE && key >= 0)
         {
           register int o = wordlist[key].name;
           if (o >= 0)