Merge.
1.1 --- a/config/libc/glibc-eglibc.in-common Mon Nov 16 20:18:09 2009 +0100
1.2 +++ b/config/libc/glibc-eglibc.in-common Mon Nov 16 22:37:39 2009 +0100
1.3 @@ -38,8 +38,8 @@
1.4
1.5 Unless you are building a toolchain for sh3/4, you should leave that empty.
1.6
1.7 - Note: this is awkward, and doesn't work well if you need more than one
1.8 - line in configparms
1.9 + Note: If you need to pass more than one value, separate them with
1.10 + '\n'. Eg.: var1=val1\nvar2=val2
1.11
1.12 config LIBC_GLIBC_EXTRA_CFLAGS
1.13 string
2.1 --- a/scripts/build/libc/glibc.sh Mon Nov 16 20:18:09 2009 +0100
2.2 +++ b/scripts/build/libc/glibc.sh Mon Nov 16 22:37:39 2009 +0100
2.3 @@ -141,7 +141,7 @@
2.4 extra_config+=("$(do_libc_min_kernel_config)")
2.5
2.6 # Pre-seed the configparms file with values from the config option
2.7 - echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
2.8 + printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
2.9
2.10 cross_cc=$(CT_Which "${CT_TARGET}-gcc")
2.11 CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'"
2.12 @@ -309,7 +309,7 @@
2.13 CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'"
2.14
2.15 # Pre-seed the configparms file with values from the config option
2.16 - echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
2.17 + printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
2.18
2.19 echo "libc_cv_forced_unwind=yes" > config.cache
2.20 echo "libc_cv_c_cleanup=yes" >> config.cache
2.21 @@ -418,7 +418,7 @@
2.22 CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'"
2.23
2.24 # Pre-seed the configparms file with values from the config option
2.25 - echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
2.26 + printf "${CT_LIBC_GLIBC_CONFIGPARMS}\n" > configparms
2.27
2.28 # For glibc 2.3.4 and later we need to set some autoconf cache
2.29 # variables, because nptl/sysdeps/pthread/configure.in does not