r3527 - glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd
Author: aurel32
Date: 2009-05-23 14:43:20 +0000 (Sat, 23 May 2009)
New Revision: 3527
Modified:
glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff
Log:
Update kfreebsd/local-sysdeps.diff from glibc-ports
Modified: glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff 2009-05-23 12:50:29 UTC (rev 3526)
+++ glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff 2009-05-23 14:43:20 UTC (rev 3527)
@@ -7773,7 +7773,7 @@
+#include_next <dl-machine.h>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-osinfo.h
-@@ -0,0 +1,120 @@
+@@ -0,0 +1,135 @@
+/* Operating system specific code for generic dynamic loader functions.
+ Copyright (C) 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -7875,7 +7875,7 @@
+ } while (0)
+
+static inline uintptr_t __attribute__ ((always_inline))
-+_dl_setup_stack_chk_guard (void)
++_dl_setup_stack_chk_guard (void *dl_random)
+{
+ uintptr_t ret;
+#ifdef ENABLE_STACKGUARD_RANDOMIZE
@@ -7894,6 +7894,21 @@
+ p[sizeof (ret) - 2] = '\n';
+ return ret;
+}
++
++static inline uintptr_t __attribute__ ((always_inline))
++_dl_setup_pointer_guard (void *dl_random, uintptr_t stack_chk_guard)
++{
++ uintptr_t ret;
++
++ ret = stack_chk_guard;
++# ifndef HP_TIMING_NONAVAIL
++ hp_timing_t now;
++ HP_TIMING_NOW (now);
++ ret ^= now;
++# endif
++ return ret;
++}
++
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-sysdep.c
@@ -0,0 +1,31 @@
Reply to: