aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-09-23 06:13:18 +0000
committerUlrich Drepper <drepper@redhat.com>2003-09-23 06:13:18 +0000
commit6a8a852bcb7b70fdd2c7f43e2b5c6effa6f9a24e (patch)
tree4c92d84d812bff7db337149c9d56d29886686d50
parent5d78bb43349cbd51805bcf0682af08a45b9988b8 (diff)
downloadglibc-6a8a852bcb7b70fdd2c7f43e2b5c6effa6f9a24e.zip
glibc-6a8a852bcb7b70fdd2c7f43e2b5c6effa6f9a24e.tar.gz
glibc-6a8a852bcb7b70fdd2c7f43e2b5c6effa6f9a24e.tar.bz2
Update.
2003-09-20 Alfred M. Szmidt <ams@kemisten.nu> * sysdeps/generic/utmp_file.c (setutent_file, LOCK_FILE, UNLOCK_FILE, setutent_file): Use fcntl_not_cancel instead of __fcntl_nocancel.
-rw-r--r--ChangeLog6
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/attr.c4
-rw-r--r--sysdeps/generic/utmp_file.c8
4 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 798793a..bd92a1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-20 Alfred M. Szmidt <ams@kemisten.nu>
+
+ * sysdeps/generic/utmp_file.c (setutent_file, LOCK_FILE,
+ UNLOCK_FILE, setutent_file): Use fcntl_not_cancel instead of
+ __fcntl_nocancel.
+
2003-09-22 Ulrich Drepper <drepper@redhat.com>
* malloc/malloc.c: Include <stdint.h>.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index adbb233..abd4a4f 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-18 H.J. Lu <hongjiu.lu@intel.com>
+
+ * attr.c (__pthread_attr_init_2_1): Double __guardsize size
+ if NEED_SEPARATE_REGISTER_STACK is defined.
+
2003-09-22 Philip Blundell <philb@gnu.org>
* forward.c: Add _pthread_cleanup_push, _pthread_cleanup_pop.
diff --git a/linuxthreads/attr.c b/linuxthreads/attr.c
index 5bef265..56f6cba 100644
--- a/linuxthreads/attr.c
+++ b/linuxthreads/attr.c
@@ -36,7 +36,11 @@ int __pthread_attr_init_2_1(pthread_attr_t *attr)
attr->__schedparam.sched_priority = 0;
attr->__inheritsched = PTHREAD_EXPLICIT_SCHED;
attr->__scope = PTHREAD_SCOPE_SYSTEM;
+#ifdef NEED_SEPARATE_REGISTER_STACK
+ attr->__guardsize = ps + ps;
+#else
attr->__guardsize = ps;
+#endif
attr->__stackaddr = NULL;
attr->__stackaddr_set = 0;
attr->__stacksize = STACK_SIZE - ps;
diff --git a/sysdeps/generic/utmp_file.c b/sysdeps/generic/utmp_file.c
index dc31e64..493af65 100644
--- a/sysdeps/generic/utmp_file.c
+++ b/sysdeps/generic/utmp_file.c
@@ -78,7 +78,7 @@ static void timeout_handler (int signum) {};
memset (&fl, '\0', sizeof (struct flock)); \
fl.l_type = (type); \
fl.l_whence = SEEK_SET; \
- if (__fcntl_nocancel ((fd), F_SETLKW, &fl) < 0)
+ if (fcntl_not_cancel ((fd), F_SETLKW, &fl) < 0)
#define LOCKING_FAILED() \
goto unalarm_return
@@ -86,7 +86,7 @@ static void timeout_handler (int signum) {};
#define UNLOCK_FILE(fd) \
/* Unlock the file. */ \
fl.l_type = F_UNLCK; \
- __fcntl_nocancel ((fd), F_SETLKW, &fl); \
+ fcntl_not_cancel ((fd), F_SETLKW, &fl); \
\
unalarm_return: \
/* Reset the signal handler and alarm. We must reset the alarm \
@@ -150,9 +150,9 @@ setutent_file (void)
}
/* We have to make sure the file is `closed on exec'. */
- result = __fcntl_nocancel (file_fd, F_GETFD, 0);
+ result = fcntl_not_cancel (file_fd, F_GETFD, 0);
if (result >= 0)
- result = __fcntl_nocancel (file_fd, F_SETFD, result | FD_CLOEXEC);
+ result = fcntl_not_cancel (file_fd, F_SETFD, result | FD_CLOEXEC);
if (result == -1)
{
close_not_cancel_no_status (file_fd);