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.

diff --git a/ChangeLog b/ChangeLog
index af82aba95b9a51765add352d28165d8121b0421b..e6d50f95ec3e0f0994a7404029843ab43051f3cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2002-12-18  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/i386/sysdep.h: Define ENTER_KERNEL macro.

diff --git a/linuxthreads/libc-cancellation.c b/linuxthreads/libc-cancellation.c
index 4d38d4222d5b153d91201e2b13ef589aae57472c..01972a25578a2b7ba67c12398fab017cfe084d0f 100644 (file)
--- 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 91eb6e0e2e560e183fda2762ce7f6b7e1d79865d..0b28a329788ed613c0fee1acbf24cb0c9a99b73d 100644 (file)
--- 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
+

diff --git a/misc/Versions b/misc/Versions
index f05915a28ee82802d13af245d4f7391ca7080518..674ac48544a4b0e2e048f90f0b1849458fbe3f7c 100644 (file)
--- a/misc/Versions
+++ b/misc/Versions
@@ -127,13 +127,10 @@ libc {
     # s*
     setxattr;
   }
-  GLIBC_2.3.1 {
-    # Support for cancellation points.
-    __libc_readv; __libc_writev;
-  }
   GLIBC_PRIVATE {
     # functions which have an additional interface since they are
     # cancelable.
     __libc_fsync; __libc_msync;
+    __libc_readv; __libc_writev;
   }
 }

diff --git a/sysvipc/Versions b/sysvipc/Versions
index 93c322e61a87cab2d125381e0a0014a4e464db1f..57ebc1f17e4209f59e0d858e41f92e101b592e23 100644 (file)
--- a/sysvipc/Versions
+++ b/sysvipc/Versions
@@ -9,7 +9,7 @@ libc {
     # s*
     semctl; semget; semop; shmat; shmctl; shmdt; shmget;
   }
-  GLIBC_2.3.1 {
+  GLIBC_PRIVATE {
     # Cancellation point entries.
     __libc_msgrcv; __libc_msgsnd;
   }