regex: merge glibc changes