diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | linuxthreads/libc-cancellation.c | 7 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/useldt.h | 3 | ||||
| -rw-r--r-- | misc/Versions | 5 | ||||
| -rw-r--r-- | sysvipc/Versions | 2 |
5 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index af82aba95b..e6d50f95ec 100644 --- 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 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 + diff --git a/misc/Versions b/misc/Versions index f05915a28e..674ac48544 100644 --- 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 93c322e61a..57ebc1f17e 100644 --- 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; } |