about summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-12-18 23:27:15 +0000
committerUlrich Drepper <drepper@redhat.com>2002-12-18 23:27:15 +0000
commit99326cd47fc57a33dfdf6b8b12357a9d9c192549 (patch)
treeb1f70ffe4a79b0965d0a1f6e9efd42caf86510b1 /linuxthreads
parentf051627fadac5986cb21829c1083a819d4310489 (diff)
downloadglibc-99326cd47fc57a33dfdf6b8b12357a9d9c192549.tar.gz
glibc-99326cd47fc57a33dfdf6b8b12357a9d9c192549.tar.xz
glibc-99326cd47fc57a33dfdf6b8b12357a9d9c192549.zip
Update.
2002-12-18  Jakub Jelinek  <jakub@redhat.com>

	* misc/Versions [libc: GLIBC_2.3.1]: Move __libc_readv and
	__libc_writev to...
	[libc: GLIBC_PRIVATE]: ...here.
	* sysvipc/Versions [libc: GLIBC_2.3.1]: Move __libc_msgrcv and
	__libc_msgsnd to...
	[libc: GLIBC_PRIVATE]: ...here.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/libc-cancellation.c7
-rw-r--r--linuxthreads/sysdeps/i386/useldt.h3
2 files changed, 10 insertions, 0 deletions
diff --git a/linuxthreads/libc-cancellation.c b/linuxthreads/libc-cancellation.c
index 4d38d4222d..01972a2557 100644
--- a/linuxthreads/libc-cancellation.c
+++ b/linuxthreads/libc-cancellation.c
@@ -34,6 +34,13 @@ weak_extern (__pthread_thread_self)
 
 int __libc_multiple_threads attribute_hidden;
 
+# ifndef FLOATING_STACKS
+#  undef THREAD_GETMEM
+#  undef THREAD_SETMEM
+#  define THREAD_GETMEM(descr, member) descr->member
+#  define THREAD_SETMEM(descr, member, value) descr->member = (value)
+# endif
+
 /* The next two functions are similar to pthread_setcanceltype() but
    more specialized for the use in the cancelable functions like write().
    They do not need to check parameters etc.  */
diff --git a/linuxthreads/sysdeps/i386/useldt.h b/linuxthreads/sysdeps/i386/useldt.h
index 91eb6e0e2e..0b28a32978 100644
--- a/linuxthreads/sysdeps/i386/useldt.h
+++ b/linuxthreads/sysdeps/i386/useldt.h
@@ -300,8 +300,11 @@ extern int __have_no_set_thread_area;
 })
 #endif
 
+#if __ASSUME_LDT_WORKS > 0
 /* We want the OS to assign stack addresses.  */
 #define FLOATING_STACKS	1
 
 /* Maximum size of the stack if the rlimit is unlimited.  */
 #define ARCH_STACK_MAX_SIZE	8*1024*1024
+#endif
+