diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-02-02 22:00:18 +0000 |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-02-02 22:00:18 +0000 |
commit | b60a8806c675ffeba75a61a9021f61b858c7a0b6 (patch) | |
tree | 6616365f31ca9b18820afe26afdaa88b67eac7ec /patches/glibc/2_9/140-regex-BZ9697.patch | |
parent | cb8cfd3d80fa3419cae04fc47da2ffd276e416a7 (diff) | |
download | crosstool-ng-b60a8806c675ffeba75a61a9021f61b858c7a0b6.tar.gz crosstool-ng-b60a8806c675ffeba75a61a9021f61b858c7a0b6.tar.bz2 crosstool-ng-b60a8806c675ffeba75a61a9021f61b858c7a0b6.zip |
Add a patchset for glibc 2_9. Vampirised from the gentoo repository.
/trunk/patches/glibc/2_9/500-ppc-glibc-2.9-atomic.patch | 414 414 0 0 ++++++++++
/trunk/patches/glibc/2_9/140-regex-BZ9697.patch | 111 111 0 0 +++
/trunk/patches/glibc/2_9/190-queue-header-updates.patch | 89 89 0 0 ++
/trunk/patches/glibc/2_9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch | 249 249 0 0 ++++++
/trunk/patches/glibc/2_9/450-alpha-glibc-2.5-no-page-header.patch | 32 32 0 0 +
/trunk/patches/glibc/2_9/270-ldbl-nexttowardf.patch | 68 68 0 0 ++
/trunk/patches/glibc/2_9/330-2.3.3-china.patch | 35 35 0 0 +
/trunk/patches/glibc/2_9/340-new-valencian-locale.patch | 120 120 0 0 +++
/trunk/patches/glibc/2_9/410-2.9-fnmatch.patch | 64 64 0 0 ++
/trunk/patches/glibc/2_9/350-2.4-undefine-__i686.patch | 47 47 0 0 +
/trunk/patches/glibc/2_9/160-i386-x86_64-revert-clone-cfi.patch | 53 53 0 0 +
/trunk/patches/glibc/2_9/420-dont-build-timezone.patch | 19 19 0 0 +
/trunk/patches/glibc/2_9/150-regex-BZ697.patch | 28 28 0 0 +
/trunk/patches/glibc/2_9/290-no-inline-gmon.patch | 38 38 0 0 +
/trunk/patches/glibc/2_9/280-section-comments.patch | 29 29 0 0 +
/trunk/patches/glibc/2_9/180-math-tests.patch | 72 72 0 0 ++
/trunk/patches/glibc/2_9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch | 35 35 0 0 +
/trunk/patches/glibc/2_9/250-resolv-dynamic.patch | 44 44 0 0 +
/trunk/patches/glibc/2_9/300-2.9-check_native-headers.patch | 22 22 0 0 +
/trunk/patches/glibc/2_9/310-2.3.6-fix-pr631.patch | 50 50 0 0 +
/trunk/patches/glibc/2_9/130-add_prio-macros.patch | 26 26 0 0 +
/trunk/patches/glibc/2_9/260-fadvise64_64.patch | 30 30 0 0 +
/trunk/patches/glibc/2_9/440-alpha-glibc-2.4-xstat.patch | 249 249 0 0 ++++++
/trunk/patches/glibc/2_9/170-2.10-dns-no-gethostbyname4.patch | 35 35 0 0 +
/trunk/patches/glibc/2_9/230-2.3.3-localedef-fix-trampoline.patch | 74 74 0 0 ++
/trunk/patches/glibc/2_9/360-2.8-nscd-one-fork.patch | 45 45 0 0 +
/trunk/patches/glibc/2_9/480-alpha-glibc-2.8-cache-shape.patch | 18 18 0 0 +
/trunk/patches/glibc/2_9/210-2.9-strlen-hack.patch | 109 109 0 0 +++
/trunk/patches/glibc/2_9/320-2.9-assume-pipe2.patch | 59 59 0 0 +
/trunk/patches/glibc/2_9/100-ssp-compat.patch | 193 193 0 0 +++++
/trunk/patches/glibc/2_9/110-respect-env-CPPFLAGS.patch | 30 30 0 0 +
/trunk/patches/glibc/2_9/220-manual-no-perl.patch | 29 29 0 0 +
/trunk/patches/glibc/2_9/390-2.3.3_pre20040117-pt_pax.patch | 35 35 0 0 +
/trunk/patches/glibc/2_9/460-alpha-glibc-2.5-no-asm-elf-header.patch | 38 38 0 0 +
/trunk/patches/glibc/2_9/400-tests-sandbox-libdl-paths.patch | 198 198 0 0 +++++
/trunk/patches/glibc/2_9/240-i386-LOAD_PIC_REG.patch | 23 23 0 0 +
/trunk/patches/glibc/2_9/200-awk-in-C-locale.patch | 23 23 0 0 +
/trunk/patches/glibc/2_9/430-2.7-cross-compile-nptl.patch | 57 57 0 0 +
/trunk/patches/glibc/2_9/380-2.3.6-dl_execstack-PaX-support.patch | 71 71 0 0 ++
/trunk/patches/glibc/2_9/490-ptr-mangling.patch | 114 114 0 0 +++
/trunk/patches/glibc/2_9/470-alpha-glibc-2.8-creat.patch | 19 19 0 0 +
41 files changed, 3094 insertions(+)
Diffstat (limited to 'patches/glibc/2_9/140-regex-BZ9697.patch')
-rw-r--r-- | patches/glibc/2_9/140-regex-BZ9697.patch | 111 |
1 files changed, 111 insertions, 0 deletions
diff --git a/patches/glibc/2_9/140-regex-BZ9697.patch b/patches/glibc/2_9/140-regex-BZ9697.patch new file mode 100644 index 00000000..73b0c23c --- /dev/null +++ b/patches/glibc/2_9/140-regex-BZ9697.patch @@ -0,0 +1,111 @@ +Original patch from: gentoo/src/patchsets/glibc/2.9/0052_all_glibc-2.9-regex-BZ9697.patch + +-= BEGIN original header =- +http://sourceware.org/ml/libc-alpha/2009-01/msg00005.html + +From ea8ca0dfcbf2721bcf2c08ce3c01d5764b827572 Mon Sep 17 00:00:00 2001 +From: Ulrich Drepper <drepper@redhat.com> +Date: Thu, 8 Jan 2009 00:42:28 +0000 +Subject: [PATCH] (re_compile_fastmap_iter): Rewrite COMPLEX_BRACKET handling. + +-= END original header =- + +diff -durN glibc-2_9.orig/posix/regcomp.c glibc-2_9/posix/regcomp.c +--- glibc-2_9.orig/posix/regcomp.c 2008-05-15 05:07:21.000000000 +0200 ++++ glibc-2_9/posix/regcomp.c 2009-02-02 22:00:41.000000000 +0100 +@@ -350,47 +350,67 @@ + #ifdef RE_ENABLE_I18N + else if (type == COMPLEX_BRACKET) + { +- int i; + re_charset_t *cset = dfa->nodes[node].opr.mbcset; +- if (cset->non_match || cset->ncoll_syms || cset->nequiv_classes +- || cset->nranges || cset->nchar_classes) +- { ++ int i; ++ + # ifdef _LIBC +- if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0) ++ /* See if we have to try all bytes which start multiple collation ++ elements. ++ e.g. In da_DK, we want to catch 'a' since "aa" is a valid ++ collation element, and don't catch 'b' since 'b' is ++ the only collation element which starts from 'b' (and ++ it is caught by SIMPLE_BRACKET). */ ++ if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0 ++ && (cset->ncoll_syms || cset->nranges)) + { +- /* In this case we want to catch the bytes which are +- the first byte of any collation elements. +- e.g. In da_DK, we want to catch 'a' since "aa" +- is a valid collation element, and don't catch +- 'b' since 'b' is the only collation element +- which starts from 'b'. */ + const int32_t *table = (const int32_t *) + _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB); + for (i = 0; i < SBC_MAX; ++i) + if (table[i] < 0) + re_set_fastmap (fastmap, icase, i); + } +-# else +- if (dfa->mb_cur_max > 1) +- for (i = 0; i < SBC_MAX; ++i) +- if (__btowc (i) == WEOF) +- re_set_fastmap (fastmap, icase, i); +-# endif /* not _LIBC */ +- } +- for (i = 0; i < cset->nmbchars; ++i) ++# endif /* _LIBC */ ++ ++ /* See if we have to start the match at all multibyte characters, ++ i.e. where we would not find an invalid sequence. This only ++ applies to multibyte character sets; for single byte character ++ sets, the SIMPLE_BRACKET again suffices. */ ++ if (dfa->mb_cur_max > 1 ++ && (cset->nchar_classes || cset->non_match ++# ifdef _LIBC ++ || cset->nequiv_classes ++# endif /* _LIBC */ ++ )) + { +- char buf[256]; +- mbstate_t state; +- memset (&state, '\0', sizeof (state)); +- if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1) +- re_set_fastmap (fastmap, icase, *(unsigned char *) buf); +- if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1) ++ unsigned char c = 0; ++ do + { +- if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state) +- != (size_t) -1) +- re_set_fastmap (fastmap, 0, *(unsigned char *) buf); ++ mbstate_t mbs; ++ memset (&mbs, 0, sizeof (mbs)); ++ if (__mbrtowc (NULL, (char *) &c, 1, &mbs) == (size_t) -2) ++ re_set_fastmap (fastmap, false, (int) c); + } ++ while (++c != 0); + } ++ ++ else ++ { ++ /* ... Else catch all bytes which can start the mbchars. */ ++ for (i = 0; i < cset->nmbchars; ++i) ++ { ++ char buf[256]; ++ mbstate_t state; ++ memset (&state, '\0', sizeof (state)); ++ if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1) ++ re_set_fastmap (fastmap, icase, *(unsigned char *) buf); ++ if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1) ++ { ++ if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state) ++ != (size_t) -1) ++ re_set_fastmap (fastmap, false, *(unsigned char *) buf); ++ } ++ } ++ } + } + #endif /* RE_ENABLE_I18N */ + else if (type == OP_PERIOD |