summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-01-06 22:27:53 +0000
committerUlrich Drepper <drepper@redhat.com>2006-01-06 22:27:53 +0000
commitcbbbb1887f2c4a4a620627d5d1b0619368d2d511 (patch)
tree491e3e67b94df224d82e08a78c6080100c46dfae
parent719046c10b5d9da386298bd1432b5da91bc59023 (diff)
* sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL_NCS):cvs/fedora-glibc-20060106T2148
Adjust for private->__private rename in tcbhead_t.
-rw-r--r--ChangeLog3
-rw-r--r--nptl/ChangeLog2
-rw-r--r--sysdeps/unix/sysv/linux/ia64/sysdep.h4
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d6ca4baab..3966236c34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-01-06 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL_NCS):
+ Adjust for private->__private rename in tcbhead_t.
+
[BZ #2114]
* ncsd/aicache.c: Don't use sendfile for records on the stack.
* nscd/grpcache.c: Likewise.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 441bb019a2..d2603fc619 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,6 +1,6 @@
2006-01-06 Ulrich Drepper <drepper@redhat.com>
- * sysdeps/ia64/tls.h (tcbhead_t): Rename private membe to __private.
+ * sysdeps/ia64/tls.h (tcbhead_t): Rename private member to __private.
* sysdeps/ia64/tcb-offsets.sym: Adjust for private->__private
rename in tcbhead_t.
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index ef7bc8e136..dd7a5b1b1d 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005
+/* Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jes Sorensen, <Jes.Sorensen@cern.ch>, April 1999.
@@ -205,7 +205,7 @@
register long _r8 __asm ("r8"); \
register long _r10 __asm ("r10"); \
register long _r15 __asm ("r15") = name; \
- register void *_b7 __asm ("b7") = ((tcbhead_t *) __thread_self)->private; \
+ register void *_b7 __asm ("b7") = ((tcbhead_t *)__thread_self)->__private;\
long _retval; \
LOAD_REGS_##nr \
/* \