Update.

2004-02-12  Ulrich Drepper  <drepper@redhat.com>

	* posix/getopt.h: Add some non-gcc support.  Patch by Aharon Robbins.

2004-02-12  Mark Brown  <bmark@us.ibm.com>

	* sysdeps/ia64/fpu/e_fmodf.S: Added text of Intel license.

	* sysdeps/powerpc/fpu/s_lrint.c: Move to...
	* sysdeps/powerpc/powerpc32/fpu/s_lrint.c: ... here.
	* sysdeps/powerpc/fpu/s_llrint.c: Move to...
	* sysdeps/powerpc/powerpc32/fpu/s_llrint.c: ... here.
	* sysdeps/powerpc/fpu/s_llrintf.c: Move to...
	* sysdeps/powerpc/powerpc32/fpu/s_llrintf.c: ... here.
	* sysdeps/powerpc/powerpc64/fpu/s_lrint.c: New file.
	* sysdeps/powerpc/powerpc64/fpu/s_llrint.c: New file.
	* sysdeps/powerpc/powerpc64/fpu/s_lrintf.S: New file.
	* sysdeps/powerpc/powerpc64/fpu/s_llrintf.c: New file.

9 files changed, 122 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e874495..2c00fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
+2004-02-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* posix/getopt.h: Add some non-gcc support.  Patch by Aharon Robbins.
+
+2004-02-12  Mark Brown  <bmark@us.ibm.com>
+
+	* sysdeps/ia64/fpu/e_fmodf.S: Added text of Intel license.
+
 2004-02-12  Jakub Jelinek  <jakub@redhat.com>
 
+	* sysdeps/powerpc/fpu/s_lrint.c: Move to...
+	* sysdeps/powerpc/powerpc32/fpu/s_lrint.c: ... here.
+	* sysdeps/powerpc/fpu/s_llrint.c: Move to...
+	* sysdeps/powerpc/powerpc32/fpu/s_llrint.c: ... here.
+	* sysdeps/powerpc/fpu/s_llrintf.c: Move to...
+	* sysdeps/powerpc/powerpc32/fpu/s_llrintf.c: ... here.
+	* sysdeps/powerpc/powerpc64/fpu/s_lrint.c: New file.
+	* sysdeps/powerpc/powerpc64/fpu/s_llrint.c: New file.
+	* sysdeps/powerpc/powerpc64/fpu/s_lrintf.S: New file.
+	* sysdeps/powerpc/powerpc64/fpu/s_llrintf.c: New file.
+
 	* math/libm-test.inc (lrint_test): Add new test.
 	(llrint_test, lround_test, llround_test): Likewise.
 	* sysdeps/ieee754/ldbl-128/s_lroundl.c (__lroundl): Fix special case
diff --git a/posix/getopt.h b/posix/getopt.h
index 53cb2ba..675d3a7 100644
--- a/posix/getopt.h
+++ b/posix/getopt.h
@@ -1,5 +1,6 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999,2001,2003 Free Software Foundation, Inc.
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+   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
@@ -35,6 +36,9 @@
 #endif
 
 #ifndef __THROW
+# ifndef __GNUC__
+#  define __GNUC_PREREQ(maj, min) (0)
+# endif
 # if defined __cplusplus && __GNUC_PREREQ (2,8)
 #  define __THROW	throw ()
 # else
diff --git a/sysdeps/ia64/fpu/e_fmodf.S b/sysdeps/ia64/fpu/e_fmodf.S
index 9ac03a9..5b6390e 100644
--- a/sysdeps/ia64/fpu/e_fmodf.S
+++ b/sysdeps/ia64/fpu/e_fmodf.S
@@ -6,6 +6,21 @@
 // Bob Norin, Shane Story, and Ping Tak Peter Tang of the Computational 
 // Software Lab, Intel Corporation.
 //
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+// * Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// * The name of Intel Corporation may not be used to endorse or promote
+// products derived from this software without specific prior written
+// permission.
+//
 // WARRANTY DISCLAIMER
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
diff --git a/sysdeps/powerpc/fpu/s_llrint.c b/sysdeps/powerpc/powerpc32/fpu/s_llrint.c
index 7fdc296..7fdc296 100644
--- a/sysdeps/powerpc/fpu/s_llrint.c
+++ b/sysdeps/powerpc/powerpc32/fpu/s_llrint.c
diff --git a/sysdeps/powerpc/fpu/s_llrintf.c b/sysdeps/powerpc/powerpc32/fpu/s_llrintf.c
index 0439e45..0439e45 100644
--- a/sysdeps/powerpc/fpu/s_llrintf.c
+++ b/sysdeps/powerpc/powerpc32/fpu/s_llrintf.c
diff --git a/sysdeps/powerpc/fpu/s_lrint.c b/sysdeps/powerpc/powerpc32/fpu/s_lrint.c
index c78fb03..c78fb03 100644
--- a/sysdeps/powerpc/fpu/s_lrint.c
+++ b/sysdeps/powerpc/powerpc32/fpu/s_lrint.c
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrint.c b/sysdeps/powerpc/powerpc64/fpu/s_llrint.c
new file mode 100644
index 0000000..907299b
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/fpu/s_llrint.c
@@ -0,0 +1,46 @@
+/* Round a double value to a long long in the current rounding mode.
+   Copyright (C) 1997, 2004 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* Kludge to avoid decls that will confuse strong_alias below.  */
+#define __lrint XXX__lrint
+#define __lrintl XXX__lrintl
+#define lrint XXXlrint
+#define lrintl XXXlrintl
+
+#include "math.h"
+
+#undef __lrint
+#undef __lrintl
+#undef lrint
+#undef lrintl
+
+long long int
+__llrint (double x)
+{
+  return (long long int) __rint (x);
+}
+string_alias (__llrint, __lrint)
+weak_alias (__llrint, llrint)
+weak_alias (__lrint, lrint)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__llrint, __llrintl)
+weak_alias (__llrint, llrintl)
+strong_alias (__lrint, __lrintl)
+weak_alias (__lrint, lrintl)
+#endif
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c b/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c
new file mode 100644
index 0000000..90db250
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c
@@ -0,0 +1,36 @@
+/* Round a float value to a long long in the current rounding mode.
+   Copyright (C) 1997, 2004 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* Kludge to avoid decls that will confuse strong_alias below.  */
+#define __lrintl XXX__lrintf
+#define lrintl XXXlrintf
+
+#include "math.h"
+
+#undef __lrintf
+#undef lrintf
+
+long long int
+__llrintf (float x)
+{
+  return (long long int) __rintf (x);
+}
+strong_alias (__llrintf, __lrintf)
+weak_alias (__llrintf, llrintf)
+weak_alias (__lrintf, lrintf)
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S b/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S
new file mode 100644
index 0000000..3ea4e29
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S
@@ -0,0 +1 @@
+/* __lrintf is in s_llrintf.c  */