--- /usr/portage/sys-libs/glibc/files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch	2007-07-14 21:35:41.000000000 +0200
+++ /usr/local/portage/sys-libs/glibc/files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch	2007-11-08 15:59:25.000000000 +0100
@@ -50,7 +50,7 @@ Patch by Kevin F. Quinn <kevquinn@gentoo
  # ifdef DL_SYSDEP_OSCHECK
    if (!__libc_multiple_libcs)
      {
-@@ -138,10 +144,12 @@
+@@ -134,10 +140,12 @@
      }
  # endif
  
@@ -60,9 +60,9 @@ Patch by Kevin F. Quinn <kevquinn@gentoo
       we need to setup errno.  */
    __pthread_initialize_minimal ();
 +# endif
- #endif
  
- # ifndef SHARED
+   /* Set up the stack checker's canary.  */
+   uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
 --- csu/libc-tls.c
 +++ csu/libc-tls.c
 @@ -23,6 +23,7 @@