um: fix stub location calculation

[linux-2.6-microblaze.git] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 328ba97..389c9f5 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -21,6 +21,7 @@ config UML
        select HAVE_GCC_PLUGINS
        select SET_FS
        select TTY # Needed for line.c
+       select HAVE_ARCH_VMAP_STACK
 
 config MMU
        bool
@@ -76,6 +77,9 @@ config NR_CPUS
        range 1 1
        default 1
 
+config ARCH_HAS_CACHE_LINE_SIZE
+       def_bool y
+
 source "arch/$(HEADER_ARCH)/um/Kconfig"
 
 config MAY_HAVE_RUNTIME_DEPS
@@ -106,6 +110,19 @@ config LD_SCRIPT_DYN
        depends on !LD_SCRIPT_STATIC
        select MODULE_REL_CRCS if MODVERSIONS
 
+config LD_SCRIPT_DYN_RPATH
+       bool "set rpath in the binary" if EXPERT
+       default y
+       depends on LD_SCRIPT_DYN
+       help
+         Add /lib (and /lib64 for 64-bit) to the linux binary's rpath
+         explicitly.
+
+         You may need to turn this off if compiling for nix systems
+         that have their libraries in random /nix directories and
+         might otherwise unexpected use libraries from /lib or /lib64
+         instead of the desired ones.
+
 config HOSTFS
        tristate "Host filesystem"
        help