4 files changed, 53 insertions, 85 deletions

diff --git a/scripts/generate_BUFSIZ.sh b/scripts/generate_BUFSIZ.sh
index 844261906..718788e0b 100755
--- a/scripts/generate_BUFSIZ.sh
+++ b/scripts/generate_BUFSIZ.sh
@@ -36,11 +36,10 @@ generate_std_and_exit() {
 }
 
 generate_big_and_exit() {
-        $debug && echo "Configuring: bb_common_bufsiz1[] in _end[], COMMON_BUFSIZE = $1"
+        $debug && echo "Configuring: bb_common_bufsiz1[] in bss, COMMON_BUFSIZE = $1"
         {
         echo "enum { COMMON_BUFSIZE = $1 };"
-        echo "extern char _end[]; /* linker-provided label */"
-        echo "#define bb_common_bufsiz1 _end"
+        echo "extern char bb_common_bufsiz1[];"
         echo "#define setup_common_bufsiz() ((void)0)"
         } | regenerate "$common_bufsiz_h"
         echo "$2" >"$common_bufsiz_h.method"
@@ -51,20 +50,10 @@ generate_1k_and_exit() {
         generate_big_and_exit 1024 "1k"
 }
 
-
-generate_malloc_and_exit() {
-        $debug && echo "Configuring: bb_common_bufsiz1[] is malloced"
-        {
-        echo "enum { COMMON_BUFSIZE = 1024 };"
-        echo "extern char *const bb_common_bufsiz1;"
-        echo "void setup_common_bufsiz(void);"
-        } | regenerate "$common_bufsiz_h"
-        echo "malloc" >"$common_bufsiz_h.method"
-        $exitcmd
-}
-
 round_down_COMMON_BUFSIZE() {
-        COMMON_BUFSIZE=$(( ($1-32) & 0xfffffe0 ))
+        COMMON_BUFSIZE=1024
+        test "$1" -le 32 && return
+        COMMON_BUFSIZE=$(( ($1-32) & 0x0ffffff0 ))
         COMMON_BUFSIZE=$(( COMMON_BUFSIZE < 1024 ? 1024 : COMMON_BUFSIZE ))
 }
 
@@ -104,77 +93,44 @@ if $postcompile; then
         test x"$PAGE_SIZE" = x"" && exit 1
         $debug && echo "PAGE_SIZE:0x$PAGE_SIZE $((0x$PAGE_SIZE))"
         PAGE_SIZE=$((0x$PAGE_SIZE))
-        test $PAGE_SIZE -lt 512 && exit 1
+        test $PAGE_SIZE -lt 1024 && exit 1
 
         # How much space between _end[] and next page?
         PAGE_MASK=$((PAGE_SIZE-1))
         TAIL_SIZE=$(( (-END) & PAGE_MASK ))
         $debug && echo "TAIL_SIZE:$TAIL_SIZE bytes"
 
-        if test x"$method" = x"1k" || test x"$method" = x"big"; then
-                if test $TAIL_SIZE -lt 1024; then
-                        # _end[] has no enough space for bb_common_bufsiz1[]
-                        echo "Warning! Space in _end[] is too small ($TAIL_SIZE bytes)!"
-                        echo "Rerun make to build a binary which doesn't use it!"
-                        rm -- "$common_bufsiz_h.1k.OK" 2>/dev/null
-                        { md5sum <.config | cut -d' ' -f1; stat -c "%Y" .config; } >"$common_bufsiz_h.1k.FAIL"
-                        rm busybox_unstripped busybox 2>/dev/null
-# Note: here we can do either a "malloc" or "std" build.
-# "malloc" gives a bit bigger code:
-#     text  bss filename
-#   804355 5385 busybox.std
-#   804618 4361 busybox.malloc
-# but may have a smaller .bss (not guaranteed!). Use "pmap -x" to verify.
-                        exitcmd="exit 1"
-                        generate_malloc_and_exit
-                else
-                        PREV_SIZE=1024
-                        test x"$method" = x"big" && PREV_SIZE=`cat -- "$common_bufsiz_h.1k.OK"`
-                        round_down_COMMON_BUFSIZE $PREV_SIZE
-                        PREV_BUFSIZE=$COMMON_BUFSIZE
-
-                        rm -- "$common_bufsiz_h.1k.FAIL" 2>/dev/null
-                        echo $TAIL_SIZE >"$common_bufsiz_h.1k.OK"
-                        round_down_COMMON_BUFSIZE $TAIL_SIZE
-                        # emit message only if COMMON_BUFSIZE is indeed larger
-                        test $COMMON_BUFSIZE -gt $PREV_BUFSIZE \
-                                && echo "Rerun make to use larger COMMON_BUFSIZE ($COMMON_BUFSIZE)"
-#TODO: test $PREV_BUFSIZE -lt $TAIL_SIZE && PANIC!!!
-#Code size with COMMON_BUFSIZE > 1024 may be bigger than code with COMMON_BUFSIZE = 1024!
-#(currently we just hope "-32 and round down to 32" saves us)
-
-                        test $COMMON_BUFSIZE = 1024 && generate_1k_and_exit
-                        generate_big_and_exit $COMMON_BUFSIZE "big"
-                fi
+        if test x"$method" = x"1k"; then
+                {
+                echo $TAIL_SIZE
+                md5sum <.config | cut -d' ' -f1
+                stat -c "%Y" .config
+                } >"$common_bufsiz_h.1k.OK"
+                round_down_COMMON_BUFSIZE $((1024 + TAIL_SIZE))
+                # emit message only if COMMON_BUFSIZE is indeed larger
+                test $COMMON_BUFSIZE -gt 1024 \
+                        && echo "Rerun make to use larger COMMON_BUFSIZE ($COMMON_BUFSIZE)"
+                test $COMMON_BUFSIZE = 1024 && generate_1k_and_exit
+                generate_big_and_exit $COMMON_BUFSIZE "big"
         fi
 fi
 
 # Based on past success/fail of 1k build, decide next build type
 
 if test -f "$common_bufsiz_h.1k.OK"; then
-        # Previous build succeeded fitting 1k into _end[].
-        # Try bigger COMMON_BUFSIZE if possible.
-        TAIL_SIZE=`cat -- "$common_bufsiz_h.1k.OK"`
-        round_down_COMMON_BUFSIZE $TAIL_SIZE
-        test $COMMON_BUFSIZE = 1024 && generate_1k_and_exit
-        generate_big_and_exit $COMMON_BUFSIZE "big"
-fi
-
-if test -f "$common_bufsiz_h.1k.FAIL"; then
-        # Previous build FAILED to fit 1k into _end[].
-        # Was it with same .config?
-        oldcfg=`cat -- "$common_bufsiz_h.1k.FAIL"`
+        # previous 1k build succeeded
+        oldcfg=`tail -n2 -- "$common_bufsiz_h.1k.OK"`
         curcfg=`md5sum <.config | cut -d' ' -f1; stat -c "%Y" .config`
-        # If yes, then build a "malloced" version
+        # config did not change
         if test x"$oldcfg" = x"$curcfg"; then
-                echo "Will not try 1k build, it failed before. Touch .config to override"
-# Note: here we can do either a "malloc" or "std" build.
-                generate_malloc_and_exit
+                # Try bigger COMMON_BUFSIZE if possible
+                TAIL_SIZE=`head -n1 -- "$common_bufsiz_h.1k.OK"`
+                round_down_COMMON_BUFSIZE $((1024 + TAIL_SIZE))
+                test $COMMON_BUFSIZE = 1024 && generate_1k_and_exit
+                generate_big_and_exit $COMMON_BUFSIZE "big"
         fi
-        # else: try 1k version
-        echo "New .config, will try 1k build"
-        rm -- "$common_bufsiz_h.1k.FAIL"
-        generate_1k_and_exit
+        # config did change
+        rm -rf -- "$common_bufsiz_h.1k.OK"
 fi
 
 # There was no 1k build yet. Try it.
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..287f1c771 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.
@@ -95,6 +115,8 @@ fi
 
 # Build!
 nice -n 10 make $MAKEOPTS 2>&1 | tee make.log
+grep 'Rerun make' make.log \
+&& nice -n 10 make $MAKEOPTS 2>&1 | tee -a make.log
 
 # Return exitcode 1 if busybox executable does not exist
 test -x busybox
diff --git a/scripts/trylink b/scripts/trylink
index 129570a60..145df9959 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -293,7 +293,7 @@ if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then
     echo "Linking individual applets against libbusybox (see $sharedlib_dir/*)"
     gcc -DNAME_MAIN -E -include include/autoconf.h include/applets.h \
     | grep -v "^#" \
-    | grep -v "^$" \
+    | grep -v "^ *$" \
     > applet_lst.tmp
     while read name main junk; do