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

r5751 - in glibc-package/branches/eglibc-2.18/debian: . patches/kfreebsd



Author: ps-guest
Date: 2013-11-07 12:13:47 +0000 (Thu, 07 Nov 2013)
New Revision: 5751

Modified:
   glibc-package/branches/eglibc-2.18/debian/changelog
   glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-fbtl.diff
   glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd bits - update to revision 5128 (from glibc-bsd).



Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog	2013-11-07 08:27:06 UTC (rev 5750)
+++ glibc-package/branches/eglibc-2.18/debian/changelog	2013-11-07 12:13:47 UTC (rev 5751)
@@ -62,7 +62,7 @@
     expected-results-i686-gnu-xen: Update testsuite result.
 
   [ Petr Salinger ]
-  * kfreebsd/local-sysdeps.diff: update to revision 5050 (from glibc-bsd).
+  * kfreebsd/local-sysdeps.diff: update to revision 5128 (from glibc-bsd).
   * kfreebsd/local-fbtl.diff: likewise
   * update symbols file for kfreebsd
   * update testsuite-checking/expected-results-*-kfreebsd-gnu-*

Modified: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-fbtl.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-fbtl.diff	2013-11-07 08:27:06 UTC (rev 5750)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-fbtl.diff	2013-11-07 12:13:47 UTC (rev 5751)
@@ -17894,7 +17894,7 @@
 +#define lll_mutex_unlock(futex) __generic_mutex_unlock (&(futex))
 --- /dev/null
 +++ b/fbtl/nptl-init.c
-@@ -0,0 +1,489 @@
+@@ -0,0 +1,493 @@
 +/* Copyright (C) 2002-2013 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -18326,6 +18326,10 @@
 +    /* The system limit is unusably small.
 +       Use the minimal size acceptable.  */
 +    limit.rlim_cur = PTHREAD_STACK_MIN;
++  else if (limit.rlim_cur > (4 * ARCH_STACK_DEFAULT_SIZE))
++    /* The system limit is unusably high.
++       Use the maximal size acceptable.  */
++    limit.rlim_cur = (4 * ARCH_STACK_DEFAULT_SIZE);
 +
 +  /* Make sure it meets the minimum size that allocate_stack
 +     (allocatestack.c) will demand, which depends on the page size.  */

Modified: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-sysdeps.diff	2013-11-07 08:27:06 UTC (rev 5750)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-sysdeps.diff	2013-11-07 12:13:47 UTC (rev 5751)
@@ -3394,7 +3394,7 @@
 +#endif /* ! _SIGSET_H_fns.  */
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/socket.h
-@@ -0,0 +1,415 @@
+@@ -0,0 +1,421 @@
 +/* System-specific socket constants and types.  FreeBSD version.
 +   Copyright (C) 1991-1992,1994-1999,2000-2002 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -3793,6 +3793,12 @@
 +    int l_linger;		/* Time to linger.  */
 +  };
 +
++/* Magic IPv4 addresses defined in FreeBSD version of <netinet/in.h>, but not
++   included in Glibc version of the same header. */
++#define	INADDR_ALLRPTS_GROUP	(u_int32_t)0xe0000016	/* 224.0.0.22, IGMPv3 */
++#define	INADDR_CARP_GROUP	(u_int32_t)0xe0000012	/* 224.0.0.18 */
++#define	INADDR_PFSYNC_GROUP	(u_int32_t)0xe00000f0	/* 224.0.0.240 */
++#define	INADDR_ALLMDNS_GROUP	(u_int32_t)0xe00000fb	/* 224.0.0.251 */
 +
 +#ifdef __USE_BSD
 +
@@ -21569,7 +21575,7 @@
 +#endif	/* net/ethernet.h */
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/net/if.h
-@@ -0,0 +1,458 @@
+@@ -0,0 +1,460 @@
 +/*-
 + * Copyright (c) 1982, 1986, 1989, 1993
 + *	The Regents of the University of California.  All rights reserved.
@@ -21885,6 +21891,7 @@
 +		int	ifru_media;
 +		char *	ifru_data;
 +		int	ifru_cap[2];
++		unsigned int ifru_fib;
 +	} ifr_ifru;
 +#define	ifr_addr	ifr_ifru.ifru_addr	/* address */
 +#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
@@ -21902,6 +21909,7 @@
 +#define	ifr_reqcap	ifr_ifru.ifru_cap[0]	/* requested capabilities */
 +#define	ifr_curcap	ifr_ifru.ifru_cap[1]	/* current capabilities */
 +#define	ifr_index	ifr_ifru.ifru_index	/* interface index */
++#define	ifr_fib		ifr_ifru.ifru_fib	/* interface fib */
 +};
 +
 +#define	_SIZEOF_ADDR_IFREQ(ifr) \


Reply to: