[Glibc-bsd-commits] r5867 - in trunk/kfreebsd-11/debian: . patches

stevenc-guest at alioth.debian.org stevenc-guest at alioth.debian.org
Sat Feb 6 17:00:08 UTC 2016 

Author: stevenc-guest
Date: 2016-02-06 17:00:08 +0000 (Sat, 06 Feb 2016)
New Revision: 5867

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/patches/001_misc.diff
   trunk/kfreebsd-11/debian/patches/004_xargs.diff
   trunk/kfreebsd-11/debian/patches/109_linprocfs_non_x86.diff
   trunk/kfreebsd-11/debian/patches/902_version.diff
   trunk/kfreebsd-11/debian/patches/906_grow_sysv_ipc_limits.diff
   trunk/kfreebsd-11/debian/patches/914_psm.diff
   trunk/kfreebsd-11/debian/patches/917_disable_kgssapi.diff
   trunk/kfreebsd-11/debian/patches/918_unix_socket_overflow.diff
   trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff
   trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff
   trunk/kfreebsd-11/debian/patches/923_newvers_timestamp.diff
   trunk/kfreebsd-11/debian/patches/924_module_objdir.diff
   trunk/kfreebsd-11/debian/patches/930_freebsd_cc.diff
   trunk/kfreebsd-11/debian/patches/940_ld_verbose.diff
   trunk/kfreebsd-11/debian/patches/999_config.diff
   trunk/kfreebsd-11/debian/patches/unescaped_kern_ident.diff
   trunk/kfreebsd-11/debian/patches/userland.diff
Log:
Refresh patches:
 - unescaped_kern_ident.diff
 - userland.diff
 - 001_misc.diff
 - 004_xargs.diff
 - 109_linprocfs_non_x86.diff
 - 902_version.diff
 - 906_grow_sysv_ipc_limits.diff
 - 914_psm.diff
 - 917_disable_kgssapi.diff
 - 918_unix_socket_overflow.diff
 - 920_linux_cflags.diff
 - 923_newvers_timestamp.diff
 - 924_module_objdir.diff
 - 930_freebsd_cc.diff
 - 940_ld_verbose.diff
 - 999_config.diff


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/changelog	2016-02-06 17:00:08 UTC (rev 5867)
@@ -5,6 +5,23 @@
     as it is preferred now to use the generic kernel in HVM mode.
   * Use new preferred hostname for upstream SVN with HTTPS
     (svn.freebsd.org)
+  * Refresh patches:
+    - unescaped_kern_ident.diff
+    - userland.diff
+    - 001_misc.diff
+    - 004_xargs.diff
+    - 109_linprocfs_non_x86.diff
+    - 902_version.diff
+    - 906_grow_sysv_ipc_limits.diff
+    - 914_psm.diff
+    - 917_disable_kgssapi.diff
+    - 918_unix_socket_overflow.diff
+    - 920_linux_cflags.diff
+    - 923_newvers_timestamp.diff
+    - 924_module_objdir.diff
+    - 930_freebsd_cc.diff
+    - 940_ld_verbose.diff
+    - 999_config.diff
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 06 Feb 2016 16:17:19 +0000
 

Modified: trunk/kfreebsd-11/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/001_misc.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/001_misc.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -3,7 +3,7 @@
 
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
-@@ -64,6 +64,16 @@
+@@ -67,6 +67,16 @@
  FORMAT_EXTENSIONS=	-fformat-extensions
  .endif
  
@@ -20,7 +20,7 @@
  #
  # On i386, do not align the stack to 16-byte boundaries.  Otherwise GCC 2.95
  # and above adds code to the entry and exit point of every function to align the
-@@ -84,7 +94,7 @@
+@@ -87,7 +97,7 @@
  # Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42
  #
  .if ${MACHINE_CPUARCH} == "i386"

Modified: trunk/kfreebsd-11/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/004_xargs.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/004_xargs.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -6,10 +6,10 @@
 
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -215,7 +215,7 @@
+@@ -233,7 +233,7 @@
  	grep -v '^#' < ${EXPORT_SYMS} > export_syms
  .endif
- 	awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
+ 	${AWK} -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
 -	    export_syms | xargs -J% ${OBJCOPY} % ${.TARGET}
 +	    export_syms | xargs -I% ${OBJCOPY} % ${.TARGET}
  .endif
@@ -32,17 +32,21 @@
  for H in ${src_headers}; do
 --- a/sys/conf/kern.post.mk
 +++ b/sys/conf/kern.post.mk
-@@ -200,12 +200,9 @@
- 	rm -f .newdep
- 	${MAKE} -V CFILES_NOCDDL -V SYSTEM_CFILES -V GEN_CFILES | \
- 	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
+@@ -234,8 +234,6 @@
+ # C files
+ 	${MAKE} -V CFILES_NORMAL -V SYSTEM_CFILES -V GEN_CFILES | \
+ 	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${CFLAGS}
 -	${MAKE} -V CFILES_CDDL | \
--	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${ZFS_CFLAGS} ${FBT_CFLAGS} ${DTRACE_CFLAGS}
-+	# GNU xargs behaves differently when given a single newline character.
- 	${MAKE} -V SFILES_NOCDDL | \
- 	    MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS}
+-	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_CFLAGS} \
+ 	    ${FBT_CFLAGS} ${DTRACE_CFLAGS}
+ 	${MAKE} -V CFILES_LINUXKPI | \
+ 	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp \
+@@ -246,8 +244,6 @@
+ # Assembly files
+ 	${MAKE} -V SFILES_NORMAL | \
+ 	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ASM_CFLAGS}
 -	${MAKE} -V SFILES_CDDL | \
--	    MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ZFS_ASM_CFLAGS}
- 	rm -f .depend
- 	mv .newdep .depend
- 
+-	    CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_ASM_CFLAGS}
+ 	mv ${.TARGET}.tmp ${.TARGET}
+ .else
+ 	: > ${.TARGET}

Modified: trunk/kfreebsd-11/debian/patches/109_linprocfs_non_x86.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/109_linprocfs_non_x86.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/109_linprocfs_non_x86.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -1,6 +1,6 @@
 --- a/sys/conf/options.mips
 +++ b/sys/conf/options.mips
-@@ -65,6 +65,9 @@
+@@ -66,6 +66,9 @@
  TICK_USE_YAMON_FREQ	opt_global.h
  TICK_USE_MALTA_RTC	opt_global.h
  

Modified: trunk/kfreebsd-11/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/902_version.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/902_version.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -1,6 +1,6 @@
 --- a/sys/conf/newvers.sh
 +++ b/sys/conf/newvers.sh
-@@ -216,6 +216,9 @@
+@@ -233,6 +233,9 @@
  #define VERSTR "${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}\\n    ${u}@${h}:${d}\\n"
  #define RELSTR "${RELEASE}"
  

Modified: trunk/kfreebsd-11/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/906_grow_sysv_ipc_limits.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/906_grow_sysv_ipc_limits.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -23,7 +23,7 @@
 
 --- a/sys/amd64/conf/GENERIC
 +++ b/sys/amd64/conf/GENERIC
-@@ -61,6 +61,11 @@
+@@ -62,6 +62,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores
@@ -37,7 +37,7 @@
  options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 --- a/sys/i386/conf/GENERIC
 +++ b/sys/i386/conf/GENERIC
-@@ -62,6 +62,11 @@
+@@ -63,6 +63,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores

Modified: trunk/kfreebsd-11/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/914_psm.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/914_psm.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -63,7 +63,7 @@
  	default:
  		return (ENOTTY);
  	}
-@@ -3661,9 +3641,6 @@
+@@ -3670,9 +3650,6 @@
  		wakeup(sc);
  	}
  	selwakeuppri(&sc->rsel, PZERO);

Modified: trunk/kfreebsd-11/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/917_disable_kgssapi.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/917_disable_kgssapi.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -1,6 +1,6 @@
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -182,8 +182,6 @@
+@@ -187,8 +187,6 @@
  	jme \
  	joy \
  	kbdmux \

Modified: trunk/kfreebsd-11/debian/patches/918_unix_socket_overflow.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/918_unix_socket_overflow.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/918_unix_socket_overflow.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -8,7 +8,7 @@
 
 --- a/sys/kern/uipc_usrreq.c
 +++ b/sys/kern/uipc_usrreq.c
-@@ -474,7 +474,12 @@
+@@ -475,7 +475,12 @@
  	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
  
  	if (soun->sun_len > sizeof(struct sockaddr_un))
@@ -21,7 +21,7 @@
  	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
  	if (namelen <= 0)
  		return (EINVAL);
-@@ -1319,7 +1324,12 @@
+@@ -1322,7 +1327,12 @@
  	KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
  
  	if (nam->sa_len > sizeof(struct sockaddr_un))

Modified: trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -16,7 +16,7 @@
  
 --- a/sys/conf/kmod.mk
 +++ b/sys/conf/kmod.mk
-@@ -89,6 +89,8 @@
+@@ -93,6 +93,8 @@
  CFLAGS+=	-D_KERNEL
  CFLAGS+=	-DKLD_MODULE
  

Modified: trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/921_signal_watchdog.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -37,7 +37,7 @@
  };
 --- a/sys/kern/kern_prot.c
 +++ b/sys/kern/kern_prot.c
-@@ -1560,8 +1560,8 @@
+@@ -1559,8 +1559,8 @@
  	 * pretty safe to do since the only way to create two processes
  	 * with the same p_leader is via rfork(2).
  	 */

Modified: trunk/kfreebsd-11/debian/patches/923_newvers_timestamp.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/923_newvers_timestamp.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/923_newvers_timestamp.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -9,7 +9,7 @@
 
 --- a/sys/conf/newvers.sh
 +++ b/sys/conf/newvers.sh
-@@ -95,6 +95,12 @@
+@@ -112,6 +112,12 @@
  i=`${MAKE:-make} -V KERN_IDENT`
  compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep -w 'version')
  

Modified: trunk/kfreebsd-11/debian/patches/924_module_objdir.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/924_module_objdir.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/924_module_objdir.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -1,6 +1,6 @@
 --- a/sys/conf/kern.pre.mk
 +++ b/sys/conf/kern.pre.mk
-@@ -203,7 +203,7 @@
+@@ -215,7 +215,7 @@
  # MKMODULESENV is set here so that port makefiles can augment
  # them.
  

Modified: trunk/kfreebsd-11/debian/patches/930_freebsd_cc.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/930_freebsd_cc.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/930_freebsd_cc.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -7,7 +7,7 @@
 
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
-@@ -64,7 +64,7 @@
+@@ -67,7 +67,7 @@
  FORMAT_EXTENSIONS=	-fformat-extensions
  .endif
  

Modified: trunk/kfreebsd-11/debian/patches/940_ld_verbose.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/940_ld_verbose.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/940_ld_verbose.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -2,10 +2,10 @@
 
 --- a/sys/conf/kern.pre.mk
 +++ b/sys/conf/kern.pre.mk
-@@ -193,10 +193,10 @@
- SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
- SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
- SYSTEM_OBJS+= hack.So
+@@ -200,10 +200,10 @@
+ .if ${MFS_IMAGE:Uno} != "no"
+ SYSTEM_OBJS+= embedfs_${MFS_IMAGE:T:R}.o
+ .endif
 -SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} ${_LDFLAGS} --no-warn-mismatch \
 +SYSTEM_LD= ${LD} -Bdynamic -T ${LDSCRIPT} ${_LDFLAGS} --no-warn-mismatch \
  	--warn-common --export-dynamic --dynamic-linker /red/herring \

Modified: trunk/kfreebsd-11/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/999_config.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/999_config.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -11,7 +11,7 @@
  
  makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
  makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
  options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
  options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
@@ -37,7 +37,7 @@
  
  makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
  makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-@@ -56,7 +56,7 @@
+@@ -57,7 +57,7 @@
  options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
  options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
  options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
@@ -131,7 +131,7 @@
 +options 	KDB_TRACE		# Print a stack trace for a panic.
 --- a/sys/modules/Makefile
 +++ b/sys/modules/Makefile
-@@ -528,7 +528,9 @@
+@@ -561,7 +561,9 @@
  .endif
  _safe=		safe
  _scsi_low=	scsi_low

Modified: trunk/kfreebsd-11/debian/patches/unescaped_kern_ident.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/unescaped_kern_ident.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/unescaped_kern_ident.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -5,7 +5,7 @@
 
 --- a/sys/conf/kern.post.mk
 +++ b/sys/conf/kern.post.mk
-@@ -287,7 +287,7 @@
+@@ -338,7 +338,7 @@
  	${NORMAL_LINT}
  
  vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}

Modified: trunk/kfreebsd-11/debian/patches/userland.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/userland.diff	2016-02-06 16:56:58 UTC (rev 5866)
+++ trunk/kfreebsd-11/debian/patches/userland.diff	2016-02-06 17:00:08 UTC (rev 5867)
@@ -122,7 +122,7 @@
  typedef	struct __mq	*__mqd_t;	/* mq_open()... */
  typedef	__uint32_t	__uid_t;
  typedef	unsigned int	__useconds_t;	/* microseconds (unsigned) */
-@@ -107,9 +120,13 @@
+@@ -107,10 +120,14 @@
   * mbstate_t is an opaque object to keep conversion state during multibyte
   * stream conversions.
   */
@@ -135,7 +135,8 @@
  } __mbstate_t;
 +#endif
  
- #endif /* !_SYS__TYPES_H_ */
+ typedef unsigned long	__rman_res_t;
+ 
 --- a/sys/sys/elf32.h
 +++ b/sys/sys/elf32.h
 @@ -31,15 +31,21 @@
@@ -345,7 +346,7 @@
  
  /* 
   * __FreeBSD_version numbers are documented in the Porter's Handbook.
-@@ -98,11 +104,15 @@
+@@ -99,11 +105,15 @@
  #include <sys/syslimits.h>
  
  #define	MAXCOMLEN	19		/* max command name remembered */
@@ -361,7 +362,7 @@
  #define	NOFILE		OPEN_MAX	/* max open files per process */
  #define	NOGROUP		65535		/* marker for empty group set member */
  #define MAXHOSTNAMELEN	256		/* max hostname size */
-@@ -139,7 +149,9 @@
+@@ -140,7 +150,9 @@
  #ifndef DEV_BSHIFT
  #define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
  #endif
@@ -371,7 +372,7 @@
  
  #ifndef BLKDEV_IOSIZE
  #define BLKDEV_IOSIZE  PAGE_SIZE	/* default block device I/O size */
-@@ -215,9 +227,11 @@
+@@ -216,9 +228,11 @@
  #define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
  #define	PDROP	0x200	/* OR'd with pri to stop re-entry of interlock mutex */
  
@@ -383,7 +384,7 @@
  #define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
  
  #define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-@@ -277,6 +291,7 @@
+@@ -278,6 +292,7 @@
  #define	MAXPATHLEN	PATH_MAX
  #define MAXSYMLINKS	32
  
@@ -391,7 +392,7 @@
  /* Bit map related macros. */
  #define	setbit(a,i)	(((unsigned char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
  #define	clrbit(a,i)	(((unsigned char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-@@ -284,6 +299,7 @@
+@@ -285,6 +300,7 @@
  	(((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
  #define	isclr(a,i)							\
  	((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
@@ -399,7 +400,7 @@
  
  /* Macros for counting and rounding. */
  #ifndef howmany
-@@ -292,9 +308,13 @@
+@@ -293,9 +309,13 @@
  #define	nitems(x)	(sizeof((x)) / sizeof((x)[0]))
  #define	rounddown(x, y)	(((x)/(y))*(y))
  #define	rounddown2(x, y) ((x)&(~((y)-1)))          /* if y is power of two */
@@ -902,19 +903,20 @@
  
  #ifndef _RLIM_T_DECLARED
  typedef	__rlim_t	rlim_t;		/* resource limit */
-@@ -290,10 +306,10 @@
-  * The following are all things that really shouldn't exist in this header,
-  * since its purpose is to provide typedefs, not miscellaneous doodads.
-  */
+@@ -355,10 +371,11 @@
+ #define	__bitcount(x)	__bitcount32((unsigned int)(x))
+ #endif
+ 
 -#if __BSD_VISIBLE
  
  #include <sys/select.h>
  
 +#ifdef __FreeBSD__
- #ifdef __POPCNT__
- #define	__bitcount64(x)	__builtin_popcountll((__uint64_t)(x))
- #define	__bitcount32(x)	__builtin_popcount((__uint32_t)(x))
-@@ -370,7 +386,7 @@
++
+ /*
+  * minor() gives a cookie instead of an index since we don't want to
+  * change the meanings of bits 0-15 or waste time and space shifting
+@@ -373,7 +390,7 @@
   * <stdio.h> to give broken programs a better chance of working with
   * 64-bit off_t's.
   */
@@ -968,7 +970,7 @@
  /*
   * Maximum queue length specifiable by listen.
   */
-@@ -668,5 +676,6 @@
+@@ -686,5 +694,6 @@
  
  #endif
  
@@ -1145,7 +1147,7 @@
  /*
   * System defined signals.
   */
-@@ -441,4 +448,6 @@
+@@ -440,4 +447,6 @@
  __sighandler_t *signal(int, __sighandler_t *);
  __END_DECLS

More information about the Glibc-bsd-commits mailing list