patches/glibc/2.9/210-2.9-strlen-hack.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Apr 19 16:17:11 2009 +0000 (2009-04-19)
branchnewlib
changeset 1365 c4d124ed9f8e
permissions -rw-r--r--
Update the newlib devel branch with stuf from /trunk.

-------- diffstat follows --------
/devel/newlib/configure | 8 4 4 0
/devel/newlib/scripts/build/kernel/linux.sh | 2 1 1 0
/devel/newlib/scripts/build/cc/gcc.sh | 34 22 12 0 +
/devel/newlib/scripts/build/debug/300-gdb.sh | 52 45 7 0 +
/devel/newlib/scripts/build/libc/uClibc.sh | 6 3 3 0
/devel/newlib/scripts/build/mpfr.sh | 2 1 1 0
/devel/newlib/scripts/crosstool-NG.sh.in | 20 18 2 0 +
/devel/newlib/scripts/functions | 44 34 10 0 +
/devel/newlib/patches/glibc/2_9/500-ppc-glibc-2.9-atomic.patch | 414 0 414 0 ----------
/devel/newlib/patches/glibc/2_9/140-regex-BZ9697.patch | 111 0 111 0 ---
/devel/newlib/patches/glibc/2_9/190-queue-header-updates.patch | 89 0 89 0 --
/devel/newlib/patches/glibc/2_9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch | 249 0 249 0 ------
/devel/newlib/patches/glibc/2_9/450-alpha-glibc-2.5-no-page-header.patch | 32 0 32 0 -
/devel/newlib/patches/glibc/2_9/330-2.3.3-china.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/270-ldbl-nexttowardf.patch | 68 0 68 0 --
/devel/newlib/patches/glibc/2_9/410-2.9-fnmatch.patch | 64 0 64 0 --
/devel/newlib/patches/glibc/2_9/340-new-valencian-locale.patch | 120 0 120 0 ---
/devel/newlib/patches/glibc/2_9/350-2.4-undefine-__i686.patch | 47 0 47 0 -
/devel/newlib/patches/glibc/2_9/160-i386-x86_64-revert-clone-cfi.patch | 53 0 53 0 -
/devel/newlib/patches/glibc/2_9/150-regex-BZ697.patch | 28 0 28 0 -
/devel/newlib/patches/glibc/2_9/420-dont-build-timezone.patch | 19 0 19 0 -
/devel/newlib/patches/glibc/2_9/290-no-inline-gmon.patch | 38 0 38 0 -
/devel/newlib/patches/glibc/2_9/280-section-comments.patch | 29 0 29 0 -
/devel/newlib/patches/glibc/2_9/180-math-tests.patch | 72 0 72 0 --
/devel/newlib/patches/glibc/2_9/250-resolv-dynamic.patch | 44 0 44 0 -
/devel/newlib/patches/glibc/2_9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/300-2.9-check_native-headers.patch | 22 0 22 0 -
/devel/newlib/patches/glibc/2_9/130-add_prio-macros.patch | 26 0 26 0 -
/devel/newlib/patches/glibc/2_9/310-2.3.6-fix-pr631.patch | 50 0 50 0 -
/devel/newlib/patches/glibc/2_9/510-sh-no-asm-user-header.patch | 70 0 70 0 --
/devel/newlib/patches/glibc/2_9/260-fadvise64_64.patch | 30 0 30 0 -
/devel/newlib/patches/glibc/2_9/440-alpha-glibc-2.4-xstat.patch | 249 0 249 0 ------
/devel/newlib/patches/glibc/2_9/170-2.10-dns-no-gethostbyname4.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/230-2.3.3-localedef-fix-trampoline.patch | 74 0 74 0 --
/devel/newlib/patches/glibc/2_9/480-alpha-glibc-2.8-cache-shape.patch | 18 0 18 0 -
/devel/newlib/patches/glibc/2_9/360-2.8-nscd-one-fork.patch | 45 0 45 0 -
/devel/newlib/patches/glibc/2_9/210-2.9-strlen-hack.patch | 109 0 109 0 ---
/devel/newlib/patches/glibc/2_9/320-2.9-assume-pipe2.patch | 59 0 59 0 -
/devel/newlib/patches/glibc/2_9/100-ssp-compat.patch | 193 0 193 0 -----
/devel/newlib/patches/glibc/2_9/110-respect-env-CPPFLAGS.patch | 30 0 30 0 -
/devel/newlib/patches/glibc/2_9/220-manual-no-perl.patch | 29 0 29 0 -
/devel/newlib/patches/glibc/2_9/390-2.3.3_pre20040117-pt_pax.patch | 35 0 35 0 -
/devel/newlib/patches/glibc/2_9/460-alpha-glibc-2.5-no-asm-elf-header.patch | 38 0 38 0 -
/devel/newlib/patches/glibc/2_9/400-tests-sandbox-libdl-paths.patch | 198 0 198 0 -----
/devel/newlib/patches/glibc/2_9/520-sh-no-asm-elf-header.patch | 27 0 27 0 -
/devel/newlib/patches/glibc/2_9/240-i386-LOAD_PIC_REG.patch | 23 0 23 0 -
/devel/newlib/patches/glibc/2_9/200-awk-in-C-locale.patch | 23 0 23 0 -
/devel/newlib/patches/glibc/2_9/430-2.7-cross-compile-nptl.patch | 57 0 57 0 -
/devel/newlib/patches/glibc/2_9/380-2.3.6-dl_execstack-PaX-support.patch | 71 0 71 0 --
/devel/newlib/patches/glibc/2_9/490-ptr-mangling.patch | 114 0 114 0 ---
/devel/newlib/patches/glibc/2_9/470-alpha-glibc-2.8-creat.patch | 19 0 19 0 -
/devel/newlib/patches/glibc/ports-2_9/100-arm_linux_tls.patch | 14 0 14 0 -
/devel/newlib/patches/uClibc/0.9.30.1/140-gnu89-inline.patch | 2 1 1 0
/devel/newlib/docs/known-issues.txt | 16 15 1 0 +
/devel/newlib/docs/overview.txt | 2 1 1 0
/devel/newlib/samples/armeb-unknown-linux-uclibc/uClibc-0.9.30.config | 243 0 243 0 ------
/devel/newlib/samples/armeb-unknown-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/sh4-unknown-linux-gnu/crosstool.config | 35 18 17 0 +
/devel/newlib/samples/x86_64-unknown-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/arm-unknown-elf/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/armeb-unknown-eabi/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/arm-unknown-linux-gnueabi/crosstool.config | 113 73 40 0 +--
/devel/newlib/samples/ia64-unknown-linux-gnu/crosstool.config | 91 61 30 0 +-
/devel/newlib/samples/x86_64-unknown-linux-uclibc/uClibc-0.9.30.config | 245 0 245 0 ------
/devel/newlib/samples/x86_64-unknown-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/armeb-unknown-linux-gnueabi/crosstool.config | 105 69 36 0 +--
/devel/newlib/samples/powerpc-e500v2-linux-gnuspe/crosstool.config | 96 63 33 0 +-
/devel/newlib/samples/i686-nptl-linux-gnu/crosstool.config | 78 48 30 0 +-
/devel/newlib/samples/arm-unknown-linux-gnu/crosstool.config | 105 69 36 0 +--
/devel/newlib/samples/powerpc-unknown-linux-gnu/crosstool.config | 103 67 36 0 +-
/devel/newlib/samples/mips-unknown-linux-uclibc/uClibc-0.9.30.config | 254 0 254 0 ------
/devel/newlib/samples/mips-unknown-linux-uclibc/crosstool.config | 77 54 23 0 +-
/devel/newlib/samples/arm-unknown-linux-uclibcgnueabi/uClibc-0.9.30.config | 253 0 253 0 ------
/devel/newlib/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/arm-iphone-linux-gnueabi/crosstool.config | 84 57 27 0 +-
/devel/newlib/samples/armeb-unknown-linux-gnu/crosstool.config | 105 69 36 0 +--
/devel/newlib/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/i586-geode-linux-uclibc/uClibc-0.9.30.config | 263 0 263 0 ------
/devel/newlib/samples/i586-geode-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/arm-unknown-linux-uclibc/uClibc-0.9.30.config | 253 0 253 0 ------
/devel/newlib/samples/arm-unknown-linux-uclibc/crosstool.config | 78 55 23 0 +-
/devel/newlib/samples/powerpc-unknown-linux-uclibc/uClibc-0.9.30.config | 248 0 248 0 ------
/devel/newlib/samples/powerpc-unknown-linux-uclibc/crosstool.config | 77 54 23 0 +-
/devel/newlib/samples/mips-unknown-elf/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/powerpc-405-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config | 26 13 13 0
/devel/newlib/samples/arm-unknown-eabi/crosstool.config | 54 47 7 0 +
/devel/newlib/samples/mipsel-unknown-linux-gnu/crosstool.config | 104 68 36 0 +--
/devel/newlib/samples/powerpc64-unknown-linux-gnu/crosstool.config | 75 49 26 0 +-
/devel/newlib/samples/alphaev56-unknown-linux-gnu/crosstool.config | 94 63 31 0 +-
/devel/newlib/samples/powerpc-860-linux-gnu/crosstool.config | 102 67 35 0 +-
/devel/newlib/config/kernel/linux.in | 87 46 41 0 +-
/devel/newlib/config/cc/gcc.in | 35 30 5 0 +
/devel/newlib/config/debug/gdb.in | 2 1 1 0
94 files changed, 1851 insertions(+), 5813 deletions(-)
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/1020_all_glibc-2.9-strlen-hack.patch
     2 
     3 -= BEGIN original header =-
     4 http://sourceware.org/bugzilla/show_bug.cgi?id=5807
     5 http://www.cl.cam.ac.uk/~am21/progtricks.html
     6 
     7 -= END original header =-
     8 
     9 diff -durN glibc-2_9.orig/string/strlen.c glibc-2_9/string/strlen.c
    10 --- glibc-2_9.orig/string/strlen.c	2005-12-14 12:09:07.000000000 +0100
    11 +++ glibc-2_9/string/strlen.c	2009-02-02 22:00:51.000000000 +0100
    12 @@ -32,7 +32,7 @@
    13  {
    14    const char *char_ptr;
    15    const unsigned long int *longword_ptr;
    16 -  unsigned long int longword, magic_bits, himagic, lomagic;
    17 +  unsigned long int longword, himagic, lomagic;
    18  
    19    /* Handle the first few characters by reading one character at a time.
    20       Do this until CHAR_PTR is aligned on a longword boundary.  */
    21 @@ -42,28 +42,14 @@
    22      if (*char_ptr == '\0')
    23        return char_ptr - str;
    24  
    25 -  /* All these elucidatory comments refer to 4-byte longwords,
    26 -     but the theory applies equally well to 8-byte longwords.  */
    27 -
    28    longword_ptr = (unsigned long int *) char_ptr;
    29  
    30 -  /* Bits 31, 24, 16, and 8 of this number are zero.  Call these bits
    31 -     the "holes."  Note that there is a hole just to the left of
    32 -     each byte, with an extra at the end:
    33 -
    34 -     bits:  01111110 11111110 11111110 11111111
    35 -     bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD
    36 -
    37 -     The 1-bits make sure that carries propagate to the next 0-bit.
    38 -     The 0-bits provide holes for carries to fall into.  */
    39 -  magic_bits = 0x7efefeffL;
    40    himagic = 0x80808080L;
    41    lomagic = 0x01010101L;
    42    if (sizeof (longword) > 4)
    43      {
    44        /* 64-bit version of the magic.  */
    45        /* Do the shift in two steps to avoid a warning if long has 32 bits.  */
    46 -      magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL;
    47        himagic = ((himagic << 16) << 16) | himagic;
    48        lomagic = ((lomagic << 16) << 16) | lomagic;
    49      }
    50 @@ -75,56 +61,12 @@
    51       if *any of the four* bytes in the longword in question are zero.  */
    52    for (;;)
    53      {
    54 -      /* We tentatively exit the loop if adding MAGIC_BITS to
    55 -	 LONGWORD fails to change any of the hole bits of LONGWORD.
    56 -
    57 -	 1) Is this safe?  Will it catch all the zero bytes?
    58 -	 Suppose there is a byte with all zeros.  Any carry bits
    59 -	 propagating from its left will fall into the hole at its
    60 -	 least significant bit and stop.  Since there will be no
    61 -	 carry from its most significant bit, the LSB of the
    62 -	 byte to the left will be unchanged, and the zero will be
    63 -	 detected.
    64 -
    65 -	 2) Is this worthwhile?  Will it ignore everything except
    66 -	 zero bytes?  Suppose every byte of LONGWORD has a bit set
    67 -	 somewhere.  There will be a carry into bit 8.  If bit 8
    68 -	 is set, this will carry into bit 16.  If bit 8 is clear,
    69 -	 one of bits 9-15 must be set, so there will be a carry
    70 -	 into bit 16.  Similarly, there will be a carry into bit
    71 -	 24.  If one of bits 24-30 is set, there will be a carry
    72 -	 into bit 31, so all of the hole bits will be changed.
    73 -
    74 -	 The one misfire occurs when bits 24-30 are clear and bit
    75 -	 31 is set; in this case, the hole at bit 31 is not
    76 -	 changed.  If we had access to the processor carry flag,
    77 -	 we could close this loophole by putting the fourth hole
    78 -	 at bit 32!
    79 -
    80 -	 So it ignores everything except 128's, when they're aligned
    81 -	 properly.  */
    82 -
    83        longword = *longword_ptr++;
    84  
    85 -      if (
    86 -#if 0
    87 -	  /* Add MAGIC_BITS to LONGWORD.  */
    88 -	  (((longword + magic_bits)
    89 -
    90 -	    /* Set those bits that were unchanged by the addition.  */
    91 -	    ^ ~longword)
    92 -
    93 -	   /* Look at only the hole bits.  If any of the hole bits
    94 -	      are unchanged, most likely one of the bytes was a
    95 -	      zero.  */
    96 -	   & ~magic_bits)
    97 -#else
    98 -	  ((longword - lomagic) & himagic)
    99 -#endif
   100 -	  != 0)
   101 +      /* This hack taken from Alan Mycroft's HAKMEMC postings.
   102 +         See: http://www.cl.cam.ac.uk/~am21/progtricks.html */
   103 +      if (((longword - lomagic) & ~longword & himagic) != 0)
   104  	{
   105 -	  /* Which of the bytes was the zero?  If none of them were, it was
   106 -	     a misfire; continue the search.  */
   107  
   108  	  const char *cp = (const char *) (longword_ptr - 1);
   109