Update.

2003-01-15  Dmitry V. Levin  <ldv@altlinux.org>

	* sysdeps/unix/sysv/linux/ptsname.c: Fix typo in comment.

diff --git a/ChangeLog b/ChangeLog
index f1dc2a32c1781da67e8458e58ad9b7d116ad6137..bef70791348c53c0a1e9aa2d64881d8373a4856e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-15  Dmitry V. Levin  <ldv@altlinux.org>
+
+       * sysdeps/unix/sysv/linux/ptsname.c: Fix typo in comment.
+
 2003-01-16  Jakub Jelinek  <jakub@redhat.com>
 
        * posix/regcomp.c (re_compile_internal): If clearing buffer, clear

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index fdcf98d2db513f2de147708c2a0f96a7932df952..6a844b928cb8d0b9a0c728b572fda0fba4efbb7f 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-16  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/i386/tls.h (INIT_SYSINFO): Initialize head->sysinfo even
+       if not SHARED.
+
 2003-01-15  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/pthread/bits/libc-lock.h (__libc_lock_init,

diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h
index 216ba554f6d79eb18ca3142d0d8487b8bd532e45..118c9c02d1488ffc60c0f874fbe49e2786296549 100644 (file)
--- a/linuxthreads/sysdeps/i386/tls.h
+++ b/linuxthreads/sysdeps/i386/tls.h
@@ -1,5 +1,5 @@
 /* Definition for thread-local data handling.  linuxthreads/i386 version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -182,7 +182,7 @@ TLS_DO_MODIFY_LDT_KERNEL_CHECK(                                                   \
   TLS_DO_MODIFY_LDT ((descr), 0)
 #  endif
 
-#if defined NEED_DL_SYSINFO && defined SHARED
+#if defined NEED_DL_SYSINFO
 # define INIT_SYSINFO \
   head->sysinfo = GL(dl_sysinfo)
 #else

diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h
index f830db78dc935b80bfafceda6e6789cfde003bbb..c4bd1def8a0509b13c8964a592452f2c14b4f259 100644 (file)
--- a/nptl/sysdeps/i386/tls.h
+++ b/nptl/sysdeps/i386/tls.h
@@ -1,5 +1,5 @@
 /* Definition for thread-local data handling.  nptl/i386 version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -161,7 +161,7 @@ union user_desc_init
 #  define TLS_LOAD_EBX
 # endif
 
-#if defined NEED_DL_SYSINFO && defined SHARED
+#if defined NEED_DL_SYSINFO
 # define INIT_SYSINFO \
   _head->sysinfo = GL(dl_sysinfo)
 #else

diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c
index da4809f3722e5f25ae7bb597edaeb8036e46d7ff..9c364b18b4df18d44c79f35adc27c42d0bd1abe7 100644 (file)
--- a/sysdeps/unix/sysv/linux/ptsname.c
+++ b/sysdeps/unix/sysv/linux/ptsname.c
@@ -35,7 +35,7 @@
    || (major ((Dev)) == 4 && minor ((Dev)) >= 128 && minor ((Dev)) < 192)     \
    || (major ((Dev)) >= 128 && major ((Dev)) < 136))
 
-/* Check if DEV corresponds to a master pseudo terminal device.  */
+/* Check if DEV corresponds to a slave pseudo terminal device.  */
 #define SLAVE_P(Dev)                                                          \
   (major ((Dev)) == 3                                                         \
    || (major ((Dev)) == 4 && minor ((Dev)) >= 192 && minor ((Dev)) < 256)     \