* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard):

	Shift marked &errno down on big-endian instead of up.
	* elf/tst-stackguard1.c (do_test): Fix a typo.
nptl/
	* tst-stackguard1.c (do_test): Likewise.

diff --git a/ChangeLog b/ChangeLog
index e08224bbde75cc2df43a48f13c27d794cd911481..47151a3088c218c6c3c3669d60d9355e910507fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2005-08-08  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard):
+       Shift marked &errno down on big-endian instead of up.
+       * elf/tst-stackguard1.c (do_test): Fix a typo.
+
 2005-07-29  Jakub Jelinek  <jakub@redhat.com>
 
-       * sysdeps/unix/sysv/dl-osinfo.h: Include errno.h, hp-timing.h,
+       * sysdeps/unix/sysv/linux/dl-osinfo.h: Include errno.h, hp-timing.h,
        endian.h.
        (_dl_setup_stack_chk_guard): Even without
        --enable-stackguard-randomization attempt to do some guard

diff --git a/elf/tst-stackguard1.c b/elf/tst-stackguard1.c
index ed1b5687a2801173cc47748f68732d604fb8d2d0..50739e5b2e055930da87c0bd422310080c89384d 100644 (file)
--- a/elf/tst-stackguard1.c
+++ b/elf/tst-stackguard1.c
@@ -168,7 +168,7 @@ do_test (void)
       else if (child_stack_chk_guards[i] == default_guard)
        ndefaults++;
       else if (*(char *) &child_stack_chk_guards[i] == 0)
-       npartlyrandomized = 0;
+       npartlyrandomized++;
     }
 
   printf ("differences %d defaults %d partly randomized %d\n",

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 38983a81d1e0bb17585665a2a7a5df6996deba4b..e14555dce5d8203ae51267a27296fe95c33d2f37 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-08  Jakub Jelinek  <jakub@redhat.com>
+
+       * tst-stackguard1.c (do_test): Likewise.
+
 2005-07-29  Jakub Jelinek  <jakub@redhat.com>
 
        * tst-stackguard1.c (do_test): Don't fail if the poor man's

diff --git a/nptl/tst-stackguard1.c b/nptl/tst-stackguard1.c
index d9bbe206c34d1d9cf62a0bb6203f3deac74073b4..77ebbfbd7e4528105ffda7acdf2fe08cc7609d0a 100644 (file)
--- a/nptl/tst-stackguard1.c
+++ b/nptl/tst-stackguard1.c
@@ -198,7 +198,7 @@ do_test (void)
       else if (child_stack_chk_guards[i] == default_guard)
        ndefaults++;
       else if (*(char *) &child_stack_chk_guards[i] == 0)
-       npartlyrandomized = 0;
+       npartlyrandomized++;
     }
 
   printf ("differences %d defaults %d partly randomized %d\n",

diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index fb885330f94d24b4424be8818400e6ab57e3dcc4..a8291c3c1cfefa0184d65e2a30bd36a875ecf977 100644 (file)
--- a/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ b/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -203,7 +203,7 @@ _dl_setup_stack_chk_guard (void)
 #if __BYTE_ORDER == __LITTLE_ENDIAN
   stk <<= (__WORDSIZE - 29);
 #else
-  stk <<= (__WORDSIZE == 64 ? 24 : 5);
+  stk >>= 8;
 #endif
   ret ^= stk;
   return ret;