diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-06-19 18:15:33 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-06-19 18:15:33 +0200 |
| commit | 015db5800ca7c6dd2d201eacb2951e72e6782b30 (patch) | |
| tree | 0fe9b90c782f2ac831f30793e384b07bd690b3b3 /scripts | |
| parent | ce824aecf216536beed00d7817a614ffb8572239 (diff) | |
| download | busybox-015db5800ca7c6dd2d201eacb2951e72e6782b30.tar.gz | |
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/zconf.hash.c_shipped | 14 | ||||
| -rwxr-xr-x | scripts/randomtest | 20 |
2 files changed, 22 insertions, 12 deletions
diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped index d39cf189a..29d9cf6cc 100644 --- a/scripts/kconfig/zconf.hash.c_shipped +++ b/scripts/kconfig/zconf.hash.c_shipped @@ -32,14 +32,7 @@ struct kconf_id; /* maximum key range = 45, duplicates = 0 */ -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static unsigned int +unsigned int kconf_id_hash (register const char *str, register unsigned int len) { static unsigned char asso_values[] = @@ -119,7 +112,7 @@ struct kconf_id_strings_t char kconf_id_strings_str41[sizeof("choice")]; char kconf_id_strings_str46[sizeof("prompt")]; }; -static struct kconf_id_strings_t kconf_id_strings_contents = +struct kconf_id_strings_t kconf_id_strings_contents = { "if", "int", @@ -153,9 +146,6 @@ static struct kconf_id_strings_t kconf_id_strings_contents = "prompt" }; #define kconf_id_strings ((const char *) &kconf_id_strings_contents) -#ifdef __GNUC__ -__inline -#endif struct kconf_id * kconf_id_lookup (register const char *str, register unsigned int len) { diff --git a/scripts/randomtest b/scripts/randomtest index e2513d058..41f252ad7 100755 --- a/scripts/randomtest +++ b/scripts/randomtest @@ -52,9 +52,18 @@ echo '# CONFIG_RFKILL is not set' >>.config if test x"$LIBC" = x"glibc"; then cat .config \ | grep -v CONFIG_STATIC \ + \ + | grep -v CONFIG_FEATURE_2_4_MODULES \ + | grep -v CONFIG_FEATURE_USE_BSS_TAIL \ + | grep -v CONFIG_DEBUG_SANITIZE \ >.config.new mv .config.new .config echo '# CONFIG_STATIC is not set' >>.config + # newer glibc (at least 2.23) no longer supply query_module() ABI. + # People who target 2.4 kernels would likely use older glibc (and older bbox). + echo '# CONFIG_FEATURE_2_4_MODULES is not set' >>.config + echo '# CONFIG_FEATURE_USE_BSS_TAIL is not set' >>.config + echo '# CONFIG_DEBUG_SANITIZE is not set' >>.config fi # If uclibc, build static, and remove some things @@ -68,6 +77,11 @@ if test x"$LIBC" = x"uclibc"; then | grep -v CONFIG_FEATURE_2_4_MODULES \ | grep -v CONFIG_FEATURE_SYNC_FANCY \ | grep -v CONFIG_FEATURE_TOUCH_NODEREF \ + | grep -v CONFIG_NANDWRITE \ + | grep -v CONFIG_NANDDUMP \ + | grep -v CONFIG_BLKDISCARD \ + | grep -v CONFIG_NSENTER \ + | grep -v CONFIG_UNSHARE \ >.config.new mv .config.new .config echo 'CONFIG_STATIC=y' >>.config @@ -76,6 +90,12 @@ if test x"$LIBC" = x"uclibc"; then echo '# CONFIG_FEATURE_2_4_MODULES is not set' >>.config echo '# CONFIG_FEATURE_SYNC_FANCY is not set' >>.config echo '# CONFIG_FEATURE_TOUCH_NODEREF is not set' >>.config + # My uclibc installation does not support some needed APIs... + echo '# CONFIG_NANDWRITE is not set' >>.config + echo '# CONFIG_NANDDUMP is not set' >>.config + echo '# CONFIG_BLKDISCARD is not set' >>.config + echo '# CONFIG_NSENTER is not set' >>.config + echo '# CONFIG_UNSHARE is not set' >>.config fi # If STATIC, remove some things. |