summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--sysdeps/unix/sysv/aix/Makefile2
-rw-r--r--sysdeps/unix/sysv/aix/uitrunc.c42
4 files changed, 55 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cce6414a95..ce1143c8fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-06 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/aix/Makefile [$(subdir)==misc]
+ (sysdep_routines): Add uitrunc.
+ * sysdeps/unix/sysv/aix/uitrunc.c: New file.
+ Patches by Michael Keezer <mkeezer@redhat.com>.
+
2000-12-06 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/ioctl.c (__ioctl): Don't clobber ARG as we copy in
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index feb7f31b24..bbe32c654d 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-06 Wolfram Gloger <wg@malloc.de>
+
+ * join.c (pthread_detach): Allow case where the thread has already
+ terminated.
+
2000-12-05 Andreas Jaeger <aj@suse.de>
* sysdeps/mips/pspinlock.c (__pthread_spin_lock): Don't set mips2.
diff --git a/sysdeps/unix/sysv/aix/Makefile b/sysdeps/unix/sysv/aix/Makefile
index cb8683bee5..6c9ce1113e 100644
--- a/sysdeps/unix/sysv/aix/Makefile
+++ b/sysdeps/unix/sysv/aix/Makefile
@@ -6,7 +6,7 @@
static-start-installed-name = /usr/lib/crt0.o
ifeq ($(subdir),misc)
-sysdep_routines += dl-open dl-sym dl-close restf savef
+sysdep_routines += dl-open dl-sym dl-close restf savef uitrunc
endif
ifeq ($(subdir),login)
diff --git a/sysdeps/unix/sysv/aix/uitrunc.c b/sysdeps/unix/sysv/aix/uitrunc.c
new file mode 100644
index 0000000000..34a109b409
--- /dev/null
+++ b/sysdeps/unix/sysv/aix/uitrunc.c
@@ -0,0 +1,42 @@
+/* Copyright (C) 2000 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <math.h>
+
+/* The uitrunc function returns the nearest unsigned integer
+ to the x parameter in the direction of 0. This actions is
+ equivalent to truncation off the fraction bits of the x
+ parameter and then converting x to an unsigned integer. */
+unsigned int
+__uitrunc (double x)
+{
+ double xrf;
+ unsigned int xr;
+ xr = (unsigned int) x;
+ xrf = (double) xr;
+ if (x >= 0.0)
+ if (x - xrf >= 0.5 && x - xrf < 1.0 && x + 1 > 0)
+ return x + 1;
+ else
+ return x;
+ else
+ if (xrf - x >= 0.5 && xrf - x < 1.0 && x - 1 < 0)
+ return x - 1;
+ else
+ return x;
+}