busybox: sync Config.in files

[openwrt/openwrt.git] / package / utils / busybox / config / Config.in

diff --git a/package/utils/busybox/config/Config.in b/package/utils/busybox/config/Config.in
index 68f140a9c7a0eda7e574d605b7e7eb0a365142d9..74493aa47542f004b195c5b9585dbde396de1dc2 100644 (file)
--- a/package/utils/busybox/config/Config.in
+++ b/package/utils/busybox/config/Config.in
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 
@@ -8,7 +8,7 @@ config BUSYBOX_CONFIG_HAVE_DOT_CONFIG
        bool
        default BUSYBOX_DEFAULT_HAVE_DOT_CONFIG
 
-menu "Busybox Settings"
+menu "Settings"
 
 config BUSYBOX_CONFIG_DESKTOP
        bool "Enable compatibility for full-blown desktop systems"
@@ -177,6 +177,11 @@ config BUSYBOX_CONFIG_BUSYBOX
 
        Running "busybox APPLET [ARGS...]" will still work, of course.
 
+config BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT
+       bool "Support --show SCRIPT"
+       default BUSYBOX_DEFAULT_FEATURE_SHOW_SCRIPT
+       depends on BUSYBOX_CONFIG_BUSYBOX
+
 config BUSYBOX_CONFIG_FEATURE_INSTALLER
        bool "Support --install [-s] to install applet links at runtime"
        default BUSYBOX_DEFAULT_FEATURE_INSTALLER
@@ -517,6 +522,14 @@ config BUSYBOX_CONFIG_USE_PORTABLE_CODE
        compiler other than gcc.
        If you do use gcc, this option may needlessly increase code size.
 
+config BUSYBOX_CONFIG_STACK_OPTIMIZATION_386
+       bool "Use -mpreferred-stack-boundary=2 on i386 arch"
+       default BUSYBOX_DEFAULT_STACK_OPTIMIZATION_386
+       help
+       This option makes for smaller code, but some libc versions
+       do not work with it (they use SSE instructions without
+       ensuring stack alignment).
+
 comment 'Installation Options ("make install" behavior)'
 
 choice
@@ -680,16 +693,17 @@ config BUSYBOX_CONFIG_EFENCE
 
 endchoice
 
-endmenu
-
 source libbb/Config.in
 
+endmenu
+
 comment "Applets"
 
 source archival/Config.in
 source coreutils/Config.in
 source console-tools/Config.in
 source debianutils/Config.in
+source klibc-utils/Config.in
 source editors/Config.in
 source findutils/Config.in
 source init/Config.in