git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/branches/OSELAS.Toolchain-mkl@6242 f8d472c7-5700-0410-ac5a-87979cec3adf

10 files changed, 427 insertions, 26 deletions

diff --git a/patches/glibc-ports-2.5/generic/arm-memcpy.patch b/patches/glibc-ports-2.5/generic/arm-memcpy.patch
index b7d52b0..fc1b53f 100644
--- a/patches/glibc-ports-2.5/generic/arm-memcpy.patch
+++ b/patches/glibc-ports-2.5/generic/arm-memcpy.patch
@@ -13,9 +13,15 @@ written by Nicolas Pitre.
 	* sysdeps/arm/memcpy.S: New file.
 	* sysdeps/arm/memmove.S: Likewise.
 
-diff -rupN ports.orig/sysdeps/arm/memcpy.S ports/sysdeps/arm/memcpy.S
---- ports.orig/sysdeps/arm/memcpy.S	1970-01-01 00:00:00.000000000 +0000
-+++ ports/sysdeps/arm/memcpy.S	2006-10-19 01:50:45.000000000 +0000
+---
+ sysdeps/arm/memcpy.S  |  227 +++++++++++++++++++++++++++++++++++++++++++++++
+ sysdeps/arm/memmove.S |  237 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 464 insertions(+)
+
+Index: glibc-ports-2.5/sysdeps/arm/memcpy.S
+===================================================================
+--- /dev/null
++++ glibc-ports-2.5/sysdeps/arm/memcpy.S
 @@ -0,0 +1,227 @@
 +/* Copyright (C) 2006 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -244,9 +250,10 @@ diff -rupN ports.orig/sysdeps/arm/memcpy.S ports/sysdeps/arm/memcpy.S
 +
 +END(memcpy)
 +libc_hidden_builtin_def (memcpy)
-diff -rupN ports.orig/sysdeps/arm/memmove.S ports/sysdeps/arm/memmove.S
---- ports.orig/sysdeps/arm/memmove.S	1970-01-01 00:00:00.000000000 +0000
-+++ ports/sysdeps/arm/memmove.S	2006-10-19 01:50:45.000000000 +0000
+Index: glibc-ports-2.5/sysdeps/arm/memmove.S
+===================================================================
+--- /dev/null
++++ glibc-ports-2.5/sysdeps/arm/memmove.S
 @@ -0,0 +1,237 @@
 +/* Copyright (C) 2006 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -485,8 +492,3 @@ diff -rupN ports.orig/sysdeps/arm/memmove.S ports/sysdeps/arm/memmove.S
 +
 +END(memmove)
 +libc_hidden_builtin_def (memmove)
-
--- 
-Joseph S. Myers
-joseph_at_codesourcery_dot_com
-
diff --git a/patches/glibc-ports-2.5/generic/avoid_using_asm_procinfo.diff b/patches/glibc-ports-2.5/generic/avoid_using_asm_procinfo.diff
index 53a6d1b..cd62398 100644
--- a/patches/glibc-ports-2.5/generic/avoid_using_asm_procinfo.diff
+++ b/patches/glibc-ports-2.5/generic/avoid_using_asm_procinfo.diff
@@ -91,6 +91,22 @@ with the exported headers.
 	* sysdeps/arm/eabi/ftestexcept.c: Likewise.
 	* sysdeps/arm/eabi/setfpucw.c: Likewise.
 
+---
+ sysdeps/arm/eabi/fclrexcpt.c    |    4 ++--
+ sysdeps/arm/eabi/fedisblxcpt.c  |    4 ++--
+ sysdeps/arm/eabi/feenablxcpt.c  |    4 ++--
+ sysdeps/arm/eabi/fegetenv.c     |    4 ++--
+ sysdeps/arm/eabi/fegetexcept.c  |    4 ++--
+ sysdeps/arm/eabi/fegetround.c   |    4 ++--
+ sysdeps/arm/eabi/feholdexcpt.c  |    4 ++--
+ sysdeps/arm/eabi/fesetenv.c     |    4 ++--
+ sysdeps/arm/eabi/fesetround.c   |    4 ++--
+ sysdeps/arm/eabi/fraiseexcpt.c  |    4 ++--
+ sysdeps/arm/eabi/fsetexcptflg.c |    4 ++--
+ sysdeps/arm/eabi/ftestexcept.c  |    4 ++--
+ sysdeps/arm/eabi/setfpucw.c     |    4 ++--
+ 13 files changed, 26 insertions(+), 26 deletions(-)
+
 Index: glibc-ports-2.5/sysdeps/arm/eabi/fclrexcpt.c
 ===================================================================
 --- glibc-ports-2.5.orig/sysdeps/arm/eabi/fclrexcpt.c
diff --git a/patches/glibc-ports-2.5/generic/gentoo/6225_all_arm-glibc-2.5-fix-network-assert.patch b/patches/glibc-ports-2.5/generic/gentoo/6225_all_arm-glibc-2.5-fix-network-assert.patch
new file mode 100644
index 0000000..426ffd1
--- /dev/null
+++ b/patches/glibc-ports-2.5/generic/gentoo/6225_all_arm-glibc-2.5-fix-network-assert.patch
@@ -0,0 +1,322 @@
+http://bugs.gentoo.org/153450
+http://sourceware.org/ml/libc-ports/2006-10/msg00069.html
+
+Date: Tue, 31 Oct 2006 12:37:08 -0500
+From: Daniel Jacobowitz <drow@false.org>
+To: Mike Frysinger <vapier@gentoo.org>
+Cc: libc-ports@sourceware.org, Philip Balister <philip.balister@gmail.com>
+Subject: Re: Problem with glibc-2.5 on ARM
+
+On Sun, Oct 29, 2006 at 07:54:25PM -0500, Mike Frysinger wrote:
+> On Tuesday 24 October 2006 15:58, Daniel Jacobowitz wrote:
+> > ARM is going to need a slightly different version of that file, I
+> > guess.
+> 
+> would declaring req with attribute packed not help ?
+> -mike
+
+Nope.  "struct rtgenmsg" would still have size 4.
+
+Philip, are you still at all interested in this for the old ABI?
+I don't have time to test this patch right now, but I think it
+will work.
+
+-- 
+Daniel Jacobowitz
+CodeSourcery
+
+2006-10-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/arm/check_pf.c: New file.
+	* sysdeps/unix/sysv/linux/arm/eabi/check_pf.c: New file.
+
+---
+ sysdeps/unix/sysv/linux/arm/check_pf.c      |  274 ++++++++++++++++++++++++++++
+ sysdeps/unix/sysv/linux/arm/eabi/check_pf.c |    1 
+ 2 files changed, 275 insertions(+)
+
+Index: glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/check_pf.c
+===================================================================
+--- /dev/null
++++ glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/check_pf.c
+@@ -0,0 +1,274 @@
++/* Determine protocol families for which interfaces exist.  ARM Linux version.
++   Copyright (C) 2003, 2006 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.  */
++
++#include <assert.h>
++#include <errno.h>
++#include <ifaddrs.h>
++#include <netdb.h>
++#include <stddef.h>
++#include <string.h>
++#include <time.h>
++#include <unistd.h>
++#include <sys/socket.h>
++
++#include <asm/types.h>
++#include <linux/netlink.h>
++#include <linux/rtnetlink.h>
++
++#include <not-cancel.h>
++#include <kernel-features.h>
++
++
++#ifndef IFA_F_TEMPORARY
++# define IFA_F_TEMPORARY IFA_F_SECONDARY
++#endif
++#ifndef IFA_F_HOMEADDRESS
++# define IFA_F_HOMEADDRESS 0
++#endif
++
++
++static int
++make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
++	      struct in6addrinfo **in6ai, size_t *in6ailen)
++{
++  struct req
++  {
++    struct nlmsghdr nlh;
++    struct rtgenmsg g;
++  } req;
++  struct sockaddr_nl nladdr;
++
++  /* struct rtgenmsg consists of a single byte but the ARM ABI rounds
++     it up to a word.  Clear the padding explicitly here.  */
++  assert (sizeof (req.g) == 4);
++  memset (&req.g, '\0', sizeof (req.g));
++
++  req.nlh.nlmsg_len = sizeof (req);
++  req.nlh.nlmsg_type = RTM_GETADDR;
++  req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
++  req.nlh.nlmsg_pid = 0;
++  req.nlh.nlmsg_seq = time (NULL);
++  req.g.rtgen_family = AF_UNSPEC;
++
++  memset (&nladdr, '\0', sizeof (nladdr));
++  nladdr.nl_family = AF_NETLINK;
++
++  if (TEMP_FAILURE_RETRY (__sendto (fd, (void *) &req, sizeof (req), 0,
++				    (struct sockaddr *) &nladdr,
++				    sizeof (nladdr))) < 0)
++    return -1;
++
++  *seen_ipv4 = false;
++  *seen_ipv6 = false;
++
++  bool done = false;
++  char buf[4096];
++  struct iovec iov = { buf, sizeof (buf) };
++  struct in6ailist
++  {
++    struct in6addrinfo info;
++    struct in6ailist *next;
++  } *in6ailist = NULL;
++  size_t in6ailistlen = 0;
++
++  do
++    {
++      struct msghdr msg =
++	{
++	  (void *) &nladdr, sizeof (nladdr),
++	  &iov, 1,
++	  NULL, 0,
++	  0
++	};
++
++      ssize_t read_len = TEMP_FAILURE_RETRY (__recvmsg (fd, &msg, 0));
++      if (read_len < 0)
++	return -1;
++
++      if (msg.msg_flags & MSG_TRUNC)
++	return -1;
++
++      struct nlmsghdr *nlmh;
++      for (nlmh = (struct nlmsghdr *) buf;
++	   NLMSG_OK (nlmh, (size_t) read_len);
++	   nlmh = (struct nlmsghdr *) NLMSG_NEXT (nlmh, read_len))
++	{
++	  if (nladdr.nl_pid != 0 || (pid_t) nlmh->nlmsg_pid != pid
++	      || nlmh->nlmsg_seq != req.nlh.nlmsg_seq)
++	    continue;
++
++	  if (nlmh->nlmsg_type == RTM_NEWADDR)
++	    {
++	      struct ifaddrmsg *ifam = (struct ifaddrmsg *) NLMSG_DATA (nlmh);
++
++	      switch (ifam->ifa_family)
++		{
++		case AF_INET:
++		  *seen_ipv4 = true;
++		  break;
++		case AF_INET6:
++		  *seen_ipv6 = true;
++
++		  if (ifam->ifa_flags & (IFA_F_DEPRECATED
++					 | IFA_F_TEMPORARY
++					 | IFA_F_HOMEADDRESS))
++		    {
++		      struct rtattr *rta = IFA_RTA (ifam);
++		      size_t len = (nlmh->nlmsg_len
++				    - NLMSG_LENGTH (sizeof (*ifam)));
++		      void *local = NULL;
++		      void *address = NULL;
++		      while (RTA_OK (rta, len))
++			{
++			  switch (rta->rta_type)
++			    {
++			    case IFA_LOCAL:
++			      local = RTA_DATA (rta);
++			      break;
++
++			    case IFA_ADDRESS:
++			      address = RTA_DATA (rta);
++			      break;
++			    }
++
++			  rta = RTA_NEXT (rta, len);
++			}
++
++		      struct in6ailist *newp = alloca (sizeof (*newp));
++		      newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
++					   ? in6ai_deprecated : 0)
++					  | ((ifam->ifa_flags
++					      & IFA_F_TEMPORARY)
++					     ? in6ai_temporary : 0)
++					  | ((ifam->ifa_flags
++					      & IFA_F_HOMEADDRESS)
++					     ? in6ai_homeaddress : 0));
++		      memcpy (newp->info.addr, address ?: local,
++			      sizeof (newp->info.addr));
++		      newp->next = in6ailist;
++		      in6ailist = newp;
++		      ++in6ailistlen;
++		    }
++		  break;
++		default:
++		  /* Ignore.  */
++		  break;
++		}
++	    }
++	  else if (nlmh->nlmsg_type == NLMSG_DONE)
++	    /* We found the end, leave the loop.  */
++	    done = true;
++	}
++    }
++  while (! done);
++
++  close_not_cancel_no_status (fd);
++
++  if (in6ailist != NULL)
++    {
++      *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
++      if (*in6ai == NULL)
++	return -1;
++
++      *in6ailen = in6ailistlen;
++
++      do
++	{
++	  (*in6ai)[--in6ailistlen] = in6ailist->info;
++	  in6ailist = in6ailist->next;
++	}
++      while (in6ailist != NULL);
++    }
++
++  return 0;
++}
++
++
++/* We don't know if we have NETLINK support compiled in in our
++   Kernel.  */
++#if __ASSUME_NETLINK_SUPPORT == 0
++/* Define in ifaddrs.h.  */
++extern int __no_netlink_support attribute_hidden;
++#else
++# define __no_netlink_support 0
++#endif
++
++
++void
++attribute_hidden
++__check_pf (bool *seen_ipv4, bool *seen_ipv6,
++	    struct in6addrinfo **in6ai, size_t *in6ailen)
++{
++  *in6ai = NULL;
++  *in6ailen = 0;
++
++  if (! __no_netlink_support)
++    {
++      int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
++
++      struct sockaddr_nl nladdr;
++      memset (&nladdr, '\0', sizeof (nladdr));
++      nladdr.nl_family = AF_NETLINK;
++
++      socklen_t addr_len = sizeof (nladdr);
++
++      if (fd >= 0
++	  && __bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
++	  && __getsockname (fd, (struct sockaddr *) &nladdr, &addr_len) == 0
++	  && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6,
++			   in6ai, in6ailen) == 0)
++	/* It worked.  */
++	return;
++
++      if (fd >= 0)
++	__close (fd);
++
++#if __ASSUME_NETLINK_SUPPORT == 0
++      /* Remember that there is no netlink support.  */
++      __no_netlink_support = 1;
++#else
++      /* We cannot determine what interfaces are available.  Be
++	 pessimistic.  */
++      *seen_ipv4 = true;
++      *seen_ipv6 = true;
++#endif
++    }
++
++#if __ASSUME_NETLINK_SUPPORT == 0
++  /* No netlink.  Get the interface list via getifaddrs.  */
++  struct ifaddrs *ifa = NULL;
++  if (getifaddrs (&ifa) != 0)
++    {
++      /* We cannot determine what interfaces are available.  Be
++	 pessimistic.  */
++      *seen_ipv4 = true;
++      *seen_ipv6 = true;
++      return;
++    }
++
++  struct ifaddrs *runp;
++  for (runp = ifa; runp != NULL; runp = runp->ifa_next)
++    if (runp->ifa_addr->sa_family == PF_INET)
++      *seen_ipv4 = true;
++    else if (runp->ifa_addr->sa_family == PF_INET6)
++      *seen_ipv6 = true;
++
++  (void) freeifaddrs (ifa);
++#endif
++}
+Index: glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/eabi/check_pf.c
+===================================================================
+--- /dev/null
++++ glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/eabi/check_pf.c
+@@ -0,0 +1 @@
++#include <sysdeps/unix/sysv/linux/check_pf.c>
diff --git a/patches/glibc-ports-2.5/generic/gentoo/6230_all_arm-glibc-2.5-no-page-header.patch b/patches/glibc-ports-2.5/generic/gentoo/6230_all_arm-glibc-2.5-no-page-header.patch
new file mode 100644
index 0000000..ddb162f
--- /dev/null
+++ b/patches/glibc-ports-2.5/generic/gentoo/6230_all_arm-glibc-2.5-no-page-header.patch
@@ -0,0 +1,20 @@
+2007-03-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* sysdeps/unix/sysv/linux/arm/ioperm.c: Don't include asm/page.h.
+
+---
+ sysdeps/unix/sysv/linux/arm/ioperm.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+Index: glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/ioperm.c
+===================================================================
+--- glibc-ports-2.5.orig/sysdeps/unix/sysv/linux/arm/ioperm.c
++++ glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/ioperm.c
+@@ -45,7 +45,6 @@
+ #include <sys/mman.h>
+ 
+ #include <linux/version.h>
+-#include <asm/page.h>
+ #include <sys/sysctl.h>
+ 
+ #define PATH_ARM_SYSTYPE	"/etc/arm_systype"
diff --git a/patches/glibc-ports-2.5/generic/glibc-2.5_ports_sysdeps_arm_mp_clz_tab.c b/patches/glibc-ports-2.5/generic/glibc-2.5_ports_sysdeps_arm_mp_clz_tab.c
new file mode 100644
index 0000000..b84cd59
--- /dev/null
+++ b/patches/glibc-ports-2.5/generic/glibc-2.5_ports_sysdeps_arm_mp_clz_tab.c
@@ -0,0 +1,33 @@
+---
+ ports/sysdeps/arm/mp_clz_tab.c |   24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+Index: glibc-ports-2.5/ports/sysdeps/arm/mp_clz_tab.c
+===================================================================
+--- /dev/null
++++ glibc-ports-2.5/ports/sysdeps/arm/mp_clz_tab.c
+@@ -0,0 +1,24 @@
++/* __clz_tab -- support for longlong.h
++   Copyright (C) 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.  */
++
++#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__)
++/* Nothing required.  */
++#else
++#include <stdlib/mp_clz_tab.c>
++#endif
diff --git a/patches/glibc-ports-2.5/generic/series b/patches/glibc-ports-2.5/generic/series
index 3c32a46..7b04911 100644
--- a/patches/glibc-ports-2.5/generic/series
+++ b/patches/glibc-ports-2.5/generic/series
@@ -2,6 +2,10 @@ sysdeps_mips_mips32_Makefile-bootstrap.diff
 avoid_using_asm_procinfo.diff
 arm-memcpy.patch
 
-sysdeps_unix_sysv_linux_arm_kernel-features_h-remove-i386-fix.diff -p0
-sysdeps_unix_sysv_linux_arm-and-mips_bits_fcntl_h-splice-update.diff -p0
-sysdeps_unix_sysv_linux_arm_eabi_nptl_sysdep-cancel_h-unwind-fix.diff -p0
+glibc-2.5_ports_sysdeps_arm_mp_clz_tab.c
+sysdeps_unix_sysv_linux_arm_kernel-features_h-remove-i386-fix.diff
+sysdeps_unix_sysv_linux_arm-and-mips_bits_fcntl_h-splice-update.diff
+sysdeps_unix_sysv_linux_arm_eabi_nptl_sysdep-cancel_h-unwind-fix.diff
+
+gentoo/6230_all_arm-glibc-2.5-no-page-header.patch
+gentoo/6225_all_arm-glibc-2.5-fix-network-assert.patch
diff --git a/patches/glibc-ports-2.5/generic/sysdeps_mips_mips32_Makefile-bootstrap.diff b/patches/glibc-ports-2.5/generic/sysdeps_mips_mips32_Makefile-bootstrap.diff
index d431db4..bb3126a 100644
--- a/patches/glibc-ports-2.5/generic/sysdeps_mips_mips32_Makefile-bootstrap.diff
+++ b/patches/glibc-ports-2.5/generic/sysdeps_mips_mips32_Makefile-bootstrap.diff
@@ -22,6 +22,10 @@ mailing list. Here is the link off of my FTP site:
 
 [Note: BOOTSTRAP_GCC is set by crosstool.sh when invoking make install-headers]
 
+---
+ sysdeps/mips/mips32/Makefile |    4 ++++
+ 1 file changed, 4 insertions(+)
+
 Index: glibc-ports-2.5/sysdeps/mips/mips32/Makefile
 ===================================================================
 --- glibc-ports-2.5.orig/sysdeps/mips/mips32/Makefile
diff --git a/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm-and-mips_bits_fcntl_h-splice-update.diff b/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm-and-mips_bits_fcntl_h-splice-update.diff
index caa8ee1..ca5d529 100644
--- a/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm-and-mips_bits_fcntl_h-splice-update.diff
+++ b/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm-and-mips_bits_fcntl_h-splice-update.diff
@@ -44,10 +44,10 @@ added (am33, cris, m68k).
  sysdeps/unix/sysv/linux/mips/bits/fcntl.h |    3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
-Index: sysdeps/unix/sysv/linux/arm/bits/fcntl.h
+Index: glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
 ===================================================================
---- sysdeps/unix/sysv/linux/arm/bits/fcntl.h.orig
-+++ sysdeps/unix/sysv/linux/arm/bits/fcntl.h
+--- glibc-ports-2.5.orig/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
++++ glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/bits/fcntl.h
 @@ -223,7 +223,8 @@ extern int vmsplice (int __fdout, const 
  		     unsigned int __flags);
  
@@ -58,10 +58,10 @@ Index: sysdeps/unix/sysv/linux/arm/bits/fcntl.h
      __THROW;
  
  /* In-kernel implementation of tee for pipe buffers.  */
-Index: sysdeps/unix/sysv/linux/mips/bits/fcntl.h
+Index: glibc-ports-2.5/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
 ===================================================================
---- sysdeps/unix/sysv/linux/mips/bits/fcntl.h.orig
-+++ sysdeps/unix/sysv/linux/mips/bits/fcntl.h
+--- glibc-ports-2.5.orig/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
++++ glibc-ports-2.5/sysdeps/unix/sysv/linux/mips/bits/fcntl.h
 @@ -237,7 +237,8 @@ extern int vmsplice (int __fdout, const 
  		     unsigned int __flags);
  
diff --git a/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm_eabi_nptl_sysdep-cancel_h-unwind-fix.diff b/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm_eabi_nptl_sysdep-cancel_h-unwind-fix.diff
index 46d480e..f861701 100644
--- a/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm_eabi_nptl_sysdep-cancel_h-unwind-fix.diff
+++ b/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm_eabi_nptl_sysdep-cancel_h-unwind-fix.diff
@@ -38,10 +38,10 @@ and sendto.  This patch fixes those test failures.
  sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
+Index: glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
 ===================================================================
---- sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h.orig
-+++ sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
+--- glibc-ports-2.5.orig/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
++++ glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
 @@ -94,7 +94,7 @@
  # define UNDOCARGS_5	ldmfd sp!, {r0, r1, r2, r3}; .fnend; .fnstart; .save {r4}; .save {r7, lr}; .pad #4
  # define RESTORE_LR_5	ldmfd sp!, {r4, r7, lr}
diff --git a/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm_kernel-features_h-remove-i386-fix.diff b/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm_kernel-features_h-remove-i386-fix.diff
index 151f94f..83c57fa 100644
--- a/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm_kernel-features_h-remove-i386-fix.diff
+++ b/patches/glibc-ports-2.5/generic/sysdeps_unix_sysv_linux_arm_kernel-features_h-remove-i386-fix.diff
@@ -39,10 +39,10 @@ seems there was a mistake in copying into the ARM file.)
  sysdeps/unix/sysv/linux/arm/kernel-features.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: sysdeps/unix/sysv/linux/arm/kernel-features.h
+Index: glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/kernel-features.h
 ===================================================================
---- sysdeps/unix/sysv/linux/arm/kernel-features.h.orig
-+++ sysdeps/unix/sysv/linux/arm/kernel-features.h
+--- glibc-ports-2.5.orig/sysdeps/unix/sysv/linux/arm/kernel-features.h
++++ glibc-ports-2.5/sysdeps/unix/sysv/linux/arm/kernel-features.h
 @@ -42,7 +42,7 @@
  #endif