Updated to fedora-glibc-20080216T1726 cvs/fedora-glibc-2_7_90-7

10 files changed, 97 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 15035ff2b8..19af4b05dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2008-02-15  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #5737]
+	* resolv/netdb.h: Make NI_MAXHOST and NI_MAXSERV available when
+	__USE_MISC is defined.
+
+2008-02-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sys/timerfd.h: New file.
+	* sysdeps/unix/sysv/linux/Makefile [subdir=misc] (sysdep_headers): Add
+	sys/timerfd.h.
+	* sysdeps/unix/sysv/linux/syscalls.list: Add timerfd_create,
+	timerfd_gettime, timerfd_settime.
+	* sysdeps/unix/sysv/linux/Versions: Add timerfd_create,
+	timerfd_gettime, timerfd_settime for GLIBC_2.8.
+
+2008-02-08  Roland McGrath  <roland@redhat.com>
+
+	* elf/elf.h (NT_PPC_SPE): New macro.
+
+2008-02-06  Roland McGrath  <roland@redhat.com>
+
+	* Makerules ($(common-objpfx)sysd-rules):
+	Depend on $(sysdep-makeconfigs).
+
 2008-01-31  Roland McGrath  <roland@redhat.com>
 
 	[BZ #5442]
diff --git a/Makerules b/Makerules
index 3661ad4e9d..ab36e2f178 100644
--- a/Makerules
+++ b/Makerules
@@ -220,7 +220,8 @@ sysd-rules-force = FORCE
 FORCE:
 endif
 $(common-objpfx)sysd-rules: $(common-objpfx)config.make $(..)Makerules \
-			    $(sysdep-makefiles) $(sysd-rules-force)
+			    $(sysdep-makefiles) $(sysdep-makeconfigs) \
+			    $(sysd-rules-force)
 	-@rm -f $@T
 	(echo 'sysd-rules-sysdirs := $(config-sysdirs)';		      \
 	 for dir in $(config-sysdirs); do				      \
diff --git a/elf/elf.h b/elf/elf.h
index 3fc6244c0c..c087c6e714 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -606,6 +606,7 @@ typedef struct
 #define NT_PRFPXREG	20		/* Contains copy of fprxregset struct */
 #define NT_PRXFPREG	0x46e62b7f	/* Contains copy of user_fxsr_struct */
 #define NT_PPC_VMX	0x100		/* PowerPC Altivec/VMX registers */
+#define NT_PPC_SPE	0x101		/* PowerPC SPE/EVR registers */
 #define NT_386_TLS	0x200		/* i386 TLS slots (struct user_desc) */
 
 /* Legal values for the note segment descriptor types for object files.  */
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 91c24f1eb8..7fd0728f50 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-f8
-fedora-sync-date := 2008-02-01 10:17 UTC
-fedora-sync-tag := fedora-glibc-20080201T1017
+fedora-sync-date := 2008-02-16 17:26 UTC
+fedora-sync-tag := fedora-glibc-20080216T1726
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 85d8c1e293..576864c435 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 6
+%define glibcrelease 7
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1011,6 +1011,12 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sat Feb 16 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-7
+- update to trunk
+  - make NI_MAXHOST and NI_MAXSERV available even in BSDish
+    namespaces (BZ#5737)
+  - timerfd_* syscalls
+
 * Fri Feb  1 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-6
 - fix build
 
diff --git a/resolv/netdb.h b/resolv/netdb.h
index 47669c8002..a260c487bc 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -612,7 +612,7 @@ struct gaicb
 #  define EAI_IDN_ENCODE  -105	/* IDN encoding failed.  */
 # endif
 
-# ifdef __USE_GNU
+# ifdef __USE_MISC
 #  define NI_MAXHOST      1025
 #  define NI_MAXSERV      32
 # endif
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 5f32d1a4a9..ddbb4f68f8 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -25,7 +25,8 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  sys/quota.h sys/fsuid.h \
 		  scsi/sg.h scsi/scsi.h scsi/scsi_ioctl.h sys/pci.h \
 		  sys/ultrasound.h sys/raw.h sys/personality.h sys/epoll.h \
-		  bits/a.out.h sys/inotify.h sys/signalfd.h sys/eventfd.h
+		  bits/a.out.h sys/inotify.h sys/signalfd.h sys/eventfd.h \
+		  sys/timerfd.h
 
 install-others += $(inst_includedir)/bits/syscall.h
 
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index dbf2ae5901..af4c293c26 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -132,6 +132,9 @@ libc {
   GLIBC_2.7 {
     eventfd; eventfd_read; eventfd_write; signalfd;
   }
+  GLIBC_2.8 {
+    timerfd_create; timerfd_settime; timerfd_gettime;
+  }
   GLIBC_PRIVATE {
     # functions used in other libraries
     __syscall_rt_sigqueueinfo;
diff --git a/sysdeps/unix/sysv/linux/sys/timerfd.h b/sysdeps/unix/sysv/linux/sys/timerfd.h
new file mode 100644
index 0000000000..0a4b81c9b7
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sys/timerfd.h
@@ -0,0 +1,50 @@
+/* Copyright (C) 2008 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.  */
+
+#ifndef	_SYS_TIMERFD_H
+#define	_SYS_TIMERFD_H	1
+
+#include <time.h>
+
+
+/* Bits to be set in the FLAGS parameter of `timerfd_settime'.  */
+enum
+  {
+    TFD_TIMER_ABSTIME = 1 << 0
+#define TFD_TIMER_ABSTIME TFD_TIMER_ABSTIME
+  };
+
+
+__BEGIN_DECLS
+
+/* Return file descriptor for new interval timer source.  */
+extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW;
+
+/* Set next expiration time of interval timer source UFD to UTMR.  If
+   FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is
+   absolute.  Optionally return the old expiration time in OTMR.  */
+extern int timerfd_settime (int __ufd, int __flags,
+			    __const struct itimerspec *__utmr,
+			    struct itimerspec *__otmr) __THROW;
+
+/* Return the next expiration time of UFD.  */
+extern int timerfd_gettime (int __ufd, struct itimerspec *__otmr) __THROW;
+
+__END_DECLS
+
+#endif /* sys/timerfd.h */
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index e304a78ea8..b3ecf9f478 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -94,3 +94,7 @@ fremovexattr	-	fremovexattr	i:is	fremovexattr
 mq_timedsend	-	mq_timedsend	Ci:ipiip	__GI_mq_timedsend	mq_timedsend
 mq_timedreceive	-	mq_timedreceive	Ci:ipipp	__GI_mq_timedreceive	mq_timedreceive
 mq_setattr	-	mq_getsetattr	i:ipp	__GI_mq_setattr	mq_setattr
+
+timerfd_create	EXTRA	timerfd_create	i:ii	timerfd_create
+timerfd_settime	EXTRA	timerfd_settime	i:iipp	timerfd_settime
+timerfd_gettime	EXTRA	timerfd_gettime	i:ip	timerfd_gettime