1.1 --- a/config/libc/glibc-eglibc.in-common	Thu Mar 05 17:38:05 2009 +0000
     1.2 +++ b/config/libc/glibc-eglibc.in-common	Thu Mar 05 17:50:42 2009 +0000
     1.3 @@ -14,6 +14,21 @@
     1.4  
     1.5        Eg.: --enable-static-nss
     1.6  
     1.7 +config LIBC_GLIBC_CONFIGPARMS
     1.8 +    string
     1.9 +    prompt "Extra config params (READ HELP)"
    1.10 +    default "" if ! ARCH_sh
    1.11 +    default "no-z-defs=yes" if ARCH_sh
    1.12 +    help
    1.13 +      Some architectures need to set options in the file configparms.
    1.14 +      This is the case for sh3/4, which really need to set configparms
    1.15 +      to "no-z-defs=yes" as of gcc-3.4/glibc-2.3.2.
    1.16 +      
    1.17 +      Unless you are building a toolchain for sh3/4, you should leave that empty.
    1.18 +      
    1.19 +      Note: this is awkward, and doesn't work well if you need more than one
    1.20 +            line in configparms
    1.21 +
    1.22  config LIBC_GLIBC_EXTRA_CFLAGS
    1.23      string
    1.24      prompt "extra target CFLAGS"

     2.1 --- a/scripts/build/libc/glibc.sh	Thu Mar 05 17:38:05 2009 +0000
     2.2 +++ b/scripts/build/libc/glibc.sh	Thu Mar 05 17:50:42 2009 +0000
     2.3 @@ -123,6 +123,9 @@
     2.4  
     2.5      extra_config="${addons_config} $(do_libc_min_kernel_config)"
     2.6  
     2.7 +    # Pre-seed the configparms file with values from the config option
     2.8 +    echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > 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      CT_DoLog DEBUG "Extra config passed : '${extra_config}'"
    2.13 @@ -288,10 +291,8 @@
    2.14      CT_DoLog DEBUG "Extra config args passed: '${extra_config}'"
    2.15      CT_DoLog DEBUG "Extra CC args passed    : '${extra_cc_args}'"
    2.16  
    2.17 -    # Super-H really needs to set configparms as of gcc-3.4/glibc-2.3.2
    2.18 -    # note: this is awkward, doesn't work well if you need more than one
    2.19 -    # line in configparms
    2.20 -    [ "${CT_ARCH_sh}" = "y" ] && echo "no-z-defs=yes" > configparms
    2.21 +    # Pre-seed the configparms file with values from the config option
    2.22 +    echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
    2.23  
    2.24      echo "libc_cv_forced_unwind=yes" > config.cache
    2.25      echo "libc_cv_c_cleanup=yes" >> config.cache
    2.26 @@ -400,9 +401,8 @@
    2.27      CT_DoLog DEBUG "Extra config args passed: '${extra_config}'"
    2.28      CT_DoLog DEBUG "Extra CC args passed    : '${extra_cc_args}'"
    2.29  
    2.30 -    # sh3 and sh4 really need to set configparms as of gcc-3.4/glibc-2.3.2
    2.31 -    # note: this is awkward, doesn't work well if you need more than one line in configparms
    2.32 -    echo ${CT_LIBC_GLIBC_CONFIGPARMS} > configparms
    2.33 +    # Pre-seed the configparms file with values from the config option
    2.34 +    echo "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
    2.35  
    2.36      # For glibc 2.3.4 and later we need to set some autoconf cache
    2.37      # variables, because nptl/sysdeps/pthread/configure.in does not