# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1258407459 -3600
# Node ID c7d0e5a017c99f31ee106dde609d9718d889583d
# Parent  14abcd185e4b59386b3dabeeb84294487bda4c7d# Parent  a24374f34d7b300911cf058a46717d5107fa7bcc
Merge.

diff -r 14abcd185e4b -r c7d0e5a017c9 config/libc/glibc-eglibc.in-common
--- a/config/libc/glibc-eglibc.in-common	Mon Nov 16 20:18:09 2009 +0100
+++ b/config/libc/glibc-eglibc.in-common	Mon Nov 16 22:37:39 2009 +0100
@@ -38,8 +38,8 @@
       
       Unless you are building a toolchain for sh3/4, you should leave that empty.
       
-      Note: this is awkward, and doesn't work well if you need more than one
-            line in configparms
+      Note: If you need to pass more than one value, separate them with
+            '\n'. Eg.:  var1=val1\nvar2=val2
 
 config LIBC_GLIBC_EXTRA_CFLAGS
     string
diff -r 14abcd185e4b -r c7d0e5a017c9 scripts/build/libc/glibc.sh
--- a/scripts/build/libc/glibc.sh	Mon Nov 16 20:18:09 2009 +0100
+++ b/scripts/build/libc/glibc.sh	Mon Nov 16 22:37:39 2009 +0100
@@ -141,7 +141,7 @@
     extra_config+=("$(do_libc_min_kernel_config)")
 
     # Pre-seed the configparms file with values from the config option
-    echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
+    printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
 
     cross_cc=$(CT_Which "${CT_TARGET}-gcc")
     CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'"
@@ -309,7 +309,7 @@
     CT_DoLog DEBUG "Extra CC args passed    : '${extra_cc_args}'"
 
     # Pre-seed the configparms file with values from the config option
-    echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
+    printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
 
     echo "libc_cv_forced_unwind=yes" > config.cache
     echo "libc_cv_c_cleanup=yes" >> config.cache
@@ -418,7 +418,7 @@
     CT_DoLog DEBUG "Extra CC args passed    : '${extra_cc_args}'"
 
     # Pre-seed the configparms file with values from the config option
-    echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
+    printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
 
     # For glibc 2.3.4 and later we need to set some autoconf cache
     # variables, because nptl/sysdeps/pthread/configure.in does not