summaryrefslogtreecommitdiff
path: root/patches/glibc/2_9/210-2.9-strlen-hack.patch
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-02-02 22:00:18 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-02-02 22:00:18 (GMT)
commitb60a8806c675ffeba75a61a9021f61b858c7a0b6 (patch)
tree6616365f31ca9b18820afe26afdaa88b67eac7ec /patches/glibc/2_9/210-2.9-strlen-hack.patch
parentcb8cfd3d80fa3419cae04fc47da2ffd276e416a7 (diff)
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/210-2.9-strlen-hack.patch')
-rw-r--r--patches/glibc/2_9/210-2.9-strlen-hack.patch109
1 files changed, 109 insertions, 0 deletions
diff --git a/patches/glibc/2_9/210-2.9-strlen-hack.patch b/patches/glibc/2_9/210-2.9-strlen-hack.patch
new file mode 100644
index 0000000..6071724
--- /dev/null
+++ b/patches/glibc/2_9/210-2.9-strlen-hack.patch
@@ -0,0 +1,109 @@
+Original patch from: gentoo/src/patchsets/glibc/2.9/1020_all_glibc-2.9-strlen-hack.patch
+
+-= BEGIN original header =-
+http://sourceware.org/bugzilla/show_bug.cgi?id=5807
+http://www.cl.cam.ac.uk/~am21/progtricks.html
+
+-= END original header =-
+
+diff -durN glibc-2_9.orig/string/strlen.c glibc-2_9/string/strlen.c
+--- glibc-2_9.orig/string/strlen.c 2005-12-14 12:09:07.000000000 +0100
++++ glibc-2_9/string/strlen.c 2009-02-02 22:00:51.000000000 +0100
+@@ -32,7 +32,7 @@
+ {
+ const char *char_ptr;
+ const unsigned long int *longword_ptr;
+- unsigned long int longword, magic_bits, himagic, lomagic;
++ unsigned long int longword, himagic, lomagic;
+
+ /* Handle the first few characters by reading one character at a time.
+ Do this until CHAR_PTR is aligned on a longword boundary. */
+@@ -42,28 +42,14 @@
+ if (*char_ptr == '\0')
+ return char_ptr - str;
+
+- /* All these elucidatory comments refer to 4-byte longwords,
+- but the theory applies equally well to 8-byte longwords. */
+-
+ longword_ptr = (unsigned long int *) char_ptr;
+
+- /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits
+- the "holes." Note that there is a hole just to the left of
+- each byte, with an extra at the end:
+-
+- bits: 01111110 11111110 11111110 11111111
+- bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD
+-
+- The 1-bits make sure that carries propagate to the next 0-bit.
+- The 0-bits provide holes for carries to fall into. */
+- magic_bits = 0x7efefeffL;
+ himagic = 0x80808080L;
+ lomagic = 0x01010101L;
+ if (sizeof (longword) > 4)
+ {
+ /* 64-bit version of the magic. */
+ /* Do the shift in two steps to avoid a warning if long has 32 bits. */
+- magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL;
+ himagic = ((himagic << 16) << 16) | himagic;
+ lomagic = ((lomagic << 16) << 16) | lomagic;
+ }
+@@ -75,56 +61,12 @@
+ if *any of the four* bytes in the longword in question are zero. */
+ for (;;)
+ {
+- /* We tentatively exit the loop if adding MAGIC_BITS to
+- LONGWORD fails to change any of the hole bits of LONGWORD.
+-
+- 1) Is this safe? Will it catch all the zero bytes?
+- Suppose there is a byte with all zeros. Any carry bits
+- propagating from its left will fall into the hole at its
+- least significant bit and stop. Since there will be no
+- carry from its most significant bit, the LSB of the
+- byte to the left will be unchanged, and the zero will be
+- detected.
+-
+- 2) Is this worthwhile? Will it ignore everything except
+- zero bytes? Suppose every byte of LONGWORD has a bit set
+- somewhere. There will be a carry into bit 8. If bit 8
+- is set, this will carry into bit 16. If bit 8 is clear,
+- one of bits 9-15 must be set, so there will be a carry
+- into bit 16. Similarly, there will be a carry into bit
+- 24. If one of bits 24-30 is set, there will be a carry
+- into bit 31, so all of the hole bits will be changed.
+-
+- The one misfire occurs when bits 24-30 are clear and bit
+- 31 is set; in this case, the hole at bit 31 is not
+- changed. If we had access to the processor carry flag,
+- we could close this loophole by putting the fourth hole
+- at bit 32!
+-
+- So it ignores everything except 128's, when they're aligned
+- properly. */
+-
+ longword = *longword_ptr++;
+
+- if (
+-#if 0
+- /* Add MAGIC_BITS to LONGWORD. */
+- (((longword + magic_bits)
+-
+- /* Set those bits that were unchanged by the addition. */
+- ^ ~longword)
+-
+- /* Look at only the hole bits. If any of the hole bits
+- are unchanged, most likely one of the bytes was a
+- zero. */
+- & ~magic_bits)
+-#else
+- ((longword - lomagic) & himagic)
+-#endif
+- != 0)
++ /* This hack taken from Alan Mycroft's HAKMEMC postings.
++ See: http://www.cl.cam.ac.uk/~am21/progtricks.html */
++ if (((longword - lomagic) & ~longword & himagic) != 0)
+ {
+- /* Which of the bytes was the zero? If none of them were, it was
+- a misfire; continue the search. */
+
+ const char *cp = (const char *) (longword_ptr - 1);
+