[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r6022 - in /branches/eglibc-2_8/ports: ./ sysdeps/unix/sysv/linux/arm/ sysdeps/unix/sysv/linux/arm/bits/ sysdeps/unix/sysv/l...
- To: commits@xxxxxxxxxx
- Subject: [commits] r6022 - in /branches/eglibc-2_8/ports: ./ sysdeps/unix/sysv/linux/arm/ sysdeps/unix/sysv/linux/arm/bits/ sysdeps/unix/sysv/l...
- From: joseph@xxxxxxxxxx
- Date: Mon, 21 Apr 2008 19:38:07 -0000
Author: joseph
Date: Mon Apr 21 12:38:07 2008
New Revision: 6022
Log:
Merge changes between r5990 and r6018 from /fsf/glibc-2_8-branch.
Added:
branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
- copied unchanged from r6018, fsf/glibc-2_8-branch/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
Removed:
branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/mips/xmknod.c
Modified:
branches/eglibc-2_8/ports/ChangeLog.arm
branches/eglibc-2_8/ports/ChangeLog.hppa
branches/eglibc-2_8/ports/ChangeLog.mips
branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/check_pf.c
branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/ioperm.c
branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
Modified: branches/eglibc-2_8/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_8/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_8/ports/ChangeLog.arm Mon Apr 21 12:38:07 2008
@@ -1,3 +1,21 @@
+2008-04-21 Daniel Jacobowitz <dan@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/check_pf.c: Update from generic
+ version.
+
+2008-04-21 Khem Raj <kraj@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/ioperm.c: Don't include asm/page.h.
+
+2008-04-21 Mike Frysinger <vapier@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h (DOCARGS_6,
+ UNDOCARGS_6): Define.
+
+2008-04-21 Khem Raj <kraj@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/bits/shm.h: New file.
+
2008-04-11 Paul Brook <paul@xxxxxxxxxxxxxxxx>
Sandra Loosemore <sandra@xxxxxxxxxxxxxxxx>
Modified: branches/eglibc-2_8/ports/ChangeLog.hppa
==============================================================================
--- branches/eglibc-2_8/ports/ChangeLog.hppa (original)
+++ branches/eglibc-2_8/ports/ChangeLog.hppa Mon Apr 21 12:38:07 2008
@@ -1,3 +1,8 @@
+2008-04-21 Daniel Jacobowitz <dan@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/hppa/bits/shm.h: Fix comment describing
+ shmid_ds.
+
2008-04-04 Carlos O'Donell <carlos@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/hppa/bits/atomic.h: Remove
Modified: branches/eglibc-2_8/ports/ChangeLog.mips
==============================================================================
--- branches/eglibc-2_8/ports/ChangeLog.mips (original)
+++ branches/eglibc-2_8/ports/ChangeLog.mips Mon Apr 21 12:38:07 2008
@@ -1,3 +1,12 @@
+2008-04-21 Daniel Jacobowitz <dan@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mips/bits/shm.h: Fix comment describing
+ shmid_ds.
+
+2008-04-21 Khem Raj <kraj@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mips/xmknod.c: Delete file.
+
2008-04-02 Aurelien Jarno <aurelien@xxxxxxxxxxx>
* sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list: Add
Modified: branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/check_pf.c
==============================================================================
--- branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/check_pf.c (original)
+++ branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/check_pf.c Mon Apr 21 12:38:07 2008
@@ -1,5 +1,5 @@
/* Determine protocol families for which interfaces exist. Linux version.
- Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2007, 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
@@ -35,11 +35,11 @@
#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
+#ifndef IFA_F_OPTIMISTIC
+# define IFA_F_OPTIMISTIC 0
#endif
@@ -140,89 +140,67 @@
struct rtattr *rta = IFA_RTA (ifam);
size_t len = nlmh->nlmsg_len - NLMSG_LENGTH (sizeof (*ifam));
- switch (ifam->ifa_family)
+ if (ifam->ifa_family != AF_INET
+ && ifam->ifa_family != AF_INET6)
+ continue;
+
+ const void *local = NULL;
+ const void *address = NULL;
+ while (RTA_OK (rta, len))
{
- const void *local;
- const void *address;
-
- case AF_INET:
- local = NULL;
- address = NULL;
- while (RTA_OK (rta, len))
+ switch (rta->rta_type)
{
- switch (rta->rta_type)
- {
- case IFA_LOCAL:
- local = RTA_DATA (rta);
- break;
-
- case IFA_ADDRESS:
- address = RTA_DATA (rta);
- goto out_v4;
- }
-
- rta = RTA_NEXT (rta, len);
+ case IFA_LOCAL:
+ local = RTA_DATA (rta);
+ break;
+
+ case IFA_ADDRESS:
+ address = RTA_DATA (rta);
+ goto out;
}
- if (local != NULL)
+ rta = RTA_NEXT (rta, len);
+ }
+
+ if (local != NULL)
+ {
+ address = local;
+ out:
+ if (ifam->ifa_family == AF_INET)
{
- out_v4:
- if (*(const in_addr_t *) (address ?: local)
+ if (*(const in_addr_t *) address
!= htonl (INADDR_LOOPBACK))
*seen_ipv4 = true;
}
- break;
-
- case AF_INET6:
- local = NULL;
- address = NULL;
- while (RTA_OK (rta, len))
+ else
{
- switch (rta->rta_type)
- {
- case IFA_LOCAL:
- local = RTA_DATA (rta);
- break;
-
- case IFA_ADDRESS:
- address = RTA_DATA (rta);
- goto out_v6;
- }
-
- rta = RTA_NEXT (rta, len);
- }
-
- if (local != NULL)
- {
- out_v6:
- if (!IN6_IS_ADDR_LOOPBACK (address ?: local))
+ if (!IN6_IS_ADDR_LOOPBACK (address))
*seen_ipv6 = true;
}
-
- if (ifam->ifa_flags & (IFA_F_DEPRECATED
- | IFA_F_TEMPORARY
- | IFA_F_HOMEADDRESS))
- {
- 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;
}
+
+ struct in6ailist *newp = alloca (sizeof (*newp));
+ newp->info.flags = (((ifam->ifa_flags
+ & (IFA_F_DEPRECATED
+ | IFA_F_OPTIMISTIC))
+ ? in6ai_deprecated : 0)
+ | ((ifam->ifa_flags
+ & IFA_F_HOMEADDRESS)
+ ? in6ai_homeaddress : 0));
+ newp->info.prefixlen = ifam->ifa_prefixlen;
+ newp->info.index = ifam->ifa_index;
+ if (ifam->ifa_family == AF_INET)
+ {
+ newp->info.addr[0] = 0;
+ newp->info.addr[1] = 0;
+ newp->info.addr[2] = htonl (0xffff);
+ newp->info.addr[3] = *(const in_addr_t *) address;
+ }
+ else
+ memcpy (newp->info.addr, address, sizeof (newp->info.addr));
+ newp->next = in6ailist;
+ in6ailist = newp;
+ ++in6ailistlen;
}
else if (nlmh->nlmsg_type == NLMSG_DONE)
/* We found the end, leave the loop. */
Modified: branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/ioperm.c
==============================================================================
--- branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/ioperm.c (original)
+++ branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/ioperm.c Mon Apr 21 12:38:07 2008
@@ -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"
Modified: branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
==============================================================================
--- branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h (original)
+++ branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h Mon Apr 21 12:38:07 2008
@@ -73,6 +73,9 @@
# define DOCARGS_5 DOCARGS_4
# define UNDOCARGS_5 UNDOCARGS_4
+# define DOCARGS_6 DOCARGS_5
+# define UNDOCARGS_6 UNDOCARGS_5
+
# ifdef IS_IN_libpthread
# define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
# define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)
Modified: branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
==============================================================================
--- branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h (original)
+++ branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h Mon Apr 21 12:38:07 2008
@@ -42,7 +42,7 @@
/* Type to count number of attaches. */
typedef unsigned long int shmatt_t;
-/* Data structure describing a set of semaphores. */
+/* Data structure describing a shared memory segment. */
struct shmid_ds
{
struct ipc_perm shm_perm; /* operation permission struct */
Modified: branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
==============================================================================
--- branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h (original)
+++ branches/eglibc-2_8/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h Mon Apr 21 12:38:07 2008
@@ -42,7 +42,7 @@
/* Type to count number of attaches. */
typedef unsigned long int shmatt_t;
-/* Data structure describing a set of semaphores. */
+/* Data structure describing a shared memory segment. */
struct shmid_ds
{
struct ipc_perm shm_perm; /* operation permission struct */