patches/glibc/2.7/160-build_wcs_upper_buffer.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 744 4bf8448536d5
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
yann@541
     1
Matthias Kaehlcke <matthias at kaehlcke dot net> writes:
yann@541
     2
yann@541
     3
A compilation of an ARM toolchain with glibc 2.7 using crosstool-ng
yann@541
     4
failed with a gcc error in glibc-2.7/posix/regex_internal.c, more
yann@541
     5
concretly in the function build_wcs_upper_buffer(). The return type of
yann@541
     6
the function prototype in regex_internal.h doesn't correspond with the
yann@541
     7
return type of this function in regex_internal.c.
yann@541
     8
yann@541
     9
The attached patch corrects the return type of the function prototype
yann@541
    10
in regex_internal.h
yann@541
    11
yann@541
    12
--- glibc-2.7/posix/regex_internal.h.org	2008-05-30 11:16:01.000000000 +0200
yann@541
    13
+++ glibc-2.7/posix/regex_internal.h	2008-05-30 11:16:35.000000000 +0200
yann@541
    14
@@ -391,7 +391,7 @@
yann@541
    15
      internal_function;
yann@541
    16
 # ifdef RE_ENABLE_I18N
yann@541
    17
 static void build_wcs_buffer (re_string_t *pstr) internal_function;
yann@541
    18
-static int build_wcs_upper_buffer (re_string_t *pstr) internal_function;
yann@541
    19
+static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr) internal_function;
yann@541
    20
 # endif /* RE_ENABLE_I18N */
yann@541
    21
 static void build_upper_buffer (re_string_t *pstr) internal_function;
yann@541
    22
 static void re_string_translate_buffer (re_string_t *pstr) internal_function;