[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r10688 - in /trunk: libc/ libc/elf/ libc/hurd/ libc/hurd/hurd/ libc/sunrpc/ libc/sysdeps/mach/hurd/ libc/sysdeps/powerpc/pow...



Author: joseph
Date: Thu Jun 10 12:17:37 2010
New Revision: 10688

Log:
Merge changes between r10503 and r10687 from /fsf/trunk.

Added:
    trunk/libc/sysdeps/powerpc/powerpc32/power7/memset.S
      - copied unchanged from r10687, fsf/trunk/libc/sysdeps/powerpc/powerpc32/power7/memset.S
    trunk/libc/sysdeps/powerpc/powerpc64/power7/memset.S
      - copied unchanged from r10687, fsf/trunk/libc/sysdeps/powerpc/powerpc64/power7/memset.S
    trunk/libc/sysdeps/unix/sysv/linux/internal_recvmmsg.S
      - copied unchanged from r10687, fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_recvmmsg.S
    trunk/libc/sysdeps/unix/sysv/linux/recvmmsg.c
      - copied unchanged from r10687, fsf/trunk/libc/sysdeps/unix/sysv/linux/recvmmsg.c
    trunk/ports/data/c++-types-m68k-linux-gnu.data
      - copied unchanged from r10687, fsf/trunk/ports/data/c++-types-m68k-linux-gnu.data
    trunk/ports/data/localplt-m68k-linux-gnu.data
      - copied unchanged from r10687, fsf/trunk/ports/data/localplt-m68k-linux-gnu.data
    trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S
      - copied unchanged from r10687, fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S
      - copied unchanged from r10687, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S
    trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c
      - copied unchanged from r10687, fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c
Modified:
    trunk/libc/ChangeLog
    trunk/libc/elf/dl-runtime.c
    trunk/libc/hurd/hurd/fd.h
    trunk/libc/hurd/lookup-at.c
    trunk/libc/sunrpc/clnt_tcp.c
    trunk/libc/sunrpc/clnt_udp.c
    trunk/libc/sunrpc/clnt_unix.c
    trunk/libc/sysdeps/mach/hurd/linkat.c
    trunk/libc/sysdeps/powerpc/powerpc32/power7/memcpy.S
    trunk/libc/sysdeps/unix/sysv/linux/Makefile
    trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
    trunk/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
    trunk/libc/sysdeps/unix/sysv/linux/socketcall.h
    trunk/libc/sysdeps/unix/sysv/linux/sys/timex.h
    trunk/libc/sysdeps/unix/sysv/linux/syscalls.list
    trunk/libc/sysdeps/x86_64/multiarch/init-arch.c
    trunk/ports/ChangeLog.arm
    trunk/ports/ChangeLog.hppa
    trunk/ports/ChangeLog.m68k
    trunk/ports/ChangeLog.mips
    trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Thu Jun 10 12:17:37 2010
@@ -1,3 +1,57 @@
+2010-06-02  Emilio Pozuelo Monfort  <pochu27@xxxxxxxxx>
+
+	* hurd/lookup-at.c (__file_name_lookup_at): Accept
+	AT_SYMLINK_FOLLOW in AT_FLAGS.  Fail with EINVAL if both
+	AT_SYMLINK_FOLLOW and AT_SYMLINK_NOFOLLOW are present
+	in AT_FLAGS.
+	* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
+	* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
+
+2010-05-28  Luis Machado  <luisgpm@xxxxxxxxxx>
+
+	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
+
+2010-05-26  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #11640]
+	* sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
+	Properly check family and model.
+
+2010-05-26  Takashi Yoshii  <takashi.yoshii.zj@xxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sh/sh4/register-dump.h: Fix iov[] size.
+
+2010-05-24  Luis Machado  <luisgpm@xxxxxxxxxx>
+
+	* sysdeps/powerpc/powerpc32/power7/memset.S: POWER7 32-bit memset fix.
+
+2010-05-21  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* elf/dl-runtime.c (_dl_profile_fixup): Don't crash on unresolved weak
+	symbol reference.
+
+2010-05-19  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* elf/dl-runtime.c (_dl_fixup): Don't crash on unresolved weak
+	symbol reference.
+
+2010-05-21  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add recvmmsg
+	and internal_recvmmsg.
+	* sysdeps/unix/sysv/linux/recvmmsg.c: New file.
+	* sysdeps/unix/sysv/linux/internal_recvmmsg.S: New file.
+	* sysdeps/unix/sysv/linux/socketcall.h (SOCKOP_recvmmsg): Define.
+	* sysdeps/unix/sysv/linux/syscalls.list (recvmmsg): Remove.
+
+	* sunrpc/clnt_tcp.c (clnttcp_control): Add missing break.
+	* sunrpc/clnt_udp.c (clntudp_control): Likewise.
+	* sunrpc/clnt_unix.c (clntunix_control): Likewise.
+
+2010-05-20  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sys/timex.h: Use __REDIRECT_NTH.
+
 2010-05-17  Luis Machado  <luisgpm@xxxxxxxxxx>
 
 	POWER7 optimizations.

Modified: trunk/libc/elf/dl-runtime.c
==============================================================================
--- trunk/libc/elf/dl-runtime.c (original)
+++ trunk/libc/elf/dl-runtime.c Thu Jun 10 12:17:37 2010
@@ -1,5 +1,5 @@
 /* On-demand PLT fixup for shared objects.
-   Copyright (C) 1995-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1995-2009, 2010 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
@@ -144,7 +144,8 @@
   /* And now perhaps the relocation addend.  */
   value = elf_machine_plt_value (l, reloc, value);
 
-  if (__builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0))
+  if (sym != NULL
+      && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0))
     value = ((DL_FIXUP_VALUE_TYPE (*) (void)) DL_FIXUP_VALUE_ADDR (value)) ();
 
   /* Finally, fix up the plt itself.  */
@@ -231,8 +232,9 @@
 				       ? LOOKUP_VALUE_ADDRESS (result)
 					 + defsym->st_value : 0);
 
-	  if (__builtin_expect (ELFW(ST_TYPE) (defsym->st_info)
-				== STT_GNU_IFUNC, 0))
+	  if (defsym != NULL
+	      && __builtin_expect (ELFW(ST_TYPE) (defsym->st_info)
+				   == STT_GNU_IFUNC, 0))
 	    value = ((DL_FIXUP_VALUE_TYPE (*) (void))
 		     DL_FIXUP_VALUE_ADDR (value)) ();
 	}
@@ -369,7 +371,7 @@
       struct audit_ifaces *afct = GLRO(dl_audit);
       for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
 	{
- 	  if (afct->ARCH_LA_PLTENTER != NULL
+	  if (afct->ARCH_LA_PLTENTER != NULL
 	      && (reloc_result->enterexit
 		  & (LA_SYMB_NOPLTENTER << (2 * (cnt + 1)))) == 0)
 	    {

Modified: trunk/libc/hurd/hurd/fd.h
==============================================================================
--- trunk/libc/hurd/hurd/fd.h (original)
+++ trunk/libc/hurd/hurd/fd.h Thu Jun 10 12:17:37 2010
@@ -254,8 +254,9 @@
 			 const sigset_t *sigmask);
 
 /* Variant of file_name_lookup used in *at function implementations.
-   AT_FLAGS should contain only AT_SYMLINK_NOFOLLOW; other bits
-   cause EINVAL.  */
+   AT_FLAGS may only contain AT_SYMLINK_FOLLOW or AT_SYMLINK_NOFOLLOW,
+   which will remove and add O_NOLINK from FLAGS respectively.
+   Other bits cause EINVAL.  */
 extern file_t __file_name_lookup_at (int fd, int at_flags,
 				     const char *file_name,
 				     int flags, mode_t mode);

Modified: trunk/libc/hurd/lookup-at.c
==============================================================================
--- trunk/libc/hurd/lookup-at.c (original)
+++ trunk/libc/hurd/lookup-at.c Thu Jun 10 12:17:37 2010
@@ -30,8 +30,14 @@
   error_t err;
   file_t result;
 
+  if ((at_flags & AT_SYMLINK_FOLLOW) && (at_flags & AT_SYMLINK_NOFOLLOW))
+    return (__hurd_fail (EINVAL), MACH_PORT_NULL);
+
   flags |= (at_flags & AT_SYMLINK_NOFOLLOW) ? O_NOLINK : 0;
   at_flags &= ~AT_SYMLINK_NOFOLLOW;
+  if (at_flags & AT_SYMLINK_FOLLOW)
+    flags &= ~O_NOLINK;
+  at_flags &= ~AT_SYMLINK_FOLLOW;
   if (at_flags != 0)
     return (__hurd_fail (EINVAL), MACH_PORT_NULL);
 

Modified: trunk/libc/sunrpc/clnt_tcp.c
==============================================================================
--- trunk/libc/sunrpc/clnt_tcp.c (original)
+++ trunk/libc/sunrpc/clnt_tcp.c Thu Jun 10 12:17:37 2010
@@ -399,6 +399,7 @@
       /* This will set the xid of the NEXT call */
       *(u_long *)ct->ct_mcall =  htonl (*(u_long *)info - 1);
       /* decrement by 1 as clnttcp_call() increments once */
+      break;
     case CLGET_VERS:
       /*
        * This RELIES on the information that, in the call body,

Modified: trunk/libc/sunrpc/clnt_udp.c
==============================================================================
--- trunk/libc/sunrpc/clnt_udp.c (original)
+++ trunk/libc/sunrpc/clnt_udp.c Thu Jun 10 12:17:37 2010
@@ -582,6 +582,7 @@
       /* This will set the xid of the NEXT call */
       *(u_long *)cu->cu_outbuf =  htonl(*(u_long *)info - 1);
       /* decrement by 1 as clntudp_call() increments once */
+      break;
     case CLGET_VERS:
       /*
        * This RELIES on the information that, in the call body,

Modified: trunk/libc/sunrpc/clnt_unix.c
==============================================================================
--- trunk/libc/sunrpc/clnt_unix.c (original)
+++ trunk/libc/sunrpc/clnt_unix.c Thu Jun 10 12:17:37 2010
@@ -376,6 +376,7 @@
       /* This will set the xid of the NEXT call */
       *(u_long *) ct->ct_mcall =  htonl (*(u_long *)info - 1);
       /* decrement by 1 as clntunix_call() increments once */
+      break;
     case CLGET_VERS:
       /*
        * This RELIES on the information that, in the call body,

Modified: trunk/libc/sysdeps/mach/hurd/linkat.c
==============================================================================
--- trunk/libc/sysdeps/mach/hurd/linkat.c (original)
+++ trunk/libc/sysdeps/mach/hurd/linkat.c Thu Jun 10 12:17:37 2010
@@ -1,5 +1,5 @@
 /* Make a link between file names relative to open directories.  Hurd version.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006,2010 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
@@ -38,7 +38,9 @@
   file_t oldfile, linknode, todir;
   char *toname;
 
-  oldfile = __file_name_lookup_at (fromfd, flags, from, 0, 0);
+  /* POSIX says linkat doesn't follow symlinks by default, so pass
+     O_NOLINK.  That can be overridden by AT_SYMLINK_FOLLOW in FLAGS.  */
+  oldfile = __file_name_lookup_at (fromfd, flags, from, O_NOLINK, 0);
   if (oldfile == MACH_PORT_NULL)
     return -1;
 

Modified: trunk/libc/sysdeps/powerpc/powerpc32/power7/memcpy.S
==============================================================================
--- trunk/libc/sysdeps/powerpc/powerpc32/power7/memcpy.S (original)
+++ trunk/libc/sysdeps/powerpc/powerpc32/power7/memcpy.S Thu Jun 10 12:17:37 2010
@@ -365,7 +365,7 @@
 	addi    3,3,8
 0:
 	clrlwi  10,12,28      /* Check alignment of SRC.  */
-	srdi    9,31,4	      /* Number of full quadwords remaining.  */
+	srwi    9,31,4	      /* Number of full quadwords remaining.  */
 
 	/* The proper alignment is present, it is OK to copy the bytes now.  */
 L(copy_GE_32_unaligned_cont):
@@ -375,7 +375,7 @@
 	li      6,16	      /* Index for 16-bytes offsets.  */
 	li	7,32	      /* Index for 32-bytes offsets.  */
 	cmplwi  cr1,11,0
-	srdi    8,31,5	      /* Setup the loop counter.  */
+	srwi    8,31,5	      /* Setup the loop counter.  */
 	mr      10,3
 	mr      11,12
 	mtcrf   0x01,9

Modified: trunk/libc/sysdeps/unix/sysv/linux/Makefile
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/Makefile (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/Makefile Thu Jun 10 12:17:37 2010
@@ -12,7 +12,7 @@
 endif
 
 ifeq ($(subdir),socket)
-sysdep_routines += internal_accept4
+sysdep_routines += internal_accept4 recvmmsg internal_recvmmsg
 endif
 
 ifeq ($(subdir),misc)

Modified: trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h Thu Jun 10 12:17:37 2010
@@ -525,3 +525,8 @@
 #if __LINUX_KERNEL_VERSION >= 0x020620
 # define __ASSUME_F_GETOWN_EX	1
 #endif
+
+/* Support for the recvmmsg syscall was added in 2.6.33.  */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_RECVMMSG	1
+#endif

Modified: trunk/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h Thu Jun 10 12:17:37 2010
@@ -1,5 +1,5 @@
 /* Dump registers.
-   Copyright (C) 1999, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2009, 2010 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
@@ -58,7 +58,7 @@
 {
   char regs[22][8];
   char fpregs[34][8];
-  struct iovec iov[112];
+  struct iovec iov[22 * 2 + 34 * 2 + 2];
   size_t nr = 0;
 
 #define ADD_STRING(str) \

Modified: trunk/libc/sysdeps/unix/sysv/linux/socketcall.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/socketcall.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/socketcall.h Thu Jun 10 12:17:37 2010
@@ -44,5 +44,6 @@
 #define SOCKOP_sendmsg		16
 #define SOCKOP_recvmsg		17
 #define SOCKOP_accept4		18
+#define SOCKOP_recvmmsg		19
 
 #endif /* sys/socketcall.h */

Modified: trunk/libc/sysdeps/unix/sysv/linux/sys/timex.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/sys/timex.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/sys/timex.h Thu Jun 10 12:17:37 2010
@@ -140,9 +140,9 @@
 extern int __adjtimex (struct timex *__ntx) __THROW;
 extern int adjtimex (struct timex *__ntx) __THROW;
 
-#if defined __GNUC__ && __GNUC__ >= 2
-extern int ntp_gettime (struct ntptimeval *__ntv)
-     __asm__ ("ntp_gettimex") __THROW;
+#ifdef __REDIRECT_NTH
+extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv),
+			   ntp_gettimex);
 #else
 extern int ntp_gettimex (struct ntptimeval *__ntv) __THROW;
 # define ntp_gettime ntp_gettimex

Modified: trunk/libc/sysdeps/unix/sysv/linux/syscalls.list
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/syscalls.list (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/syscalls.list Thu Jun 10 12:17:37 2010
@@ -53,7 +53,6 @@
 putpmsg		-	putpmsg		i:ippii	putpmsg
 query_module	EXTRA	query_module	i:sipip	query_module
 quotactl	EXTRA	quotactl	i:isip	quotactl
-recvmmsg	EXTRA	recvmmsg	Ci:ipiip	recvmmsg
 remap_file_pages -	remap_file_pages i:piiii	__remap_file_pages remap_file_pages
 sched_getp	-	sched_getparam	i:ip	__sched_getparam	sched_getparam
 sched_gets	-	sched_getscheduler	i:i	__sched_getscheduler	sched_getscheduler

Modified: trunk/libc/sysdeps/x86_64/multiarch/init-arch.c
==============================================================================
--- trunk/libc/sysdeps/x86_64/multiarch/init-arch.c (original)
+++ trunk/libc/sysdeps/x86_64/multiarch/init-arch.c Thu Jun 10 12:17:37 2010
@@ -62,15 +62,15 @@
       unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax;
       unsigned int extended_family = (eax >> 20) & 0xff;
       unsigned int extended_model = (eax >> 12) & 0xf0;
-      if (__cpu_features.family == 0x0f)
+      if (family == 0x0f)
 	{
 	  family += extended_family;
 	  model += extended_model;
 	}
-      else if (__cpu_features.family == 0x06)
+      else if (family == 0x06)
 	{
 	  model += extended_model;
-	  switch (__cpu_features.model)
+	  switch (model)
 	    {
 	    case 0x1a:
 	    case 0x1e:

Modified: trunk/ports/ChangeLog.arm
==============================================================================
--- trunk/ports/ChangeLog.arm (original)
+++ trunk/ports/ChangeLog.arm Thu Jun 10 12:17:37 2010
@@ -1,3 +1,7 @@
+2010-05-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S: New.
+
 2010-04-08  Daniel Jacobowitz  <dan@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S: New file.

Modified: trunk/ports/ChangeLog.hppa
==============================================================================
--- trunk/ports/ChangeLog.hppa (original)
+++ trunk/ports/ChangeLog.hppa Thu Jun 10 12:17:37 2010
@@ -1,3 +1,8 @@
+2010-06-07  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/nptl/pthread.h: Update to agree
+	with generic file.
+
 2010-03-30  Carlos O'Donell <carlos@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/hppa/bits/socket.h: Define
@@ -21,7 +26,7 @@
 2010-02-02  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/hppa/makecontext.c (__makecontext):
-	Support more than 8 arguments. 
+	Support more than 8 arguments.
 
 2010-02-01  Kyle McMartin  <kyle@xxxxxxxxxx>
 
@@ -48,7 +53,7 @@
 
 	* sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h:
 	Use correct alignment for pthread_mutex_t, pthread_cond_t,
-	and pthread_rwlock_t.  
+	and pthread_rwlock_t.
 
 2009-11-22  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
@@ -64,7 +69,7 @@
 
 2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
-	* sysdeps/unix/sysv/linux/hppa/Versions (libc): Add 
+	* sysdeps/unix/sysv/linux/hppa/Versions (libc): Add
 	fallocate64@@GLIBC_2.11.
 	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
 	[__USE_GNU]: Define F_GETOWN_EX, and F_SETOWN_EX.
@@ -72,7 +77,7 @@
 	[__USE_FILE_OFFSET64 && __REDIRECT]: Define __REDIRECT.
 	[__USE_FILE_OFFSET64 && !__REDIRECT]: Define fallocate as
 	fallocate64.
-	[__USE_LARGEFILE64]: define fallocate64. 	
+	[__USE_LARGEFILE64]: define fallocate64.
 
 2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
@@ -108,10 +113,10 @@
 	* sysdeps/unix/sysv/linux/hppa/nptl/unwind-resume.c: Remove.
 
 2009-09-08  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
- 
+
 	sysdeps/unix/sysv/linux/hppa/
 	* internaltypes.h: New file.
- 
+
 	sysdeps/unix/sysv/linux/hppa/nptl/
 	* pthreadP.h: New file.
 	* pthread.h: New file.
@@ -159,7 +164,7 @@
 
 2009-02-25  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
-	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Define 
+	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Define
 	FUTEX_WAIT_BITSET, FUTEX_WAKE_BITSET, FUTEX_CLOCK_REALTIME,
 	and FUTEX_BITSET_MATCH_ANY.
 
@@ -173,7 +178,7 @@
 
 2009-02-13  Khem Raj  <raj.khem@xxxxxxxxx>
 
-	* sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c 
+	* sysdeps/unix/sysv/linux/hppa/nptl/unwind-forcedunwind.c
 	(libgcc_s_handle): New variable.
 	(pthread_cancel_init): Depend in libgcc_s_handle for decision to
 	load DSO.  Assign last.
@@ -201,9 +206,9 @@
 	    Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	[BZ #6037]
-	* sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Check for -11 
+	* sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Check for -11
 	(-EAGAIN) instead of 11. Loop again when the kernel
-	returns -45 (-EDEADLOCK). Add back memory clobber. 
+	returns -45 (-EDEADLOCK). Add back memory clobber.
 	Do not initialize lws_ret and lws_errno.
 
 2008-06-17  Guy Martin  <gmsoft@xxxxxxxxxxxx>
@@ -237,7 +242,7 @@
 	    Guy Martin <gmsoft@xxxxxxxxxxxx>
 
 	[BZ #5923]
-	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Pass 
+	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Pass
 	timespec and futexp.
 
 2008-02-22  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
@@ -385,7 +390,7 @@
 
 2007-05-17  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
-	* sysdeps/unix/sysv/linux/hppa/nptl/bits/semaphore.h 
+	* sysdeps/unix/sysv/linux/hppa/nptl/bits/semaphore.h
 	(SEM_VALUE_MAX): Remove.
 
 2007-05-17  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
@@ -395,14 +400,14 @@
 	(INLINE_SYSCALL): Use PIC_REG_DEF, PIC_REG_USE.
 	(INTERNAL_SYSCALL): Likewise.
 	(INTERNAL_SYSCALL_NCS): Likewise.
-	* sysdeps/unix/sysv/linux/hppa/sysdep.c (syscall): Use 
+	* sysdeps/unix/sysv/linux/hppa/sysdep.c (syscall): Use
 	PIC_REG_DEF, PIC_REG_USE.
 
 2007-05-01  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h
-	[__USE_XOPEN2K]: Define pthread_rwlock_t and 
-	pthread_rwlockattr_t. 
+	[__USE_XOPEN2K]: Define pthread_rwlock_t and
+	pthread_rwlockattr_t.
 
 2007-02-02  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
@@ -436,18 +441,18 @@
 2006-09-20  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (splice): Add offin
-	and offout arguments to the prototype. 
+	and offout arguments to the prototype.
 
 2006-09-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/hppa/nptl/tcb-offsets.sym: Define TID_THREAD_OFFSET.
-	* sysdeps/unix/sysv/linux/hppa/clone.S: Handle RESET_PID, and 
+	* sysdeps/unix/sysv/linux/hppa/clone.S: Handle RESET_PID, and
 	restore r19 before call to _exit.
 	* sysdeps/unix/sysv/linux/hppa/nptl/clone.S: New file.
 
 2006-09-13  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
-	* sysdeps/hppa/dl-machine.h (RTLD_START): Comment the use of 
+	* sysdeps/hppa/dl-machine.h (RTLD_START): Comment the use of
 	_dl_fini_plabel.
 	* sysdeps/hppa/elf/start.S: Correctly pass r23 to argument 6 of
 	__libc_start_main. Comment the order of arguments at entry and
@@ -467,7 +472,7 @@
 	as -EAGAIN.
 	* sysdeps/unix/sysv/linux/hppa/bits/mman.h: Adjust definitions to
 	match required standards.
-	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h 
+	* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
 	(lll_futex_wait): Return __ret.
 	(lll_futex_timed_wait): Likewise.
 	(lll_futex_wake): Likewise.
@@ -490,7 +495,7 @@
 
 2006-07-24  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
-	* sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h: 
+	* sysdeps/unix/sysv/linux/hppa/nptl/bits/pthreadtypes.h:
 	__SIZEOF_PTHREAD_COND_T is 64 bytes. Remove __PAD_ATOMIC_LOCK_T.
 
 2006-07-18  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
@@ -516,7 +521,7 @@
 
 	* sysdeps/unix/sysv/linux/hppa/xstat.c: New file.
 	* sysdeps/unix/sysv/linux/hppa/lxstat.c: Likewise.
-	* sysdeps/unix/sysv/linux/hppa/fxstat.c: Likewise. 
+	* sysdeps/unix/sysv/linux/hppa/fxstat.c: Likewise.
 	* sysdeps/unix/sysv/linux/hppa/fxstatat.c: Likewise.
 
 2006-07-13  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
@@ -545,12 +550,12 @@
 
 2006-06-08  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
-	* sysdeps/unix/sysv/linux/hppa/Versions: new errlist compat entry 
+	* sysdeps/unix/sysv/linux/hppa/Versions: new errlist compat entry
 	for up to 256 errnos
 
 2006-06-08  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
-	* sysdeps/hppa/hppa1.1/Implies: Remove ieee754/ldbl-128. 
+	* sysdeps/hppa/hppa1.1/Implies: Remove ieee754/ldbl-128.
 	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
 	[__LINUX_KERNEL_VERSION >= 0x020609]: Define __ASSUME_LWS_CAS.
 	* sysdeps/unix/sysv/linux/hppa/bits/atomic.h: New file.
@@ -648,9 +653,9 @@
 
 2006-04-19  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
-	* sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_GNU]: 
+	* sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_GNU]:
 	Define MMAP_FIXED.
-	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h [__USE_GNU]: 
+	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h [__USE_GNU]:
 	Define SYNC_FILE_RANGE_WAIT_BEFORE, SYNC_FILE_RANGE_WRITE,
 	SYNC_FILE_RANGE_WAIT_AFTER, sync_file_range, splice, tee.
 

Modified: trunk/ports/ChangeLog.m68k
==============================================================================
--- trunk/ports/ChangeLog.m68k (original)
+++ trunk/ports/ChangeLog.m68k Thu Jun 10 12:17:37 2010
@@ -1,3 +1,8 @@
+2010-05-22  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* data/c++-types-m68k-linux-gnu.data: New file.
+	* data/localplt-m68k-linux-gnu.data: New file.
+
 2010-03-13  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
 
 	* sysdeps/m68k/m680x0/fpu/s_ccosh.c: Use signbit macro.

Modified: trunk/ports/ChangeLog.mips
==============================================================================
--- trunk/ports/ChangeLog.mips (original)
+++ trunk/ports/ChangeLog.mips Thu Jun 10 12:17:37 2010
@@ -1,3 +1,8 @@
+2010-05-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c,
+	sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S: New.
+
 2010-04-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/libc-abis: New.

Modified: trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h
==============================================================================
--- trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h (original)
+++ trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/pthread.h Thu Jun 10 12:17:37 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -25,8 +25,6 @@
 #include <sched.h>
 #include <time.h>
 
-#define __need_sigset_t
-#include <signal.h>
 #include <bits/pthreadtypes.h>
 #include <bits/setjmp.h>
 #include <bits/wordsize.h>
@@ -49,7 +47,7 @@
   PTHREAD_MUTEX_RECURSIVE_NP,
   PTHREAD_MUTEX_ERRORCHECK_NP,
   PTHREAD_MUTEX_ADAPTIVE_NP
-#ifdef __USE_UNIX98
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
   ,
   PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP,
   PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP,
@@ -427,6 +425,18 @@
      __THROW;
 
 
+#ifdef __USE_GNU
+/* Get thread name visible in the kernel and its interfaces.  */
+extern int pthread_getname_np (pthread_t __target_thread, char *__buf,
+			       size_t __buflen)
+     __THROW __nonnull ((2));
+
+/* Set thread name visible in the kernel and its interfaces.  */
+extern int pthread_setname_np (pthread_t __target_thread, __const char *__name)
+     __THROW __nonnull ((2));
+#endif
+
+
 #ifdef __USE_UNIX98
 /* Determine level of concurrency.  */
 extern int pthread_getconcurrency (void) __THROW;
@@ -739,8 +749,8 @@
 #ifdef __USE_XOPEN2K
 /* Wait until lock becomes available, or specified time passes. */
 extern int pthread_mutex_timedlock (pthread_mutex_t *__restrict __mutex,
-                                    __const struct timespec *__restrict
-                                    __abstime) __THROW __nonnull ((1, 2));
+				    __const struct timespec *__restrict
+				    __abstime) __THROW __nonnull ((1, 2));
 #endif
 
 /* Unlock a mutex.  */
@@ -748,7 +758,6 @@
      __THROW __nonnull ((1));
 
 
-#ifdef __USE_UNIX98
 /* Get the priority ceiling of MUTEX.  */
 extern int pthread_mutex_getprioceiling (__const pthread_mutex_t *
 					 __restrict __mutex,
@@ -761,12 +770,11 @@
 					 int __prioceiling,
 					 int *__restrict __old_ceiling)
      __THROW __nonnull ((1, 3));
-#endif
 
 
 #ifdef __USE_XOPEN2K8
 /* Declare the state protected by MUTEX as consistent.  */
-extern int pthread_mutex_consistent_np (pthread_mutex_t *__mutex)
+extern int pthread_mutex_consistent (pthread_mutex_t *__mutex)
      __THROW __nonnull ((1));
 # ifdef __USE_GNU
 extern int pthread_mutex_consistent_np (pthread_mutex_t *__mutex)
@@ -797,7 +805,7 @@
 					 int __pshared)
      __THROW __nonnull ((1));
 
-#ifdef __USE_UNIX98
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
 /* Return in *KIND the mutex kind attribute in *ATTR.  */
 extern int pthread_mutexattr_gettype (__const pthread_mutexattr_t *__restrict
 				      __attr, int *__restrict __kind)
@@ -808,6 +816,7 @@
    PTHREAD_MUTEX_DEFAULT).  */
 extern int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind)
      __THROW __nonnull ((1));
+#endif
 
 /* Return in *PROTOCOL the mutex protocol attribute in *ATTR.  */
 extern int pthread_mutexattr_getprotocol (__const pthread_mutexattr_t *
@@ -831,7 +840,6 @@
 extern int pthread_mutexattr_setprioceiling (pthread_mutexattr_t *__attr,
 					     int __prioceiling)
      __THROW __nonnull ((1));
-#endif
 
 #ifdef __USE_XOPEN2K
 /* Get the robustness flag of the mutex attribute ATTR.  */
@@ -990,13 +998,13 @@
 
 /* Get the process-shared flag of the condition variable attribute ATTR.  */
 extern int pthread_condattr_getpshared (__const pthread_condattr_t *
-                                        __restrict __attr,
-                                        int *__restrict __pshared)
+					__restrict __attr,
+					int *__restrict __pshared)
      __THROW __nonnull ((1, 2));
 
 /* Set the process-shared flag of the condition variable attribute ATTR.  */
 extern int pthread_condattr_setpshared (pthread_condattr_t *__attr,
-                                        int __pshared) __THROW __nonnull ((1));
+					int __pshared) __THROW __nonnull ((1));
 
 #ifdef __USE_XOPEN2K
 /* Get the clock selected for the conditon variable attribute ATTR.  */
@@ -1071,7 +1079,7 @@
 
 /* Set the process-shared flag of the barrier attribute ATTR.  */
 extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr,
-                                           int __pshared)
+					   int __pshared)
      __THROW __nonnull ((1));
 #endif
 
@@ -1136,11 +1144,11 @@
 
 #endif	/* pthread.h */
 
-#ifndef _PTHREAD_H_HPPA_ 
+#ifndef _PTHREAD_H_HPPA_
 #define _PTHREAD_H_HPPA_ 1
 
 /* The pthread_cond_t initializer is compatible only with NPTL. We do not
-   want to be forwards compatible, we eventually want to drop the code 
+   want to be forwards compatible, we eventually want to drop the code
    that has to clear the old LT initializer.  */
 #undef PTHREAD_COND_INITIALIZER
 #define PTHREAD_COND_INITIALIZER { { 0, 0, 0, (void *) 0, 0, 0, 0, 0, 0 } }
@@ -1173,6 +1181,5 @@
   { { { 0, 0, 0, 0 }, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,\
       0, 0, 0 } }
 #endif  /* Unix98 or XOpen2K */
- 
-#endif
-
+
+#endif