summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2011-09-07 19:41:20 +0200
committerThomas Schwinge <thomas@schwinge.name>2011-09-07 19:41:20 +0200
commit953a9535dda5034fbef16be2f0136c39959c8e3d (patch)
treec098e3ee3ca73edfdfd1a0670b85ad49328d2b11 /sysdeps
parent90dec1d38b7420c6ca3b2111716d3170934c17fa (diff)
parent769e2108a0f5fc49eff9f3addbaf5f0646bcb253 (diff)
Merge commit 'refs/top-bases/t/stand-alone' into t/stand-alone
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/pt-attr-getschedparam.c1
-rw-r--r--sysdeps/mach/hurd/ia32/pt-setup.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/generic/pt-attr-getschedparam.c b/sysdeps/generic/pt-attr-getschedparam.c
index 6c3f15b..190cf9d 100644
--- a/sysdeps/generic/pt-attr-getschedparam.c
+++ b/sysdeps/generic/pt-attr-getschedparam.c
@@ -19,6 +19,7 @@
#include <pthread.h>
#include <sched.h>
+#include <string.h>
#include <pt-internal.h>
diff --git a/sysdeps/mach/hurd/ia32/pt-setup.c b/sysdeps/mach/hurd/ia32/pt-setup.c
index ba438d6..7eb223c 100644
--- a/sysdeps/mach/hurd/ia32/pt-setup.c
+++ b/sysdeps/mach/hurd/ia32/pt-setup.c
@@ -64,7 +64,7 @@ stack_setup (struct __pthread *thread,
{
/* And then the call frame. */
top -= 2;
- top = (uintptr_t) top & ~0xf;
+ top = (uintptr_t *) ((uintptr_t) top & ~0xf);
top[1] = (uintptr_t) arg; /* Argument to START_ROUTINE. */
top[0] = (uintptr_t) start_routine;
*--top = 0; /* Fake return address. */