[Glibc-bsd-commits] r5725 - in trunk/kfreebsd-11/debian: . patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Tue Jul 7 23:42:59 UTC 2015
Author: stevenc-guest
Date: 2015-07-07 23:42:58 +0000 (Tue, 07 Jul 2015)
New Revision: 5725
Added:
trunk/kfreebsd-11/debian/patches/930_freebsd_cc.diff
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/107_mount_update.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/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-11/debian/patches/914_psm.diff
trunk/kfreebsd-11/debian/patches/915_ip6.v6only.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/923_newvers_timestamp.diff
trunk/kfreebsd-11/debian/patches/999_config.diff
trunk/kfreebsd-11/debian/patches/series
trunk/kfreebsd-11/debian/patches/unescaped_kern_ident.diff
trunk/kfreebsd-11/debian/patches/userland.diff
trunk/kfreebsd-11/debian/rules
Log:
* Refresh patches:
- userland.diff
- unescaped_kern_ident.diff
- 001_misc.diff
- 004_xargs.diff
- 107_mount_update.diff
- 902_version.diff
- 906_grow_sysv_ipc_limits.diff
- 908_linprocfs_is_not_proc.diff
- 914_psm.diff
- 915_ip6.v6only.diff
- 917_disable_kgssapi.diff
- 918_unix_socket_overflow.diff
- 920_linux_cflags.diff
- 921_signal_watchdog.diff
* Remove obsolete patch:
- vxge_no_ctf.diff
- 922_cc_version.diff
* New patch:
- 930_freebsd_cc.diff (Unset FREEBSD_CC)
* Manually set COMPILER_TYPE and COMPILER_VERSION in debian/rules, as
bsd.compiler.mk doesn't detect our own compiler version correctly
* Set WITHOUT_FORMAT_EXTENSIONS, a FreeBSD compiler extension we
don't have
Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/changelog 2015-07-07 23:42:58 UTC (rev 5725)
@@ -8,7 +8,30 @@
(Closes: #748745)
- Fix memory leak in sandboxed namei lookup. [SA-14:22]
(CVE-2014-3711) (Closes: #766279)
- - :TODO:
+ - Refresh patches:
+ - userland.diff
+ - unescaped_kern_ident.diff
+ - 001_misc.diff
+ - 004_xargs.diff
+ - 107_mount_update.diff
+ - 902_version.diff
+ - 906_grow_sysv_ipc_limits.diff
+ - 908_linprocfs_is_not_proc.diff
+ - 914_psm.diff
+ - 915_ip6.v6only.diff
+ - 917_disable_kgssapi.diff
+ - 918_unix_socket_overflow.diff
+ - 920_linux_cflags.diff
+ - 921_signal_watchdog.diff
+ - Remove obsolete patch:
+ - vxge_no_ctf.diff
+ - 922_cc_version.diff
+ - New patch:
+ - 930_freebsd_cc.diff (Unset FREEBSD_CC)
+ * Manually set COMPILER_TYPE and COMPILER_VERSION in debian/rules, as
+ bsd.compiler.mk doesn't detect our own compiler version correctly
+ * Set WITHOUT_FORMAT_EXTENSIONS, a FreeBSD compiler extension we
+ don't have
* Build kernel images only on kfreebsd-any arches.
* DEB_HOST_ARCH_CPU on armel is arm; update debian/rules detection
and thereby correctly specify any-arm in debian/control too.
Modified: trunk/kfreebsd-11/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/001_misc.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/001_misc.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -3,9 +3,9 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -3,6 +3,16 @@
- # Compat
- MK_FORMAT_EXTENSIONS?=no
+@@ -64,6 +64,16 @@
+ FORMAT_EXTENSIONS= -fformat-extensions
+ .endif
+FREEBSD_CC!= ${CC} -dM -E -</dev/null | awk '/__FreeBSD_cc_version/ { print $$3 }' || true
+
@@ -18,14 +18,14 @@
+.endif
+
#
- # Warning flags for compiling the kernel and components of the kernel:
+ # 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 @@
+ # Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42
#
-@@ -65,7 +75,7 @@
- #
.if ${MACHINE_CPUARCH} == "i386"
- .if ${COMPILER_TYPE} != "clang"
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
-+CFLAGS+= ${no_align_long_strings} -mpreferred-stack-boundary=2
- .else
- CFLAGS+= -mno-aes -mno-avx
- .endif
+-CFLAGS.gcc+= -mno-align-long-strings -mpreferred-stack-boundary=2
++CFLAGS.gcc+= ${no-align-long-strings} -mpreferred-stack-boundary=2
+ CFLAGS.clang+= -mno-aes -mno-avx
+ CFLAGS+= -mno-mmx -mno-sse -msoft-float
+ INLINE_LIMIT?= 8000
Modified: trunk/kfreebsd-11/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/004_xargs.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/004_xargs.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -6,7 +6,7 @@
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -215,7 +215,7 @@
+@@ -212,7 +212,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -17,7 +17,7 @@
.if !defined(DEBUG_FLAGS) && ${__KLD_SHARED} == no
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
-@@ -58,10 +58,10 @@
+@@ -60,10 +60,10 @@
# copy files
echo copying full dirs
for i in ${fulldirs}; do
@@ -30,19 +30,3 @@
# canonify include paths
for H in ${src_headers}; do
---- a/sys/conf/kern.post.mk
-+++ b/sys/conf/kern.post.mk
-@@ -199,12 +199,9 @@
- rm -f .newdep
- ${MAKE} -V CFILES_NOZFS -V SYSTEM_CFILES -V GEN_CFILES | \
- MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
-- ${MAKE} -V CFILES_ZFS | \
-- MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${ZFS_CFLAGS}
-+ # GNU xargs behaves differently when given a single newline character.
- ${MAKE} -V SFILES_NOZFS | \
- MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS}
-- ${MAKE} -V SFILES_ZFS | \
-- MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ZFS_ASM_CFLAGS}
- rm -f .depend
- mv .newdep .depend
-
Modified: trunk/kfreebsd-11/debian/patches/107_mount_update.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/107_mount_update.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/107_mount_update.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -7,7 +7,7 @@
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
-@@ -652,6 +652,24 @@
+@@ -656,6 +656,24 @@
}
/*
Modified: trunk/kfreebsd-11/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/902_version.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/902_version.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -1,6 +1,6 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -212,6 +212,9 @@
+@@ -216,6 +216,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 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/906_grow_sysv_ipc_limits.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -23,7 +23,7 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -59,6 +59,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
-@@ -60,6 +60,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/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/908_linprocfs_is_not_proc.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/908_linprocfs_is_not_proc.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -1,9 +1,9 @@
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -358,10 +358,6 @@
+@@ -361,10 +361,6 @@
/* determine fs type */
- fstype = mp->mnt_stat.f_fstypename;
+ fstype = sp->f_fstypename;
- if (strcmp(fstype, pn->pn_info->pi_name) == 0)
- mntfrom = fstype = "proc";
- else if (strcmp(fstype, "procfs") == 0)
Modified: trunk/kfreebsd-11/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/914_psm.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/914_psm.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -18,15 +18,15 @@
#include <sys/syslog.h>
#include <machine/bus.h>
#include <sys/rman.h>
-@@ -335,7 +332,6 @@
+@@ -338,7 +335,6 @@
struct cdev *bdev;
int lasterr;
int cmdcount;
- struct sigio *async; /* Processes waiting for SIGIO */
+ int extended_buttons;
};
static devclass_t psm_devclass;
-
-@@ -1565,7 +1561,6 @@
+@@ -1580,7 +1576,6 @@
sc->mode.level = sc->dflt_mode.level;
sc->mode.protocol = sc->dflt_mode.protocol;
sc->watchdog = FALSE;
@@ -34,7 +34,7 @@
/* flush the event queue */
sc->queue.count = 0;
-@@ -1706,12 +1701,6 @@
+@@ -1721,12 +1716,6 @@
/* remove anything left in the output buffer */
empty_aux_buffer(sc->kbdc, 10);
@@ -47,7 +47,7 @@
/* close is almost always successful */
sc->state &= ~PSM_OPEN;
kbdc_lock(sc->kbdc, FALSE);
-@@ -2273,15 +2262,6 @@
+@@ -2302,15 +2291,6 @@
break;
#endif /* MOUSE_GETHWID */
@@ -63,7 +63,7 @@
default:
return (ENOTTY);
}
-@@ -3579,9 +3559,6 @@
+@@ -3661,9 +3641,6 @@
wakeup(sc);
}
selwakeuppri(&sc->rsel, PZERO);
Modified: trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/915_ip6.v6only.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -1,6 +1,6 @@
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
-@@ -406,7 +406,7 @@
+@@ -416,7 +416,7 @@
VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
@@ -9,12 +9,12 @@
VNET_DEFINE(int, ip6_no_radr) = 0;
VNET_DEFINE(int, ip6_norbit_raif) = 0;
VNET_DEFINE(int, ip6_rfc6204w3) = 0;
-@@ -422,7 +422,7 @@
+@@ -432,7 +432,7 @@
VNET_DEFINE(int, ip6_rr_prune) = 5; /* router renumbering prefix
* walk list every 5 sec. */
VNET_DEFINE(int, ip6_mcast_pmtu) = 0; /* enable pMTU discovery for multicast? */
-VNET_DEFINE(int, ip6_v6only) = 1;
+VNET_DEFINE(int, ip6_v6only) = 0;
- VNET_DEFINE(int, ip6_keepfaith) = 0;
VNET_DEFINE(time_t, ip6_log_time) = (time_t)0L;
+ #ifdef IPSTEALTH
Modified: trunk/kfreebsd-11/debian/patches/917_disable_kgssapi.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/917_disable_kgssapi.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/917_disable_kgssapi.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -175,8 +175,6 @@
+@@ -182,8 +182,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 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/918_unix_socket_overflow.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -8,7 +8,7 @@
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
-@@ -471,7 +471,12 @@
+@@ -474,7 +474,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);
-@@ -1284,7 +1289,12 @@
+@@ -1319,7 +1324,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 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/920_linux_cflags.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -5,23 +5,23 @@
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
-@@ -95,6 +95,8 @@
+@@ -102,6 +102,8 @@
.endif
WERROR?= -Werror
+CFLAGS+= -Ulinux -U__linux__ -D__FreeBSD__=1000
+
# XXX LOCORE means "don't declare C stuff" not "for locore.s".
- ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
+ ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} ${ASM_CFLAGS.${.IMPSRC:T}}
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -92,6 +92,8 @@
+@@ -86,6 +86,8 @@
CFLAGS+= -D_KERNEL
CFLAGS+= -DKLD_MODULE
+CFLAGS+= -Ulinux -U__linux__ -D__FreeBSD__=1000
+
# Don't use any standard or source-relative include directories.
- CSTD= c99
NOSTDINC= -nostdinc
+ CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
Modified: trunk/kfreebsd-11/debian/patches/923_newvers_timestamp.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/923_newvers_timestamp.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/923_newvers_timestamp.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -9,9 +9,9 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -91,6 +91,12 @@
+@@ -95,6 +95,12 @@
i=`${MAKE:-make} -V KERN_IDENT`
- compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep ' version ')
+ compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep -w 'version')
+if [ -f "${SYSDIR}/../../debian/changelog" ] ; then
+ # Use timestamp from the most recent debian/changelog entry,
Added: trunk/kfreebsd-11/debian/patches/930_freebsd_cc.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/930_freebsd_cc.diff (rev 0)
+++ trunk/kfreebsd-11/debian/patches/930_freebsd_cc.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -0,0 +1,18 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Date: Wed, 08 Jul 2015 00:22:18 +0100
+Subject: Unset FREEBSD_CC
+
+This detection displays a warning on non-FreeBSD, for every source file
+compiled, and is likely also slow; so just manually unset it.
+
+--- a/sys/conf/kern.mk
++++ b/sys/conf/kern.mk
+@@ -64,7 +64,7 @@
+ FORMAT_EXTENSIONS= -fformat-extensions
+ .endif
+
+-FREEBSD_CC!= ${CC} -dM -E -</dev/null | awk '/__FreeBSD_cc_version/ { print $$3 }' || true
++FREEBSD_CC=
+
+ .if ${FREEBSD_CC}
+ # FreeBSD extensions
Modified: trunk/kfreebsd-11/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/999_config.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/999_config.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -9,12 +9,12 @@
+#cpu HAMMER
+#ident GENERIC
- makeoptions DEBUG=-g
+ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-@@ -53,7 +53,7 @@
- options COMPAT_FREEBSD5 # Compatible with FreeBSD5
- options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+@@ -56,7 +56,7 @@
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
+ options COMPAT_FREEBSD9 # Compatible with FreeBSD9
+ options COMPAT_FREEBSD10 # Compatible with FreeBSD10
-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
@@ -35,12 +35,12 @@
+#cpu I686_CPU
+#ident GENERIC
- makeoptions DEBUG=-g
+ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
-@@ -54,7 +54,7 @@
- options COMPAT_FREEBSD5 # Compatible with FreeBSD5
- options COMPAT_FREEBSD6 # Compatible with FreeBSD6
+@@ -57,7 +57,7 @@
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
+ options COMPAT_FREEBSD9 # Compatible with FreeBSD9
+ options COMPAT_FREEBSD10 # Compatible with FreeBSD10
-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
+options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
Modified: trunk/kfreebsd-11/debian/patches/series
===================================================================
--- trunk/kfreebsd-11/debian/patches/series 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/series 2015-07-07 23:42:58 UTC (rev 5725)
@@ -16,7 +16,6 @@
109_linprocfs_non_x86.diff
# Patches that are likely to be Debian-specific
-vxge_no_ctf.diff
firmware_load.diff
902_version.diff
906_grow_sysv_ipc_limits.diff
@@ -29,6 +28,6 @@
919_delete_key.diff
920_linux_cflags.diff
921_signal_watchdog.diff
-922_cc_version.diff
923_newvers_timestamp.diff
+930_freebsd_cc.diff
999_config.diff
Modified: trunk/kfreebsd-11/debian/patches/unescaped_kern_ident.diff
===================================================================
--- trunk/kfreebsd-11/debian/patches/unescaped_kern_ident.diff 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/unescaped_kern_ident.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -5,7 +5,7 @@
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
-@@ -286,7 +286,7 @@
+@@ -287,7 +287,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 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/patches/userland.diff 2015-07-07 23:42:58 UTC (rev 5725)
@@ -1,18 +1,5 @@
-
Staging area for fixes needed by userland.
---- a/sys/ia64/include/_types.h
-+++ b/sys/ia64/include/_types.h
-@@ -74,7 +74,9 @@
- typedef __int32_t __int_least32_t;
- typedef __int64_t __int_least64_t;
- typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#ifdef __FreeBSD__
- typedef __int64_t __register_t;
-+#endif
- typedef __int64_t __segsz_t; /* segment size (in pages) */
- typedef __uint64_t __size_t; /* sizeof() */
- typedef __int64_t __ssize_t; /* byte count or error */
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
@@ -94,10 +94,14 @@
@@ -181,7 +168,7 @@
/*
* ELF header.
*/
-@@ -165,6 +172,8 @@
+@@ -177,6 +184,8 @@
#define ELF32_M_SIZE(info) ((unsigned char)(info))
#define ELF32_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
@@ -190,7 +177,7 @@
/*
* Hardware/Software capabilities entry
*/
-@@ -176,6 +185,7 @@
+@@ -188,6 +197,7 @@
} c_un;
} Elf32_Cap;
@@ -198,7 +185,7 @@
/*
* Symbol table entries.
*/
-@@ -234,12 +244,15 @@
+@@ -246,12 +256,15 @@
Elf32_Word vna_name;
Elf32_Word vna_next;
} Elf32_Vernaux;
@@ -251,7 +238,7 @@
/*
* ELF header.
*/
-@@ -172,6 +181,8 @@
+@@ -184,6 +193,8 @@
#define ELF64_M_SIZE(info) ((unsigned char)(info))
#define ELF64_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
@@ -260,7 +247,7 @@
/*
* Hardware/Software capabilities entry
*/
-@@ -183,6 +194,7 @@
+@@ -195,6 +206,7 @@
} c_un;
} Elf64_Cap;
@@ -268,7 +255,7 @@
/*
* Symbol table entries.
*/
-@@ -237,12 +249,15 @@
+@@ -249,12 +261,15 @@
Elf64_Word vna_name;
Elf64_Word vna_next;
} Elf64_Vernaux;
@@ -358,7 +345,7 @@
/*
* __FreeBSD_version numbers are documented in the Porter's Handbook.
-@@ -97,11 +103,15 @@
+@@ -98,11 +104,15 @@
#include <sys/syslimits.h>
#define MAXCOMLEN 19 /* max command name remembered */
@@ -374,7 +361,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 */
-@@ -138,7 +148,9 @@
+@@ -139,7 +149,9 @@
#ifndef DEV_BSHIFT
#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
#endif
@@ -384,7 +371,7 @@
#ifndef BLKDEV_IOSIZE
#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */
-@@ -214,9 +226,11 @@
+@@ -215,9 +227,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 */
@@ -396,7 +383,7 @@
#define NBPW sizeof(int) /* number of bytes per word (integer) */
#define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */
-@@ -262,6 +276,7 @@
+@@ -277,6 +291,7 @@
#define MAXPATHLEN PATH_MAX
#define MAXSYMLINKS 32
@@ -404,7 +391,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)))
-@@ -269,6 +284,7 @@
+@@ -284,6 +299,7 @@
(((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
#define isclr(a,i) \
((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
@@ -412,7 +399,7 @@
/* Macros for counting and rounding. */
#ifndef howmany
-@@ -277,9 +293,13 @@
+@@ -292,9 +308,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 */
@@ -443,7 +430,7 @@
#include <sys/cdefs.h>
-@@ -166,10 +170,12 @@
+@@ -187,10 +191,12 @@
#define SLIST_FIRST(head) ((head)->slh_first)
@@ -456,7 +443,7 @@
#define SLIST_FOREACH_FROM(var, head, field) \
for ((var) = ((var) ? (var) : SLIST_FIRST((head))); \
-@@ -191,6 +197,7 @@
+@@ -212,6 +218,7 @@
((var) = *(varp)) != NULL; \
(varp) = &SLIST_NEXT((var), field))
@@ -464,7 +451,7 @@
#define SLIST_INIT(head) do { \
SLIST_FIRST((head)) = NULL; \
} while (0)
-@@ -204,9 +211,11 @@
+@@ -225,9 +232,11 @@
SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \
SLIST_FIRST((head)) = (elm); \
} while (0)
@@ -476,7 +463,7 @@
#define SLIST_REMOVE(head, elm, type, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.sle_next); \
if (SLIST_FIRST((head)) == (elm)) { \
-@@ -220,7 +229,9 @@
+@@ -241,7 +250,9 @@
} \
TRASHIT(*oldnext); \
} while (0)
@@ -486,16 +473,16 @@
#define SLIST_REMOVE_AFTER(elm, field) do { \
SLIST_NEXT(elm, field) = \
SLIST_NEXT(SLIST_NEXT(elm, field), field); \
-@@ -229,6 +240,7 @@
+@@ -250,6 +261,7 @@
#define SLIST_REMOVE_HEAD(head, field) do { \
SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \
} while (0)
+#endif
#define SLIST_SWAP(head1, head2, type) do { \
- struct type *swap_first = SLIST_FIRST(head1); \
-@@ -245,8 +257,10 @@
- struct type **stqh_last;/* addr of last next element */ \
+ QUEUE_TYPEOF(type) *swap_first = SLIST_FIRST(head1); \
+@@ -272,8 +284,10 @@
+ class type **stqh_last; /* addr of last next element */ \
}
+#if defined(__FreeBSD__) || defined(_KERNEL)
@@ -505,7 +492,7 @@
#define STAILQ_ENTRY(type) \
struct { \
-@@ -256,6 +270,7 @@
+@@ -288,6 +302,7 @@
/*
* Singly-linked Tail queue functions.
*/
@@ -513,7 +500,7 @@
#define STAILQ_CONCAT(head1, head2) do { \
if (!STAILQ_EMPTY((head2))) { \
*(head1)->stqh_last = (head2)->stqh_first; \
-@@ -263,36 +278,44 @@
+@@ -295,36 +310,44 @@
STAILQ_INIT((head2)); \
} \
} while (0)
@@ -558,15 +545,15 @@
#define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \
if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
-@@ -310,6 +333,7 @@
+@@ -342,6 +365,7 @@
*(head)->stqh_last = (elm); \
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
} while (0)
+#endif
- #define STAILQ_LAST(head, type, field) \
- (STAILQ_EMPTY((head)) ? NULL : \
-@@ -317,6 +341,7 @@
+ #define STAILQ_LAST(head, type, field) \
+ (STAILQ_EMPTY((head)) ? NULL : \
+@@ -350,6 +374,7 @@
#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
@@ -574,7 +561,7 @@
#define STAILQ_REMOVE(head, elm, type, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \
if (STAILQ_FIRST((head)) == (elm)) { \
-@@ -330,6 +355,7 @@
+@@ -363,6 +388,7 @@
} \
TRASHIT(*oldnext); \
} while (0)
@@ -582,7 +569,7 @@
#define STAILQ_REMOVE_AFTER(head, elm, field) do { \
if ((STAILQ_NEXT(elm, field) = \
-@@ -337,11 +363,13 @@
+@@ -370,11 +396,13 @@
(head)->stqh_last = &STAILQ_NEXT((elm), field); \
} while (0)
@@ -595,8 +582,8 @@
+#endif
#define STAILQ_SWAP(head1, head2, type) do { \
- struct type *swap_first = STAILQ_FIRST(head1); \
-@@ -407,30 +435,37 @@
+ QUEUE_TYPEOF(type) *swap_first = STAILQ_FIRST(head1); \
+@@ -451,30 +479,37 @@
#define LIST_FIRST(head) ((head)->lh_first)
@@ -634,7 +621,7 @@
#define LIST_INSERT_AFTER(listelm, elm, field) do { \
QMD_LIST_CHECK_NEXT(listelm, field); \
if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
-@@ -455,6 +490,7 @@
+@@ -499,6 +534,7 @@
LIST_FIRST((head)) = (elm); \
(elm)->field.le_prev = &LIST_FIRST((head)); \
} while (0)
@@ -642,23 +629,23 @@
#define LIST_NEXT(elm, field) ((elm)->field.le_next)
-@@ -462,6 +498,7 @@
- ((elm)->field.le_prev == &LIST_FIRST((head)) ? NULL : \
- __containerof((elm)->field.le_prev, struct type, field.le_next))
+@@ -507,6 +543,7 @@
+ __containerof((elm)->field.le_prev, \
+ QUEUE_TYPEOF(type), field.le_next))
+#if !defined(__GLIBC__) || defined(_KERNEL)
#define LIST_REMOVE(elm, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.le_next); \
QMD_SAVELINK(oldprev, (elm)->field.le_prev); \
-@@ -474,6 +511,7 @@
+@@ -519,6 +556,7 @@
TRASHIT(*oldnext); \
TRASHIT(*oldprev); \
} while (0)
+#endif
#define LIST_SWAP(head1, head2, type, field) do { \
- struct type *swap_tmp = LIST_FIRST((head1)); \
-@@ -488,22 +526,28 @@
+ QUEUE_TYPEOF(type) *swap_tmp = LIST_FIRST(head1); \
+@@ -533,6 +571,7 @@
/*
* Tail queue declarations.
*/
@@ -666,7 +653,8 @@
#define TAILQ_HEAD(name, type) \
struct name { \
struct type *tqh_first; /* first element */ \
- struct type **tqh_last; /* addr of last next element */ \
+@@ -546,10 +585,14 @@
+ class type **tqh_last; /* addr of last next element */ \
TRACEBUF \
}
+#endif
@@ -680,14 +668,15 @@
#define TAILQ_ENTRY(type) \
struct { \
struct type *tqe_next; /* next element */ \
- struct type **tqe_prev; /* address of previous next element */ \
+@@ -563,6 +606,7 @@
+ class type **tqe_prev; /* address of previous next element */ \
TRACEBUF \
}
+#endif
/*
* Tail queue functions.
-@@ -539,6 +583,7 @@
+@@ -598,6 +642,7 @@
#define QMD_TAILQ_CHECK_PREV(elm, field)
#endif /* (_KERNEL && INVARIANTS) */
@@ -695,7 +684,7 @@
#define TAILQ_CONCAT(head1, head2, field) do { \
if (!TAILQ_EMPTY(head2)) { \
*(head1)->tqh_last = (head2)->tqh_first; \
-@@ -549,51 +594,61 @@
+@@ -608,51 +653,61 @@
QMD_TRACE_HEAD(head2); \
} \
} while (0)
@@ -757,7 +746,7 @@
#define TAILQ_INIT(head) do { \
TAILQ_FIRST((head)) = NULL; \
(head)->tqh_last = &TAILQ_FIRST((head)); \
-@@ -647,6 +702,7 @@
+@@ -706,6 +761,7 @@
QMD_TRACE_HEAD(head); \
QMD_TRACE_ELEM(&(elm)->field); \
} while (0)
@@ -765,7 +754,7 @@
#define TAILQ_LAST(head, headname) \
(*(((struct headname *)((head)->tqh_last))->tqh_last))
-@@ -656,6 +712,7 @@
+@@ -715,6 +771,7 @@
#define TAILQ_PREV(elm, headname, field) \
(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
@@ -773,14 +762,14 @@
#define TAILQ_REMOVE(head, elm, field) do { \
QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \
QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \
-@@ -673,6 +730,7 @@
+@@ -732,6 +789,7 @@
TRASHIT(*oldprev); \
QMD_TRACE_ELEM(&(elm)->field); \
} while (0)
+#endif
#define TAILQ_SWAP(head1, head2, type, field) do { \
- struct type *swap_first = (head1)->tqh_first; \
+ QUEUE_TYPEOF(type) *swap_first = (head1)->tqh_first; \
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -37,10 +37,16 @@
@@ -913,7 +902,7 @@
#ifndef _RLIM_T_DECLARED
typedef __rlim_t rlim_t; /* resource limit */
-@@ -285,10 +301,10 @@
+@@ -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.
*/
@@ -922,10 +911,10 @@
#include <sys/select.h>
+#ifdef __FreeBSD__
- /*
- * 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
-@@ -303,7 +319,7 @@
+ #ifdef __POPCNT__
+ #define __bitcount64(x) __builtin_popcountll((__uint64_t)(x))
+ #define __bitcount32(x) __builtin_popcount((__uint32_t)(x))
+@@ -370,7 +386,7 @@
* <stdio.h> to give broken programs a better chance of working with
* 64-bit off_t's.
*/
@@ -979,7 +968,7 @@
/*
* Maximum queue length specifiable by listen.
*/
-@@ -684,5 +692,6 @@
+@@ -668,5 +676,6 @@
#endif
Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules 2015-07-07 21:40:14 UTC (rev 5724)
+++ trunk/kfreebsd-11/debian/rules 2015-07-07 23:42:58 UTC (rev 5725)
@@ -60,12 +60,13 @@
MAKEFLAGS=$(BSD_MAKEFLAGS) \
bmake \
MACHINE_ARCH=$(kfreebsd_cpu) \
- -DWITHOUT_SOURCELESS
+ -DWITHOUT_SOURCELESS \
+ -DWITHOUT_FORMAT_EXTENSIONS
# Clang is the default compiler on these architectures (see src/share/mk/src.opts.mk)
clang_cpus := i386 amd64 arm
-ifneq ($(clang_version), 3.6.1)
+ifeq (, $(filter 3.6.%, $(clang_version)))
$(error Upstream is now using a different Clang version than we expected. Consider updating cc_pkg and cc_cmd)
endif
@@ -78,10 +79,14 @@
cc_cmd := gcc-4.8
endif
-ifeq ($(cc_cmd), clang)
+ifneq (, $(filter clang-%, $(cc_cmd)))
MAKE += -DWITH_CLANG_IS_CC
+MAKE += COMPILER_TYPE=clang
+MAKE += COMPILER_VERSION=30601
else
MAKE += -DWITHOUT_CLANG_IS_CC
+MAKE += COMPILER_TYPE=gcc
+MAKE += COMPILER_VERSION=40901
MAKE += WERROR=
endif
More information about the Glibc-bsd-commits
mailing list