building uml on x86_64 w/ uClibc 0.9.29 is currently broken, select 0.9.30.1 which...

SVN-Revision: 15450

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index e57543384bc96d41334e8191b74bb8f539e6c68e..74c38fe2dd3e94586ae8e0148be1593264799aba 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -4,6 +4,7 @@ choice
        prompt "uClibc Version"
        depends on TOOLCHAINOPTS && USE_UCLIBC
        default UCLIBC_VERSION_0_9_29
+       default UCLIBC_VERSION_0_9_30_1 if (TARGET_uml && x86_64)
        help
          Select the version of uClibc you wish to use.
 

diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version
index bc4ecca78e4e15f7b43b22c60bcc553dba3c0945..96f13d9f259b7bf19cb9e12a660b0d3b22b42b42 100644 (file)
--- a/toolchain/uClibc/Config.version
+++ b/toolchain/uClibc/Config.version
@@ -2,7 +2,7 @@ config UCLIBC_VERSION
        string
        depends on USE_UCLIBC
        default "0.9.29"       if UCLIBC_VERSION_0_9_29
-       default "0.9.30.1"     if UCLIBC_VERSION_0_9_30_1
+       default "0.9.30.1"     if UCLIBC_VERSION_0_9_30_1 || (TARGET_uml && x86_64)
        default "0.9.30+nptl"  if UCLIBC_VERSION_NPTL
        default "0.9.29"