Merge.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Oct 03 18:21:41 2009 +0200 (2009-10-03)
changeset 1559fb3c65878439
parent 1558 d2b746e94197
parent 1556 943775dfbf92
child 1561 390d1483795e
Merge.
scripts/build/libc/glibc.sh
     1.1 --- a/README	Sat Oct 03 18:19:39 2009 +0200
     1.2 +++ b/README	Sat Oct 03 18:21:41 2009 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4  ________________/
     1.5  
     1.6    - GETTING STARTED
     1.7 -  - PARTICIPATING
     1.8 +  - CONTRIBUTING
     1.9      - Sending a bug report
    1.10      - Sending patches
    1.11    - CREDITS
    1.12 @@ -22,6 +22,7 @@
    1.13  You can also point your browser to
    1.14    http://ymorin.is-a-geek.org/projects/crosstool
    1.15  
    1.16 +
    1.17  CONTRIBUTING /
    1.18  ____________/
    1.19  
    1.20 @@ -87,11 +88,13 @@
    1.21  
    1.22  Note: replace' (at) ' above with a plain '@'.
    1.23  
    1.24 +
    1.25  CREDITS /
    1.26  _______/
    1.27  
    1.28  The people that helped are listed in docs/CREDITS. Many thanks to them! :-)
    1.29  
    1.30 +
    1.31  KNOWN ISSUES /
    1.32  ____________/
    1.33  
     2.1 --- a/docs/known-issues.txt	Sat Oct 03 18:19:39 2009 +0200
     2.2 +++ b/docs/known-issues.txt	Sat Oct 03 18:21:41 2009 +0200
     2.3 @@ -51,8 +51,10 @@
     2.4    None known.
     2.5  
     2.6  Workaround:
     2.7 -  If this happens for you, stick with glibc-2.6.1 for now.
     2.8 -  Or investigate! :-)
     2.9 +  It seems that using -O2 in the CFLAGS fixes the problem. It has been
    2.10 +  confirmed in the following threads:
    2.11 +    http://sourceware.org/ml/crossgcc/2009-09/msg00055.html (for glibc)
    2.12 +    http://sourceware.org/ml/crossgcc/2009-10/msg00001.html (for eglibc)
    2.13  
    2.14  --------------------------------
    2.15  Symptoms:
     3.1 --- a/docs/overview.txt	Sat Oct 03 18:19:39 2009 +0200
     3.2 +++ b/docs/overview.txt	Sat Oct 03 18:21:41 2009 +0200
     3.3 @@ -27,7 +27,9 @@
     3.4    Note on // jobs
     3.5    Tools wrapper
     3.6  Using the toolchain
     3.7 +  The 'populate' script
     3.8  Toolchain types
     3.9 +  Seemingly-native toolchains
    3.10  Internals
    3.11    Makefile front-end
    3.12    Kconfig parser
    3.13 @@ -154,11 +156,9 @@
    3.14  
    3.15  See below for complete usage.
    3.16  
    3.17 -Now, provided you checked-out the code, you can send me your interesting changes
    3.18 -by running:
    3.19 -  svn diff
    3.20 -
    3.21 -and mailing me the result! :-P
    3.22 +Now, provided you used a clone of the repository, you can send me your changes.
    3.23 +See the file README, at the top of crosstool-NG source, for how to submit
    3.24 +changees.
    3.25  
    3.26  Preparing for packaging |
    3.27  ------------------------+
    3.28 @@ -590,6 +590,21 @@
    3.29      were all being hashed out, Canada had three national political parties.
    3.30      http://en.wikipedia.org/wiki/Cross_compiler
    3.31  
    3.32 +Seemingly-native toolchains |
    3.33 +----------------------------+
    3.34 +
    3.35 +Seemingly-native toolchains are toolchains that target the same architecture
    3.36 +as the one it is built on, and on which it will run, but the machine tuple
    3.37 +may be different (eg i686 vs. i386, or x86_64-unknown-linux-gnu vs.
    3.38 +x86_64-pc-linux-gnu). This also applies if the target architecture is of the
    3.39 +same kind (eg. x86 vs. x86_64, or ppc vs. ppc64).
    3.40 +
    3.41 +Such toolchain is tricky to build, as the configure scripts may incorrectly
    3.42 +assume that files (headers and libs) from the build (or host) machine can be
    3.43 +used by the cross-compiler it is going to build. The problem seems to arise
    3.44 +only with glibc (and eglibc?) starting with version 2.7.
    3.45 +
    3.46 +
    3.47  _____________
    3.48              /
    3.49  Internals  /
     4.1 --- a/samples/i686-nptl-linux-gnu/crosstool.config	Sat Oct 03 18:19:39 2009 +0200
     4.2 +++ b/samples/i686-nptl-linux-gnu/crosstool.config	Sat Oct 03 18:21:41 2009 +0200
     4.3 @@ -1,7 +1,7 @@
     4.4  #
     4.5  # Automatically generated make config: don't edit
     4.6 -# crosstool-NG version: hg_default@1525_c1ee688c24da
     4.7 -# Fri Sep 11 16:36:56 2009
     4.8 +# crosstool-NG version: hg_default@1552_6ee673ab382e
     4.9 +# Sat Oct  3 16:22:40 2009
    4.10  #
    4.11  
    4.12  #
    4.13 @@ -162,35 +162,34 @@
    4.14  # CT_BARE_METAL is not set
    4.15  CT_KERNEL_SUPPORTS_SHARED_LIBS=y
    4.16  CT_KERNEL="linux"
    4.17 -CT_KERNEL_VERSION="2.6.29"
    4.18 +CT_KERNEL_VERSION="2.6.31.1"
    4.19  # CT_KERNEL_bare_metal is not set
    4.20  CT_KERNEL_linux=y
    4.21  CT_KERNEL_LINUX_INSTALL=y
    4.22  CT_KERNEL_LINUX_INSTALL_CHECK=y
    4.23 +CT_KERNEL_V_2_6_31_1=y
    4.24 +# CT_KERNEL_V_2_6_31 is not set
    4.25 +# CT_KERNEL_V_3_6_30_8 is not set
    4.26 +# CT_KERNEL_V_3_6_30_7 is not set
    4.27 +# CT_KERNEL_V_2_6_30_6 is not set
    4.28 +# CT_KERNEL_V_2_6_30_5 is not set
    4.29 +# CT_KERNEL_V_2_6_30_4 is not set
    4.30 +# CT_KERNEL_V_2_6_30_3 is not set
    4.31 +# CT_KERNEL_V_2_6_30_2 is not set
    4.32 +# CT_KERNEL_V_2_6_30_1 is not set
    4.33 +# CT_KERNEL_V_2_6_30 is not set
    4.34 +# CT_KERNEL_V_2_6_29_6 is not set
    4.35 +# CT_KERNEL_V_2_6_28_10 is not set
    4.36 +# CT_KERNEL_V_2_6_27_35 is not set
    4.37 +# CT_KERNEL_V_2_6_26_8 is not set
    4.38 +# CT_KERNEL_V_2_6_25_20 is not set
    4.39 +# CT_KERNEL_V_2_6_24_7 is not set
    4.40 +# CT_KERNEL_V_2_6_23_17 is not set
    4.41 +# CT_KERNEL_V_2_6_22_19 is not set
    4.42 +# CT_KERNEL_V_2_6_21_7 is not set
    4.43 +# CT_KERNEL_V_2_6_20_21 is not set
    4.44 +# CT_KERNEL_V_2_6_19_7 is not set
    4.45  # CT_KERNEL_V_2_6_18_8 is not set
    4.46 -# CT_KERNEL_V_2_6_19_7 is not set
    4.47 -# CT_KERNEL_V_2_6_20_21 is not set
    4.48 -# CT_KERNEL_V_2_6_21_7 is not set
    4.49 -# CT_KERNEL_V_2_6_22_19 is not set
    4.50 -# CT_KERNEL_V_2_6_23_17 is not set
    4.51 -# CT_KERNEL_V_2_6_24_7 is not set
    4.52 -# CT_KERNEL_V_2_6_25_20 is not set
    4.53 -# CT_KERNEL_V_2_6_26_8 is not set
    4.54 -# CT_KERNEL_V_2_6_27_31 is not set
    4.55 -# CT_KERNEL_V_2_6_28_10 is not set
    4.56 -CT_KERNEL_V_2_6_29=y
    4.57 -# CT_KERNEL_V_2_6_29_1 is not set
    4.58 -# CT_KERNEL_V_2_6_29_2 is not set
    4.59 -# CT_KERNEL_V_2_6_29_3 is not set
    4.60 -# CT_KERNEL_V_2_6_29_4 is not set
    4.61 -# CT_KERNEL_V_2_6_29_5 is not set
    4.62 -# CT_KERNEL_V_2_6_29_6 is not set
    4.63 -# CT_KERNEL_V_2_6_30 is not set
    4.64 -# CT_KERNEL_V_2_6_30_1 is not set
    4.65 -# CT_KERNEL_V_2_6_30_2 is not set
    4.66 -# CT_KERNEL_V_2_6_30_3 is not set
    4.67 -# CT_KERNEL_V_2_6_30_4 is not set
    4.68 -# CT_KERNEL_V_2_6_30_5 is not set
    4.69  # CT_KERNEL_V_select is not set
    4.70  CT_KERNEL_LINUX_VERBOSITY_0=y
    4.71  # CT_KERNEL_LINUX_VERBOSITY_1 is not set
    4.72 @@ -213,25 +212,25 @@
    4.73  # GNU binutils
    4.74  #
    4.75  CT_BINUTILS_VERSION="2.19.1"
    4.76 +# CT_BINUTILS_V_2_19_51_0_2 is not set
    4.77 +# CT_BINUTILS_V_2_19_51_0_1 is not set
    4.78 +# CT_BINUTILS_V_2_19_50_0_1 is not set
    4.79 +CT_BINUTILS_V_2_19_1=y
    4.80 +# CT_BINUTILS_V_2_19 is not set
    4.81 +# CT_BINUTILS_V_2_18_93 is not set
    4.82 +# CT_BINUTILS_V_2_18_92 is not set
    4.83 +# CT_BINUTILS_V_2_18_91 is not set
    4.84 +# CT_BINUTILS_V_2_18_90 is not set
    4.85 +# CT_BINUTILS_V_2_18_50_0_9 is not set
    4.86 +# CT_BINUTILS_V_2_18_50_0_8 is not set
    4.87 +# CT_BINUTILS_V_2_18_50_0_7 is not set
    4.88 +# CT_BINUTILS_V_2_18_50_0_6 is not set
    4.89 +# CT_BINUTILS_V_2_18_50_0_4 is not set
    4.90 +# CT_BINUTILS_V_2_18 is not set
    4.91 +# CT_BINUTILS_V_2_17 is not set
    4.92 +# CT_BINUTILS_V_2_16_1 is not set
    4.93 +# CT_BINUTILS_V_2_15 is not set
    4.94  # CT_BINUTILS_V_2_14 is not set
    4.95 -# CT_BINUTILS_V_2_15 is not set
    4.96 -# CT_BINUTILS_V_2_16_1 is not set
    4.97 -# CT_BINUTILS_V_2_17 is not set
    4.98 -# CT_BINUTILS_V_2_18 is not set
    4.99 -# CT_BINUTILS_V_2_18_50_0_4 is not set
   4.100 -# CT_BINUTILS_V_2_18_50_0_6 is not set
   4.101 -# CT_BINUTILS_V_2_18_50_0_7 is not set
   4.102 -# CT_BINUTILS_V_2_18_50_0_8 is not set
   4.103 -# CT_BINUTILS_V_2_18_50_0_9 is not set
   4.104 -# CT_BINUTILS_V_2_18_90 is not set
   4.105 -# CT_BINUTILS_V_2_18_91 is not set
   4.106 -# CT_BINUTILS_V_2_18_92 is not set
   4.107 -# CT_BINUTILS_V_2_18_93 is not set
   4.108 -# CT_BINUTILS_V_2_19 is not set
   4.109 -CT_BINUTILS_V_2_19_1=y
   4.110 -# CT_BINUTILS_V_2_19_50_0_1 is not set
   4.111 -# CT_BINUTILS_V_2_19_51_0_1 is not set
   4.112 -# CT_BINUTILS_V_2_19_51_0_2 is not set
   4.113  CT_BINUTILS_EXTRA_CONFIG=""
   4.114  CT_BINUTILS_FOR_TARGET=y
   4.115  CT_BINUTILS_FOR_TARGET_IBERTY=y
   4.116 @@ -243,29 +242,29 @@
   4.117  CT_CC="gcc"
   4.118  CT_CC_VERSION="4.3.2"
   4.119  CT_CC_gcc=y
   4.120 +# CT_CC_V_4_4_1 is not set
   4.121 +# CT_CC_V_4_4_0 is not set
   4.122 +# CT_CC_V_4_3_4 is not set
   4.123 +# CT_CC_V_4_3_3 is not set
   4.124 +CT_CC_V_4_3_2=y
   4.125 +# CT_CC_V_4_3_1 is not set
   4.126 +# CT_CC_V_4_3_0 is not set
   4.127 +# CT_CC_V_4_2_4 is not set
   4.128 +# CT_CC_V_4_2_3 is not set
   4.129 +# CT_CC_V_4_2_2 is not set
   4.130 +# CT_CC_V_4_2_1 is not set
   4.131 +# CT_CC_V_4_2_0 is not set
   4.132 +# CT_CC_V_4_1_2 is not set
   4.133 +# CT_CC_V_4_1_1 is not set
   4.134 +# CT_CC_V_4_1_0 is not set
   4.135 +# CT_CC_V_4_0_4 is not set
   4.136 +# CT_CC_V_4_0_3 is not set
   4.137 +# CT_CC_V_4_0_2 is not set
   4.138 +# CT_CC_V_4_0_1 is not set
   4.139 +# CT_CC_V_4_0_0 is not set
   4.140 +# CT_CC_V_3_4_6 is not set
   4.141 +# CT_CC_V_3_3_6 is not set
   4.142  # CT_CC_V_3_2_3 is not set
   4.143 -# CT_CC_V_3_3_6 is not set
   4.144 -# CT_CC_V_3_4_6 is not set
   4.145 -# CT_CC_V_4_0_0 is not set
   4.146 -# CT_CC_V_4_0_1 is not set
   4.147 -# CT_CC_V_4_0_2 is not set
   4.148 -# CT_CC_V_4_0_3 is not set
   4.149 -# CT_CC_V_4_0_4 is not set
   4.150 -# CT_CC_V_4_1_0 is not set
   4.151 -# CT_CC_V_4_1_1 is not set
   4.152 -# CT_CC_V_4_1_2 is not set
   4.153 -# CT_CC_V_4_2_0 is not set
   4.154 -# CT_CC_V_4_2_1 is not set
   4.155 -# CT_CC_V_4_2_2 is not set
   4.156 -# CT_CC_V_4_2_3 is not set
   4.157 -# CT_CC_V_4_2_4 is not set
   4.158 -# CT_CC_V_4_3_0 is not set
   4.159 -# CT_CC_V_4_3_1 is not set
   4.160 -CT_CC_V_4_3_2=y
   4.161 -# CT_CC_V_4_3_3 is not set
   4.162 -# CT_CC_V_4_3_4 is not set
   4.163 -# CT_CC_V_4_4_0 is not set
   4.164 -# CT_CC_V_4_4_1 is not set
   4.165  CT_CC_GCC_4_3_or_later=y
   4.166  # CT_CC_GCC_4_4_or_later is not set
   4.167  CT_CC_CXA_ATEXIT=y
   4.168 @@ -301,14 +300,14 @@
   4.169  CT_LIBC_glibc=y
   4.170  # CT_LIBC_newlib is not set
   4.171  # CT_LIBC_uClibc is not set
   4.172 +CT_LIBC_V_2_9=y
   4.173 +# CT_LIBC_V_2_8 is not set
   4.174 +# CT_LIBC_V_2_7 is not set
   4.175 +# CT_LIBC_V_2_6_1 is not set
   4.176 +# CT_LIBC_V_2_6 is not set
   4.177 +# CT_LIBC_V_2_5_1 is not set
   4.178 +# CT_LIBC_V_2_5 is not set
   4.179  # CT_LIBC_V_2_3_6 is not set
   4.180 -# CT_LIBC_V_2_5 is not set
   4.181 -# CT_LIBC_V_2_5_1 is not set
   4.182 -# CT_LIBC_V_2_6 is not set
   4.183 -# CT_LIBC_V_2_6_1 is not set
   4.184 -# CT_LIBC_V_2_7 is not set
   4.185 -# CT_LIBC_V_2_8 is not set
   4.186 -CT_LIBC_V_2_9=y
   4.187  # CT_LIBC_V_LATEST is not set
   4.188  # CT_LIBC_V_date is not set
   4.189  CT_LIBC_GLIBC_2_8_or_later=y
   4.190 @@ -327,7 +326,7 @@
   4.191  # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
   4.192  CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
   4.193  # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
   4.194 -CT_LIBC_GLIBC_MIN_KERNEL="2.6.29"
   4.195 +CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
   4.196  
   4.197  #
   4.198  # Common C library options
   4.199 @@ -343,17 +342,17 @@
   4.200  # Debug facilities
   4.201  #
   4.202  CT_DEBUG_dmalloc=y
   4.203 +CT_DMALLOC_V_5_5_2=y
   4.204  # CT_DMALLOC_V_5_4_3 is not set
   4.205 -CT_DMALLOC_V_5_5_2=y
   4.206  CT_DMALLOC_VERSION="5.5.2"
   4.207  CT_DEBUG_duma=y
   4.208  CT_DUMA_A=y
   4.209  CT_DUMA_SO=y
   4.210 +# CT_DUMA_V_2_5_15 is not set
   4.211 +CT_DUMA_V_2_5_14=y
   4.212 +# CT_DUMA_V_2_5_12 is not set
   4.213 +# CT_DUMA_V_2_5_8 is not set
   4.214  # CT_DUMA_V_2_5_1 is not set
   4.215 -# CT_DUMA_V_2_5_8 is not set
   4.216 -# CT_DUMA_V_2_5_12 is not set
   4.217 -CT_DUMA_V_2_5_14=y
   4.218 -# CT_DUMA_V_2_5_15 is not set
   4.219  CT_DUMA_VERSION="2_5_14"
   4.220  CT_DEBUG_gdb=y
   4.221  CT_GDB_CROSS=y
   4.222 @@ -363,42 +362,42 @@
   4.223  CT_GDB_NATIVE_USE_GMP_MPFR=y
   4.224  CT_GDB_GDBSERVER=y
   4.225  CT_GDB_GDBSERVER_STATIC=y
   4.226 +CT_GDB_V_6_8=y
   4.227 +# CT_GDB_V_6_7_1 is not set
   4.228 +# CT_GDB_V_6_7 is not set
   4.229 +# CT_GDB_V_6_6 is not set
   4.230 +# CT_GDB_V_6_5 is not set
   4.231  # CT_GDB_V_6_4 is not set
   4.232 -# CT_GDB_V_6_5 is not set
   4.233 -# CT_GDB_V_6_6 is not set
   4.234 -# CT_GDB_V_6_7 is not set
   4.235 -# CT_GDB_V_6_7_1 is not set
   4.236 -CT_GDB_V_6_8=y
   4.237  # CT_GDB_V_snapshot is not set
   4.238  CT_GDB_VERSION="6.8"
   4.239  
   4.240  #
   4.241  # Native gdb needs a native ncurses library
   4.242  #
   4.243 +CT_NCURSES_V_5_7=y
   4.244  # CT_NCURSES_V_5_6 is not set
   4.245 -CT_NCURSES_V_5_7=y
   4.246  CT_NCURSES_VERSION="5.7"
   4.247  CT_DEBUG_ltrace=y
   4.248 +# CT_LTRACE_V_0_5_2 is not set
   4.249 +# CT_LTRACE_V_0_5_1 is not set
   4.250 +CT_LTRACE_V_0_5=y
   4.251  # CT_LTRACE_V_0_4 is not set
   4.252 -CT_LTRACE_V_0_5=y
   4.253 -# CT_LTRACE_V_0_5_1 is not set
   4.254 -# CT_LTRACE_V_0_5_2 is not set
   4.255  CT_LTRACE_VERSION="0.5"
   4.256  CT_DEBUG_strace=y
   4.257 +# CT_STRACE_V_4_5_18 is not set
   4.258 +CT_STRACE_V_4_5_17=y
   4.259 +# CT_STRACE_V_4_5_16 is not set
   4.260 +# CT_STRACE_V_4_5_15 is not set
   4.261 +# CT_STRACE_V_4_5_14 is not set
   4.262  # CT_STRACE_V_4_5 is not set
   4.263 -# CT_STRACE_V_4_5_14 is not set
   4.264 -# CT_STRACE_V_4_5_15 is not set
   4.265 -# CT_STRACE_V_4_5_16 is not set
   4.266 -CT_STRACE_V_4_5_17=y
   4.267 -# CT_STRACE_V_4_5_18 is not set
   4.268  CT_STRACE_VERSION="4.5.17"
   4.269  
   4.270  #
   4.271  # Tools facilities
   4.272  #
   4.273  CT_TOOL_libelf=y
   4.274 +# CT_LIBELF_V_0_8_11 is not set
   4.275  CT_LIBELF_V_0_8_10=y
   4.276 -# CT_LIBELF_V_0_8_11 is not set
   4.277  CT_LIBELF_VERSION="0.8.10"
   4.278  CT_TOOL_sstrip=y
   4.279  CT_SSTRIP_BUILDROOT=y
   4.280 @@ -410,15 +409,15 @@
   4.281  #
   4.282  CT_WRAPPER_NEEDED=y
   4.283  CT_GMP_MPFR=y
   4.284 +# CT_GMP_V_4_3_1 is not set
   4.285 +# CT_GMP_V_4_3_0 is not set
   4.286 +CT_GMP_V_4_2_4=y
   4.287  # CT_GMP_V_4_2_2 is not set
   4.288 -CT_GMP_V_4_2_4=y
   4.289 -# CT_GMP_V_4_3_0 is not set
   4.290 -# CT_GMP_V_4_3_1 is not set
   4.291  CT_GMP_VERSION="4.2.4"
   4.292 +CT_MPFR_V_2_4_1=y
   4.293 +# CT_MPFR_V_2_4_0 is not set
   4.294 +# CT_MPFR_V_2_3_2 is not set
   4.295  # CT_MPFR_V_2_3_1 is not set
   4.296 -# CT_MPFR_V_2_3_2 is not set
   4.297 -# CT_MPFR_V_2_4_0 is not set
   4.298 -CT_MPFR_V_2_4_1=y
   4.299  CT_MPFR_VERSION="2.4.1"
   4.300  # CT_PPL_CLOOG_MPC is not set
   4.301  
     5.1 --- a/scripts/build/debug/300-gdb.sh	Sat Oct 03 18:19:39 2009 +0200
     5.2 +++ b/scripts/build/debug/300-gdb.sh	Sat Oct 03 18:21:41 2009 +0200
     5.3 @@ -265,6 +265,10 @@
     5.4  
     5.5          unset ac_cv_func_strncmp_works
     5.6  
     5.7 +        CT_DoLog EXTRA "Cleaning up ncurses"
     5.8 +        cd "${CT_BUILD_DIR}/build-ncurses"
     5.9 +        CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" uninstall
    5.10 +
    5.11          CT_EndStep # native gdb build
    5.12      fi
    5.13  
     6.1 --- a/scripts/build/libc/eglibc.sh	Sat Oct 03 18:19:39 2009 +0200
     6.2 +++ b/scripts/build/libc/eglibc.sh	Sat Oct 03 18:21:41 2009 +0200
     6.3 @@ -252,7 +252,7 @@
     6.4      CT_DoLog DEBUG "Extra CC args passed    : '${extra_cc_args}'"
     6.5  
     6.6      BUILD_CC="${CT_BUILD}-gcc"                                      \
     6.7 -    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O"   \
     6.8 +    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O2"  \
     6.9      CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
    6.10      AR=${CT_TARGET}-ar                                              \
    6.11      RANLIB=${CT_TARGET}-ranlib                                      \
     7.1 --- a/scripts/build/libc/glibc.sh	Sat Oct 03 18:19:39 2009 +0200
     7.2 +++ b/scripts/build/libc/glibc.sh	Sat Oct 03 18:21:41 2009 +0200
     7.3 @@ -178,7 +178,7 @@
     7.4  
     7.5          libc_cv_ppc_machine=yes                         \
     7.6          CT_DoExecLog ALL                                \
     7.7 -        make CFLAGS="-O -DBOOTSTRAP_GCC"                \
     7.8 +        make CFLAGS="-O2 -DBOOTSTRAP_GCC"               \
     7.9               OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"    \
    7.10               PARALLELMFLAGS="${PARALLELMFLAGS}"         \
    7.11               sysdeps/gnu/errlist.c
    7.12 @@ -195,7 +195,7 @@
    7.13      CT_DoExecLog ALL                                \
    7.14      make cross-compiling=yes                        \
    7.15           install_root=${CT_SYSROOT_DIR}             \
    7.16 -         CFLAGS="-O -DBOOTSTRAP_GCC"                \
    7.17 +         CFLAGS="-O2 -DBOOTSTRAP_GCC"               \
    7.18           ${LIBC_SYSROOT_ARG}                        \
    7.19           OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"    \
    7.20           PARALLELMFLAGS="${PARALLELMFLAGS}"         \
    7.21 @@ -317,7 +317,7 @@
    7.22      # Please see the comment for the configure step in do_libc().
    7.23  
    7.24      BUILD_CC="${CT_BUILD}-gcc"                                      \
    7.25 -    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O "  \
    7.26 +    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O2"  \
    7.27      CC="${cross_cc} ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}"      \
    7.28      AR=${CT_TARGET}-ar                                              \
    7.29      RANLIB=${CT_TARGET}-ranlib                                      \
    7.30 @@ -443,7 +443,7 @@
    7.31      # silly messages. GNU folks again, he?
    7.32  
    7.33      BUILD_CC="${CT_BUILD}-gcc"                                      \
    7.34 -    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O"   \
    7.35 +    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O2"  \
    7.36      CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
    7.37      AR=${CT_TARGET}-ar                                              \
    7.38      RANLIB=${CT_TARGET}-ranlib                                      \