[Glibc-bsd-commits] r3726 - in trunk: kfreebsd-8/debian kfreebsd-8/debian/patches kfreebsd-9/debian kfreebsd-9/debian/patches
Robert Millan
rmh at alioth.debian.org
Fri Oct 7 23:07:42 UTC 2011
Author: rmh
Date: 2011-10-07 23:07:41 +0000 (Fri, 07 Oct 2011)
New Revision: 3726
Added:
trunk/kfreebsd-8/debian/patches/005_gcc46.diff
trunk/kfreebsd-9/debian/patches/008_gcc46.diff
Modified:
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/patches/000_coda.diff
trunk/kfreebsd-8/debian/patches/000_t_delta_warning.diff
trunk/kfreebsd-8/debian/patches/001_misc.diff
trunk/kfreebsd-8/debian/patches/004_xargs.diff
trunk/kfreebsd-8/debian/patches/007_clone_signals.diff
trunk/kfreebsd-8/debian/patches/008_config.diff
trunk/kfreebsd-8/debian/patches/013_ip_packed.diff
trunk/kfreebsd-8/debian/patches/020_linker.diff
trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff
trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff
trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff
trunk/kfreebsd-8/debian/patches/106_teken_op.diff
trunk/kfreebsd-8/debian/patches/107_mount_update.diff
trunk/kfreebsd-8/debian/patches/108_teken_utf8_table.diff
trunk/kfreebsd-8/debian/patches/109_linprocfs_non_x86.diff
trunk/kfreebsd-8/debian/patches/110_disable_trampoline_flavour.diff
trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff
trunk/kfreebsd-8/debian/patches/200_xen.diff
trunk/kfreebsd-8/debian/patches/902_version.diff
trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-8/debian/patches/904_dev_full.diff
trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff
trunk/kfreebsd-8/debian/patches/913_uudecode.diff
trunk/kfreebsd-8/debian/patches/914_psm.diff
trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff
trunk/kfreebsd-8/debian/patches/917_track_alignment.diff
trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
trunk/kfreebsd-8/debian/patches/999_firmware.diff
trunk/kfreebsd-8/debian/patches/series
trunk/kfreebsd-9/debian/changelog
trunk/kfreebsd-9/debian/patches/series
Log:
Add -fno-gcse to CFLAGS to fix GCC 4.6 builds. (Closes: #644417)
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/changelog 2011-10-07 23:07:41 UTC (rev 3726)
@@ -1,10 +1,14 @@
-kfreebsd-8 (8.2-8) UNRELEASED; urgency=low
+kfreebsd-8 (8.2-8) unstable; urgency=high
[ Petr Salinger ]
* extend ld_target detection
- -- Robert Millan <rmh at debian.org> Mon, 08 Aug 2011 12:19:45 +0000
+ [ Robert Millan ]
+ * 005_gcc46.diff: Add -fno-gcse to CFLAGS to fix GCC 4.6 builds.
+ (Closes: #644417)
+ -- Robert Millan <rmh at debian.org> Sat, 08 Oct 2011 01:01:34 +0200
+
kfreebsd-8 (8.2-7) unstable; urgency=low
* Replace msk backport patch with version from 8-STABLE (instead of
Modified: trunk/kfreebsd-8/debian/patches/000_coda.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_coda.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/000_coda.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -16,7 +16,7 @@
/* Avoid CODA_COMPAT_5 redefinition in coda5 module */
#if defined (CODA5_MODULE) && !defined(CODA_COMPAT_5)
-@@ -782,8 +784,8 @@ union coda_downcalls {
+@@ -782,8 +784,8 @@
#define PIOCPARM_MASK 0x0000ffff
struct ViceIoctl {
caddr_t in, out; /* Data to be transferred in, or out */
@@ -29,7 +29,7 @@
#if defined(__CYGWIN32__) || defined(DJGPP)
--- a/sys/fs/coda/coda_venus.c
+++ b/sys/fs/coda/coda_venus.c
-@@ -274,6 +274,12 @@ venus_ioctl(void *mdp, struct CodaFid *f
+@@ -274,6 +274,12 @@
tmp = ((com >> 16) & IOCPARM_MASK) - sizeof (char *) - sizeof (int);
inp->cmd |= (tmp & IOCPARM_MASK) << 16;
@@ -44,7 +44,7 @@
inp->data = (char *)(sizeof (struct coda_ioctl_in));
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
-@@ -471,7 +471,8 @@ coda_ioctl(struct vop_ioctl_args *ap)
+@@ -471,7 +471,8 @@
iap->path)););
return (EINVAL);
}
Modified: trunk/kfreebsd-8/debian/patches/000_t_delta_warning.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_t_delta_warning.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/000_t_delta_warning.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -7,7 +7,7 @@
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
-@@ -876,43 +876,21 @@ cpu_tick_calibrate(int reset)
+@@ -876,43 +876,21 @@
t_delta = t_this;
bintime_sub(&t_delta, &t_last);
/*
Modified: trunk/kfreebsd-8/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/001_misc.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/001_misc.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -35,7 +35,7 @@
.if !defined(WITH_GCC3)
_Wno_pointer_sign=-Wno-pointer-sign
.endif
-@@ -36,8 +44,12 @@ _wundef= -Wundef
+@@ -36,8 +44,12 @@
# reserved for user applications.
#
.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
Modified: trunk/kfreebsd-8/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/004_xargs.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/004_xargs.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -8,7 +8,7 @@
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -207,7 +207,7 @@ ${FULLPROG}: ${OBJS}
+@@ -207,7 +207,7 @@
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -19,7 +19,7 @@
.if !defined(DEBUG_FLAGS) && \
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
-@@ -59,10 +59,10 @@ done
+@@ -59,10 +59,10 @@
# copy files
echo copying full dirs
for i in ${fulldirs}; do
Added: trunk/kfreebsd-8/debian/patches/005_gcc46.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/005_gcc46.diff (rev 0)
+++ trunk/kfreebsd-8/debian/patches/005_gcc46.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -0,0 +1,14 @@
+--- a/sys/conf/kern.mk
++++ b/sys/conf/kern.mk
+@@ -127,3 +127,11 @@
+ ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
+ CFLAGS+= -fstack-protector
+ .endif
++
++#
++# GCC 4.4 onwards automatically enables -fgcse with -O2, which is not
++# currently supported. Avoid.
++#
++.if ${CC} != "icc"
++CFLAGS+= -fno-gcse
++.endif
Modified: trunk/kfreebsd-8/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/007_clone_signals.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/007_clone_signals.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -5,7 +5,7 @@
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
-@@ -564,7 +564,13 @@ again:
+@@ -564,7 +564,13 @@
p2->p_sigacts = newsigacts;
}
if (flags & RFLINUXTHPN)
Modified: trunk/kfreebsd-8/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/008_config.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/008_config.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -22,7 +22,7 @@
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
-@@ -41,12 +41,17 @@ static const char rcsid[] =
+@@ -41,6 +41,7 @@
"$FreeBSD$";
#endif /* not lint */
@@ -30,18 +30,18 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/sbuf.h>
- #include <sys/file.h>
+@@ -48,6 +49,10 @@
#include <sys/mman.h>
--#include <sys/param.h>
-+#include <sys/param.h>
-+
+ #include <sys/param.h>
+
+#ifndef __FreeBSD__
+#include <bsd/string.h> /* strlcpy, strlcat */
+#endif
-
++
#include <assert.h>
#include <ctype.h>
-@@ -618,7 +623,11 @@ cleanheaders(char *p)
+ #include <err.h>
+@@ -622,7 +627,11 @@
if ((dirp = opendir(p)) == NULL)
err(EX_OSERR, "opendir %s", p);
while ((dp = readdir(dirp)) != NULL) {
@@ -55,7 +55,7 @@
continue;
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
-@@ -9,11 +9,11 @@ SRCS= config.y main.c lang.l mkmakefile.
+@@ -9,11 +9,11 @@
kernconf.c: kernconf.tmpl
file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
Modified: trunk/kfreebsd-8/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/013_ip_packed.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/013_ip_packed.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
-@@ -67,7 +67,7 @@ struct ip {
+@@ -67,7 +67,7 @@
u_char ip_p; /* protocol */
u_short ip_sum; /* checksum */
struct in_addr ip_src,ip_dst; /* source and dest address */
Modified: trunk/kfreebsd-8/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/020_linker.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/020_linker.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -11,7 +11,7 @@
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
-@@ -85,7 +85,9 @@ gdbinit:
+@@ -85,7 +85,9 @@
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@rm -f ${.TARGET}
@echo linking ${.TARGET}
@@ -24,7 +24,7 @@
.endif
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -180,7 +180,9 @@ ${PROG}.symbols: ${FULLPROG}
+@@ -180,7 +180,9 @@
.if ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != mips
${FULLPROG}: ${KMOD}.kld
Modified: trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
-@@ -219,7 +219,7 @@ static int pat_works = 1;
+@@ -219,7 +219,7 @@
SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works, CTLFLAG_RD, &pat_works, 1,
"Is page attribute table fully functional?");
Modified: trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
-@@ -1405,6 +1405,8 @@ pipe_stat(fp, ub, active_cred, td)
+@@ -1405,6 +1405,8 @@
struct thread *td;
{
struct pipe *pipe = fp->f_data;
@@ -13,7 +13,7 @@
#ifdef MAC
int error;
-@@ -1431,6 +1433,8 @@ pipe_stat(fp, ub, active_cred, td)
+@@ -1431,6 +1433,8 @@
* Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
* XXX (st_dev, st_ino) should be unique.
*/
Modified: trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -7,7 +7,7 @@
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
-@@ -2315,9 +2315,7 @@ int
+@@ -2315,9 +2315,7 @@
acpi_ReqSleepState(struct acpi_softc *sc, int state)
{
#if defined(__amd64__) || defined(__i386__)
@@ -17,7 +17,7 @@
ACPI_STATUS status;
if (state < ACPI_STATE_S1 || state > ACPI_S_STATES_MAX)
-@@ -2342,7 +2340,6 @@ acpi_ReqSleepState(struct acpi_softc *sc
+@@ -2342,7 +2340,6 @@
/* Record the pending state and notify all apm devices. */
sc->acpi_next_sstate = state;
@@ -25,7 +25,7 @@
STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) {
clone->notify_status = APM_EV_NONE;
if ((clone->flags & ACPI_EVF_DEVD) == 0) {
-@@ -2350,7 +2347,6 @@ acpi_ReqSleepState(struct acpi_softc *sc
+@@ -2350,7 +2347,6 @@
KNOTE_LOCKED(&clone->sel_read.si_note, 0);
}
}
@@ -33,7 +33,7 @@
/* If devd(8) is not running, immediately enter the sleep state. */
if (!devctl_process_running()) {
-@@ -2418,7 +2414,6 @@ acpi_AckSleepState(struct apm_clone_data
+@@ -2418,7 +2414,6 @@
* are writable since read-only devices couldn't ack the request.
*/
sleeping = TRUE;
@@ -41,7 +41,7 @@
clone->notify_status = APM_EV_ACKED;
STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) {
if ((clone->flags & ACPI_EVF_WRITE) != 0 &&
-@@ -2427,7 +2422,6 @@ acpi_AckSleepState(struct apm_clone_data
+@@ -2427,7 +2422,6 @@
break;
}
}
@@ -51,7 +51,7 @@
if (sleeping)
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
-@@ -230,12 +230,12 @@ typedef struct apm_pwstatus {
+@@ -230,12 +230,12 @@
} *apm_pwstatus_t;
struct apm_bios_arg {
@@ -72,7 +72,7 @@
struct apm_event_info {
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
-@@ -44,6 +44,24 @@ __FBSDID("$FreeBSD$");
+@@ -44,6 +44,24 @@
#include <machine/nexusvar.h>
@@ -97,7 +97,7 @@
SYSCTL_DECL(_debug_acpi);
int acpi_resume_beep;
-@@ -55,7 +73,432 @@ int acpi_reset_video;
+@@ -55,7 +73,432 @@
TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
static int intr_model = ACPI_INTR_PIC;
@@ -531,7 +531,7 @@
int
acpi_machdep_init(device_t dev)
-@@ -64,14 +507,12 @@ acpi_machdep_init(device_t dev)
+@@ -64,14 +507,12 @@
sc = devclass_get_softc(devclass_find("acpi"), 0);
Modified: trunk/kfreebsd-8/debian/patches/106_teken_op.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/106_teken_op.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/106_teken_op.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -5,7 +5,7 @@
--- a/sys/dev/syscons/teken/teken_subr_compat.h
+++ b/sys/dev/syscons/teken/teken_subr_compat.h
-@@ -75,6 +75,20 @@ teken_subr_cons25_set_bell_pitch_duratio
+@@ -75,6 +75,20 @@
(duration & 0xffff));
}
@@ -28,7 +28,7 @@
teken_subr_vt52_decid(teken_t *t)
--- a/sys/dev/syscons/teken/sequences
+++ b/sys/dev/syscons/teken/sequences
-@@ -104,6 +104,7 @@ C25ADBG Cons25 set adapter background ^
+@@ -104,6 +104,7 @@
C25ADFG Cons25 set adapter foreground ^[ [ = F r
C25BLPD Cons25 set bell pitch duration ^[ [ = B r r
C25CURS Cons25 set cursor type ^[ [ = S r
Modified: trunk/kfreebsd-8/debian/patches/107_mount_update.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/107_mount_update.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/107_mount_update.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
-@@ -559,10 +559,10 @@ vfs_donmount(struct thread *td, int fsfl
+@@ -559,10 +559,10 @@
struct vfsopt *opt, *noro_opt, *tmp_opt;
char *fstype, *fspath, *errmsg;
int error, fstypelen, fspathlen, errmsg_len, errmsg_pos;
@@ -17,7 +17,7 @@
errmsg_pos = -1;
error = vfs_buildopts(fsoptions, &optlist);
-@@ -659,10 +659,8 @@ vfs_donmount(struct thread *td, int fsfl
+@@ -659,10 +659,8 @@
fsflags &= ~MNT_RDONLY;
has_noro = 1;
}
@@ -29,7 +29,7 @@
else if (strcmp(opt->name, "ro") == 0)
fsflags |= MNT_RDONLY;
else if (strcmp(opt->name, "rdonly") == 0) {
-@@ -684,7 +682,7 @@ vfs_donmount(struct thread *td, int fsfl
+@@ -684,7 +682,7 @@
* we need a mount option "noro", since in vfs_mergeopts(),
* "noro" will cancel "ro", but "rw" will not do anything.
*/
Modified: trunk/kfreebsd-8/debian/patches/108_teken_utf8_table.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/108_teken_utf8_table.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/108_teken_utf8_table.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/dev/syscons/scterm-teken.c
+++ b/sys/dev/syscons/scterm-teken.c
-@@ -356,10 +356,18 @@ static const struct unicp437 cp437table[
+@@ -356,10 +356,18 @@
{ 0x00b6, 0x14, 0x00 }, { 0x00b7, 0xfa, 0x00 },
{ 0x00ba, 0xa7, 0x00 }, { 0x00bb, 0xaf, 0x00 },
{ 0x00bc, 0xac, 0x00 }, { 0x00bd, 0xab, 0x00 },
@@ -27,7 +27,7 @@
{ 0x00df, 0xe1, 0x00 }, { 0x00e0, 0x85, 0x00 },
{ 0x00e1, 0xa0, 0x00 }, { 0x00e2, 0x83, 0x00 },
{ 0x00e4, 0x84, 0x00 }, { 0x00e5, 0x86, 0x00 },
-@@ -374,6 +382,7 @@ static const struct unicp437 cp437table[
+@@ -374,6 +382,7 @@
{ 0x00f8, 0xed, 0x00 }, { 0x00f9, 0x97, 0x00 },
{ 0x00fa, 0xa3, 0x00 }, { 0x00fb, 0x96, 0x00 },
{ 0x00fc, 0x81, 0x00 }, { 0x00ff, 0x98, 0x00 },
@@ -35,7 +35,7 @@
{ 0x0192, 0x9f, 0x00 }, { 0x0393, 0xe2, 0x00 },
{ 0x0398, 0xe9, 0x00 }, { 0x03a3, 0xe4, 0x00 },
{ 0x03a6, 0xe8, 0x00 }, { 0x03a9, 0xea, 0x00 },
-@@ -422,7 +431,8 @@ static const struct unicp437 cp437table[
+@@ -422,7 +431,8 @@
{ 0x2584, 0xdc, 0x00 }, { 0x2588, 0xdb, 0x00 },
{ 0x258c, 0xdd, 0x00 }, { 0x2590, 0xde, 0x00 },
{ 0x2591, 0xb0, 0x02 }, { 0x25a0, 0xfe, 0x00 },
Modified: trunk/kfreebsd-8/debian/patches/109_linprocfs_non_x86.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/109_linprocfs_non_x86.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/109_linprocfs_non_x86.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
-@@ -56,6 +56,9 @@ TARGET_EMULATOR opt_ddb.h
+@@ -56,6 +56,9 @@
TICK_USE_YAMON_FREQ opt_global.h
TICK_USE_MALTA_RTC opt_global.h
Modified: trunk/kfreebsd-8/debian/patches/110_disable_trampoline_flavour.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/110_disable_trampoline_flavour.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/110_disable_trampoline_flavour.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
-@@ -71,7 +71,7 @@ HACK_EXTRA_FLAGS+=${EXTRA_FLAGS} $(ARCH_
+@@ -71,7 +71,7 @@
# XXX hardcoded kernel entry point
ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
Modified: trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -5,7 +5,7 @@
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -1049,6 +1049,15 @@
+@@ -1077,6 +1077,15 @@
PROC_UNLOCK(p);
return (ret);
}
@@ -21,7 +21,7 @@
if (p->p_args != NULL) {
sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length);
PROC_UNLOCK(p);
-@@ -1073,6 +1082,15 @@
+@@ -1101,6 +1110,15 @@
PROC_UNLOCK(p);
return (ret);
}
Modified: trunk/kfreebsd-8/debian/patches/200_xen.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/200_xen.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/200_xen.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -5,7 +5,7 @@
--- a/sys/dev/xen/evtchn/evtchn_dev.c
+++ b/sys/dev/xen/evtchn/evtchn_dev.c
-@@ -41,7 +41,7 @@ typedef struct evtchn_sotfc {
+@@ -41,7 +41,7 @@
} evtchn_softc_t;
@@ -16,7 +16,7 @@
#endif
--- a/sys/xen/evtchn/evtchn_dev.c
+++ b/sys/xen/evtchn/evtchn_dev.c
-@@ -39,7 +39,7 @@ typedef struct evtchn_sotfc {
+@@ -39,7 +39,7 @@
} evtchn_softc_t;
Modified: trunk/kfreebsd-8/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/902_version.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/902_version.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -136,7 +136,7 @@ esac
+@@ -136,7 +136,7 @@
cat << EOF > vers.c
$COPYRIGHT
#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
Modified: trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -8,7 +8,7 @@
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
-@@ -46,27 +46,6 @@ ukbdmap.h optional ukbd_dflt_keymap \
+@@ -46,27 +46,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -36,7 +36,7 @@
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
compat/linux/linux_emul.c optional compat_linux
-@@ -172,14 +151,6 @@ dev/fdc/fdc_pccard.c optional fdc pccar
+@@ -172,14 +151,6 @@
dev/fe/if_fe_isa.c optional fe isa
dev/glxsb/glxsb.c optional glxsb
dev/glxsb/glxsb_hash.c optional glxsb
@@ -51,7 +51,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -213,7 +184,6 @@ dev/mem/memutil.c optional mem
+@@ -213,7 +184,6 @@
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
@@ -61,7 +61,7 @@
dev/random/nehemiah.c optional random
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -146,8 +146,6 @@ device arcmsr # Areca SATA II RAID
+@@ -146,8 +146,6 @@
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -72,7 +72,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -103,8 +103,6 @@ SUBDIR= ${_3dfx} \
+@@ -103,8 +103,6 @@
hifn \
hme \
${_hptiop} \
@@ -81,7 +81,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -216,7 +214,6 @@ SUBDIR= ${_3dfx} \
+@@ -216,7 +214,6 @@
ntfs \
ntfs_iconv \
nullfs \
@@ -89,7 +89,7 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-@@ -469,8 +466,6 @@ _ctau= ctau
+@@ -469,8 +466,6 @@
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -98,7 +98,7 @@
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -486,7 +481,6 @@ _ixgb= ixgb
+@@ -486,7 +481,6 @@
_ixgbe= ixgbe
_mly= mly
_nfe= nfe
@@ -106,7 +106,7 @@
_nvram= nvram
_nxge= nxge
_tpm= tpm
-@@ -540,8 +534,6 @@ _em= em
+@@ -540,8 +534,6 @@
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -115,7 +115,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -566,7 +558,6 @@ _linux= linux
+@@ -566,7 +558,6 @@
_mly= mly
_ndis= ndis
_nfe= nfe
@@ -125,7 +125,7 @@
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -139,8 +139,6 @@ device arcmsr # Areca SATA II RAID
+@@ -139,8 +139,6 @@
#device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -136,7 +136,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
-@@ -47,26 +47,6 @@ ukbdmap.h optional ukbd_dflt_keymap \
+@@ -47,26 +47,6 @@
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -163,7 +163,7 @@
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
amd64/acpica/acpi_switch.S optional acpi
-@@ -194,14 +174,6 @@ dev/fdc/fdc.c optional fdc
+@@ -194,14 +174,6 @@
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -178,7 +178,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -214,7 +186,6 @@ dev/lindev/full.c optional lindev
+@@ -214,7 +186,6 @@
dev/lindev/lindev.c optional lindev
dev/mem/memutil.c optional mem
dev/nfe/if_nfe.c optional nfe pci
Modified: trunk/kfreebsd-8/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/904_dev_full.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/904_dev_full.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -8,7 +8,7 @@
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
-@@ -43,9 +43,11 @@ __FBSDID("$FreeBSD$");
+@@ -43,9 +43,11 @@
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -20,7 +20,7 @@
static d_ioctl_t null_ioctl;
static d_read_t zero_read;
-@@ -57,6 +59,14 @@ static struct cdevsw null_cdevsw = {
+@@ -57,6 +59,14 @@
.d_name = "null",
};
@@ -35,7 +35,7 @@
static struct cdevsw zero_cdevsw = {
.d_version = D_VERSION,
.d_read = zero_read,
-@@ -78,11 +88,25 @@ null_write(struct cdev *dev __unused, st
+@@ -78,11 +88,25 @@
/* ARGSUSED */
static int
@@ -61,7 +61,7 @@
if (cmd != DIOCSKERNELDUMP)
return (ENOIOCTL);
error = priv_check(td, PRIV_SETDUMPER);
-@@ -114,12 +138,15 @@ null_modevent(module_t mod __unused, int
+@@ -114,12 +138,15 @@
zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &null_cdevsw, 0,
NULL, UID_ROOT, GID_WHEEL, 0666, "null");
Modified: trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -28,7 +28,7 @@
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -63,8 +63,14 @@ options SCSI_DELAY=5000 # Delay (in ms
+@@ -63,8 +63,14 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
@@ -45,7 +45,7 @@
options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -64,8 +64,14 @@ options SCSI_DELAY=5000 # Delay (in ms
+@@ -64,8 +64,14 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
Modified: trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/907_cpu_class.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/907_cpu_class.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -8,7 +8,7 @@
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
-@@ -634,6 +634,7 @@ printcpuinfo(void)
+@@ -634,6 +634,7 @@
#if defined(I486_CPU)
case CPUCLASS_486:
printf("486");
@@ -16,7 +16,7 @@
break;
#endif
#if defined(I586_CPU)
-@@ -643,6 +644,7 @@ printcpuinfo(void)
+@@ -643,6 +644,7 @@
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("586");
@@ -24,7 +24,7 @@
break;
#endif
#if defined(I686_CPU)
-@@ -652,6 +654,7 @@ printcpuinfo(void)
+@@ -652,6 +654,7 @@
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("686");
@@ -34,7 +34,7 @@
default:
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
-@@ -85,7 +85,7 @@ static int
+@@ -85,7 +85,7 @@
sysctl_hw_machine(SYSCTL_HANDLER_ARGS)
{
#ifdef SCTL_MASK32
Modified: trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -358,10 +358,6 @@ linprocfs_domtab(PFS_FILL_ARGS)
+@@ -358,10 +358,6 @@
/* determine fs type */
fstype = mp->mnt_stat.f_fstypename;
Modified: trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -5,7 +5,7 @@
--- a/sys/i386/conf/GENERIC.hints
+++ b/sys/i386/conf/GENERIC.hints
-@@ -18,6 +18,7 @@ hint.atkbdc.0.port="0x060"
+@@ -18,6 +18,7 @@
hint.atkbd.0.at="atkbdc"
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
@@ -15,7 +15,7 @@
hint.sc.0.flags="0x100"
--- a/sys/amd64/conf/GENERIC.hints
+++ b/sys/amd64/conf/GENERIC.hints
-@@ -12,6 +12,7 @@ hint.atkbdc.0.port="0x060"
+@@ -12,6 +12,7 @@
hint.atkbd.0.at="atkbdc"
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
Modified: trunk/kfreebsd-8/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/913_uudecode.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/913_uudecode.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -14,7 +14,7 @@
--- a/sys/modules/ralfw/Makefile.inc
+++ b/sys/modules/ralfw/Makefile.inc
-@@ -12,4 +12,4 @@ CLEANFILES+= ${_FIRM}
+@@ -12,4 +12,4 @@
FIRMWS= ${_FIRM}:${KMOD}
${_FIRM}: ${.CURDIR}/../../../contrib/dev/ral/${_FIRM}.uu
@@ -22,7 +22,7 @@
+ uudecode -o- $? > ${.TARGET}
--- a/sys/modules/mwlfw/Makefile
+++ b/sys/modules/mwlfw/Makefile
-@@ -6,9 +6,9 @@ FIRMWS= mw88W8363.fw:mw88W8363fw mwlboot
+@@ -6,9 +6,9 @@
CLEANFILES+= mw88W8363.fw mwlboot.fw
mw88W8363.fw: ${.CURDIR}/../../contrib/dev/mwl/mw88W8363.fw.uu
@@ -36,7 +36,7 @@
.include <bsd.kmod.mk>
--- a/sys/modules/ipwfw/ipw_bss/Makefile
+++ b/sys/modules/ipwfw/ipw_bss/Makefile
-@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_ipw
+@@ -9,7 +9,7 @@
CLEANFILES= ipw_bss
ipw_bss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu
@@ -47,7 +47,7 @@
--- a/sys/modules/ipwfw/ipw_ibss/Makefile
+++ b/sys/modules/ipwfw/ipw_ibss/Makefile
-@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_ipw
+@@ -9,7 +9,7 @@
CLEANFILES= ipw_ibss
ipw_ibss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu
@@ -58,7 +58,7 @@
--- a/sys/modules/ipwfw/ipw_monitor/Makefile
+++ b/sys/modules/ipwfw/ipw_monitor/Makefile
-@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_ipw
+@@ -9,7 +9,7 @@
CLEANFILES= ipw_monitor
ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu
@@ -69,7 +69,7 @@
--- a/sys/modules/iwifw/iwi_bss/Makefile
+++ b/sys/modules/iwifw/iwi_bss/Makefile
-@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_iwi
+@@ -9,7 +9,7 @@
CLEANFILES= iwi_bss
iwi_bss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu
@@ -80,7 +80,7 @@
--- a/sys/modules/iwifw/iwi_ibss/Makefile
+++ b/sys/modules/iwifw/iwi_ibss/Makefile
-@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_iwi
+@@ -9,7 +9,7 @@
CLEANFILES= iwi_fw
iwi_ibss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu
@@ -91,7 +91,7 @@
--- a/sys/modules/iwifw/iwi_monitor/Makefile
+++ b/sys/modules/iwifw/iwi_monitor/Makefile
-@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_iwi
+@@ -9,7 +9,7 @@
CLEANFILES= iwi_monitor
iwi_monitor: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu
@@ -102,7 +102,7 @@
--- a/sys/modules/wpifw/Makefile
+++ b/sys/modules/wpifw/Makefile
-@@ -8,6 +8,6 @@ FIRMWS= iwlwifi-3945-2.14.4.fw:wpifw:214
+@@ -8,6 +8,6 @@
CLEANFILES= iwlwifi-3945-2.14.4.fw
iwlwifi-3945-2.14.4.fw: ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu
@@ -112,7 +112,7 @@
.include <bsd.kmod.mk>
--- a/sys/modules/iwnfw/Makefile.inc
+++ b/sys/modules/iwnfw/Makefile.inc
-@@ -10,4 +10,4 @@ CLEANFILES+= ${_FIRM}
+@@ -10,4 +10,4 @@
FIRMWS= ${_FIRM}:${KMOD}
${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwn/${_FIRM}.uu
@@ -120,7 +120,7 @@
+ uudecode -o- $? > ${.TARGET}
--- a/sys/modules/runfw/Makefile
+++ b/sys/modules/runfw/Makefile
-@@ -6,6 +6,6 @@ FIRMWS= runfw:runfw:1
+@@ -6,6 +6,6 @@
CLEANFILES= runfw
runfw: ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu
Modified: trunk/kfreebsd-8/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/914_psm.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/914_psm.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -11,7 +11,7 @@
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
-@@ -70,10 +70,7 @@ __FBSDID("$FreeBSD$");
+@@ -70,10 +70,7 @@
#include <sys/module.h>
#include <sys/bus.h>
#include <sys/conf.h>
@@ -22,7 +22,7 @@
#include <sys/syslog.h>
#include <machine/bus.h>
#include <sys/rman.h>
-@@ -302,7 +299,6 @@ struct psm_softc { /* Driver status inf
+@@ -302,7 +299,6 @@
struct cdev *bdev;
int lasterr;
int cmdcount;
@@ -30,7 +30,7 @@
};
static devclass_t psm_devclass;
#define PSM_SOFTC(unit) \
-@@ -1494,7 +1490,6 @@ psmopen(struct cdev *dev, int flag, int
+@@ -1494,7 +1490,6 @@
sc->mode.level = sc->dflt_mode.level;
sc->mode.protocol = sc->dflt_mode.protocol;
sc->watchdog = FALSE;
@@ -38,7 +38,7 @@
/* flush the event queue */
sc->queue.count = 0;
-@@ -1634,12 +1629,6 @@ psmclose(struct cdev *dev, int flag, int
+@@ -1634,12 +1629,6 @@
/* remove anything left in the output buffer */
empty_aux_buffer(sc->kbdc, 10);
@@ -51,7 +51,7 @@
/* close is almost always successful */
sc->state &= ~PSM_OPEN;
kbdc_lock(sc->kbdc, FALSE);
-@@ -2201,15 +2190,6 @@ psmioctl(struct cdev *dev, u_long cmd, c
+@@ -2201,15 +2190,6 @@
break;
#endif /* MOUSE_GETHWID */
@@ -67,7 +67,7 @@
default:
return (ENOTTY);
}
-@@ -3474,9 +3454,6 @@ next:
+@@ -3474,9 +3454,6 @@
wakeup(sc);
}
selwakeuppri(&sc->rsel, PZERO);
Modified: trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
-@@ -393,7 +393,7 @@ VNET_DEFINE(int, ip6_forwarding) = IPV6F
+@@ -393,7 +393,7 @@
VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
@@ -13,7 +13,7 @@
VNET_DEFINE(int, ip6_maxfragpackets); /* initialized in frag6.c:frag6_init() */
VNET_DEFINE(int, ip6_maxfrags); /* initialized in frag6.c:frag6_init() */
VNET_DEFINE(int, ip6_log_interval) = 5;
-@@ -406,7 +406,7 @@ VNET_DEFINE(int, ip6_use_deprecated) = 1
+@@ -406,7 +406,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? */
Modified: trunk/kfreebsd-8/debian/patches/917_track_alignment.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/917_track_alignment.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/917_track_alignment.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -4,7 +4,7 @@
--- a/sys/geom/part/g_part_mbr.c
+++ b/sys/geom/part/g_part_mbr.c
-@@ -449,13 +449,6 @@ g_part_mbr_read(struct g_part_table *bas
+@@ -449,13 +449,6 @@
basetable->gpt_heads = heads;
}
}
Modified: trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -13,7 +13,7 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -123,6 +123,8 @@ CFLAGS+= -restrict
+@@ -123,6 +123,8 @@
#
# GCC SSP support.
#
@@ -24,7 +24,7 @@
CFLAGS+= -fstack-protector
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -132,6 +132,9 @@ CFLAGS+= -mlongcall -fno-omit-frame-poin
+@@ -132,6 +132,9 @@
CFLAGS+= -G0 -fno-pic -mno-abicalls -mlong-calls
.endif
Modified: trunk/kfreebsd-8/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_firmware.diff 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/999_firmware.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -12,7 +12,7 @@
--- a/sys/conf/files
+++ b/sys/conf/files
-@@ -462,10 +462,6 @@ dev/advansys/adv_pci.c optional adv pci
+@@ -462,10 +462,6 @@
dev/advansys/advansys.c optional adv
dev/advansys/advlib.c optional adv
dev/advansys/advmcode.c optional adv
@@ -23,7 +23,7 @@
dev/ae/if_ae.c optional ae pci
dev/age/if_age.c optional age pci inet
dev/agp/agp.c optional agp pci
-@@ -758,7 +754,6 @@ dev/ath/ath_rate/onoe/onoe.c optional at
+@@ -758,7 +754,6 @@
dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
compile-with "${NORMAL_C} -I$S/dev/ath"
#
@@ -31,7 +31,7 @@
dev/bfe/if_bfe.c optional bfe
dev/bge/if_bge.c optional bge
dev/bktr/bktr_audio.c optional bktr pci
-@@ -794,34 +789,6 @@ dev/cpufreq/ichss.c optional cpufreq
+@@ -794,34 +789,6 @@
dev/cs/if_cs.c optional cs
dev/cs/if_cs_isa.c optional cs isa
dev/cs/if_cs_pccard.c optional cs pccard
@@ -66,7 +66,7 @@
dev/cy/cy.c optional cy
dev/cy/cy_isa.c optional cy isa
dev/cy/cy_pci.c optional cy pci
-@@ -832,13 +799,6 @@ dev/dcons/dcons.c optional dcons
+@@ -832,13 +799,6 @@
dev/dcons/dcons_crom.c optional dcons_crom
dev/dcons/dcons_os.c optional dcons
dev/de/if_de.c optional de pci
@@ -80,7 +80,7 @@
dev/digi/digi.c optional digi
dev/digi/digi_isa.c optional digi isa
dev/digi/digi_pci.c optional digi pci
-@@ -871,26 +831,6 @@ dev/drm/mach64_dma.c optional mach64drm
+@@ -871,26 +831,6 @@
dev/drm/mach64_drv.c optional mach64drm
dev/drm/mach64_irq.c optional mach64drm
dev/drm/mach64_state.c optional mach64drm
@@ -107,7 +107,7 @@
dev/drm/savage_bci.c optional savagedrm
dev/drm/savage_drv.c optional savagedrm
dev/drm/savage_state.c optional savagedrm
-@@ -972,7 +912,6 @@ dev/firewire/if_fwip.c optional fwip
+@@ -972,7 +912,6 @@
dev/firewire/sbp.c optional sbp
dev/firewire/sbp_targ.c optional sbp_targ
dev/flash/at45d.c optional at45d
@@ -115,7 +115,7 @@
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
dev/gem/if_gem_sbus.c optional gem sbus
-@@ -1022,48 +961,6 @@ dev/ips/ips_disk.c optional ips
+@@ -1022,48 +961,6 @@
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
@@ -164,7 +164,7 @@
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
-@@ -1076,135 +973,7 @@ dev/isp/isp_library.c optional isp
+@@ -1076,135 +973,7 @@
dev/isp/isp_pci.c optional isp pci
dev/isp/isp_sbus.c optional isp sbus
dev/isp/isp_target.c optional isp
@@ -300,7 +300,7 @@
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
-@@ -1315,30 +1084,6 @@ dev/mvs/mvs_pci.c optional mvs pci
+@@ -1315,30 +1084,6 @@
dev/mwl/if_mwl.c optional mwl
dev/mwl/if_mwl_pci.c optional mwl pci
dev/mwl/mwlhal.c optional mwl
@@ -331,7 +331,7 @@
dev/mxge/if_mxge.c optional mxge pci
dev/mxge/mxge_lro.c optional mxge pci
dev/mxge/mxge_eth_z8e.c optional mxge pci
-@@ -1429,62 +1174,6 @@ dev/quicc/quicc_core.c optional quicc
+@@ -1429,62 +1174,6 @@
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
dev/ral/if_ral_pci.c optional ral pci
@@ -394,7 +394,7 @@
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
-@@ -1509,14 +1198,7 @@ dev/scc/scc_dev_z8530.c optional scc
+@@ -1509,14 +1198,7 @@
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
dev/sdhci/sdhci.c optional sdhci pci
@@ -409,7 +409,7 @@
dev/siba/siba_bwn.c optional siba_bwn pci
dev/siba/siba_core.c optional siba_bwn pci
dev/siis/siis.c optional siis pci
-@@ -1527,9 +1209,6 @@ dev/smbus/smbconf.c optional smbus
+@@ -1527,9 +1209,6 @@
dev/smbus/smbus.c optional smbus
dev/smbus/smbus_if.m optional smbus
dev/smc/if_smc.c optional smc
@@ -419,7 +419,7 @@
dev/snp/snp.c optional snp
dev/sound/clone.c optional sound
dev/sound/unit.c optional sound
-@@ -1545,10 +1224,6 @@ dev/sound/pci/als4000.c optional snd_al
+@@ -1545,10 +1224,6 @@
dev/sound/pci/atiixp.c optional snd_atiixp pci
dev/sound/pci/cmi.c optional snd_cmi pci
dev/sound/pci/cs4281.c optional snd_cs4281 pci
@@ -430,7 +430,7 @@
dev/sound/pci/emu10k1.c optional snd_emu10k1 pci \
dependency "emu10k1-alsa%diked.h" \
warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1571,8 +1246,6 @@ dev/sound/pci/es137x.c optional snd_es1
+@@ -1571,8 +1246,6 @@
dev/sound/pci/fm801.c optional snd_fm801 pci
dev/sound/pci/ich.c optional snd_ich pci
dev/sound/pci/maestro.c optional snd_maestro pci
@@ -439,7 +439,7 @@
dev/sound/pci/neomagic.c optional snd_neomagic pci
dev/sound/pci/solo.c optional snd_solo pci
dev/sound/pci/spicds.c optional snd_spicds pci
-@@ -1652,7 +1325,6 @@ dev/syscons/sysmouse.c optional sc
+@@ -1652,7 +1325,6 @@
dev/syscons/warp/warp_saver.c optional warp_saver
dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux
dev/tdfx/tdfx_pci.c optional tdfx pci
@@ -447,7 +447,7 @@
dev/tl/if_tl.c optional tl pci
dev/trm/trm.c optional trm
dev/twa/tw_cl_init.c optional twa \
-@@ -1670,7 +1342,6 @@ dev/twa/tw_osl_freebsd.c optional twa \
+@@ -1670,7 +1342,6 @@
dev/twe/twe.c optional twe
dev/twe/twe_freebsd.c optional twe
dev/tx/if_tx.c optional tx
@@ -455,7 +455,7 @@
dev/uart/uart_bus_acpi.c optional uart acpi
#dev/uart/uart_bus_cbus.c optional uart cbus
dev/uart/uart_bus_ebus.c optional uart ebus
-@@ -1748,7 +1419,6 @@ dev/usb/net/if_axe.c optional axe
+@@ -1748,7 +1419,6 @@
dev/usb/net/if_cdce.c optional cdce
dev/usb/net/if_cue.c optional cue
dev/usb/net/if_ipheth.c optional ipheth
@@ -463,7 +463,7 @@
dev/usb/net/if_rue.c optional rue
dev/usb/net/if_udav.c optional udav
dev/usb/net/usb_ethernet.c optional aue | axe | cdce | cue | kue | rue | \
-@@ -1757,13 +1427,10 @@ dev/usb/net/uhso.c optional uhso
+@@ -1757,13 +1427,10 @@
#
# USB WLAN drivers
#
@@ -479,7 +479,7 @@
#
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
-@@ -120,17 +120,9 @@ dev/atkbdc/atkbdc.c optional atkbdc
+@@ -120,17 +120,9 @@
dev/atkbdc/atkbdc_isa.c optional atkbdc isa
dev/atkbdc/atkbdc_subr.c optional atkbdc
dev/atkbdc/psm.c optional psm atkbdc
@@ -499,7 +499,7 @@
dev/cx/if_cx.c optional cx
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
-@@ -4,9 +4,6 @@ SUBDIR = \
+@@ -4,9 +4,6 @@
drm \
i915 \
mach64 \
@@ -511,7 +511,7 @@
tdfx
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -36,7 +36,6 @@ SUBDIR= ${_3dfx} \
+@@ -36,7 +36,6 @@
ata \
ath \
${_auxio} \
@@ -519,7 +519,7 @@
bfe \
bge \
${_bios} \
-@@ -53,7 +52,6 @@ SUBDIR= ${_3dfx} \
+@@ -53,7 +52,6 @@
${_cbb} \
cd9660 \
cd9660_iconv \
@@ -527,7 +527,7 @@
${_ciss} \
${_cm} \
${_cmx} \
-@@ -61,14 +59,11 @@ SUBDIR= ${_3dfx} \
+@@ -61,14 +59,11 @@
coda5 \
${_coff} \
${_coretemp} \
@@ -542,7 +542,7 @@
${_cyclic} \
dc \
dcons \
-@@ -89,13 +84,11 @@ SUBDIR= ${_3dfx} \
+@@ -89,13 +84,11 @@
${_ex} \
${_exca} \
${_ext2fs} \
@@ -556,7 +556,7 @@
gem \
geom \
${_glxsb} \
-@@ -135,14 +128,10 @@ SUBDIR= ${_3dfx} \
+@@ -135,14 +128,10 @@
ip_mroute_mod \
${_ips} \
${_ipw} \
@@ -571,7 +571,7 @@
${_ixgb} \
${_ixgbe} \
jme \
-@@ -191,7 +180,6 @@ SUBDIR= ${_3dfx} \
+@@ -191,7 +180,6 @@
msk \
mvs \
mwl \
@@ -579,7 +579,7 @@
mxge \
my \
${_ncp} \
-@@ -237,14 +225,12 @@ SUBDIR= ${_3dfx} \
+@@ -237,14 +225,12 @@
${_pst} \
puc \
ral \
@@ -594,7 +594,7 @@
${_s3} \
${_safe} \
${_sbni} \
-@@ -253,7 +239,6 @@ SUBDIR= ${_3dfx} \
+@@ -253,7 +239,6 @@
${_scsi_low} \
sdhci \
sem \
@@ -602,7 +602,7 @@
sge \
${_siba_bwn} \
siftr \
-@@ -261,7 +246,6 @@ SUBDIR= ${_3dfx} \
+@@ -261,7 +246,6 @@
sis \
sk \
${_smbfs} \
@@ -610,7 +610,7 @@
${_snc} \
snp \
${_sound} \
-@@ -276,7 +260,6 @@ SUBDIR= ${_3dfx} \
+@@ -276,7 +260,6 @@
${_sym} \
${_syscons} \
sysvipc \
@@ -618,7 +618,7 @@
tl \
${_tmpfs} \
${_tpm} \
-@@ -284,7 +267,6 @@ SUBDIR= ${_3dfx} \
+@@ -284,7 +267,6 @@
${_twa} \
twe \
tx \
@@ -626,7 +626,7 @@
${_uart} \
ubsec \
udf \
-@@ -310,7 +292,6 @@ SUBDIR= ${_3dfx} \
+@@ -310,7 +292,6 @@
wlan_wep \
wlan_xauth \
${_wpi} \
@@ -634,7 +634,7 @@
${_x86bios} \
${_xe} \
xfs \
-@@ -378,9 +359,7 @@ _arcnet= arcnet
+@@ -378,9 +359,7 @@
_bktr= bktr
_cardbus= cardbus
_cbb= cbb
@@ -644,7 +644,7 @@
_cpuctl= cpuctl
_cpufreq= cpufreq
_cs= cs
-@@ -472,11 +451,8 @@ _iir= iir
+@@ -472,11 +451,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -656,7 +656,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_mly= mly
-@@ -485,7 +461,6 @@ _nvram= nvram
+@@ -485,7 +461,6 @@
_nxge= nxge
_tpm= tpm
_wpi= wpi
@@ -664,7 +664,7 @@
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_padlock= padlock
.endif
-@@ -544,11 +519,8 @@ _io= io
+@@ -544,11 +519,8 @@
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -676,7 +676,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_lindev= lindev
-@@ -583,7 +555,6 @@ _vesa= vesa
+@@ -583,7 +555,6 @@
_x86bios= x86bios
_wi= wi
_wpi= wpi
Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-8/debian/patches/series 2011-10-07 23:07:41 UTC (rev 3726)
@@ -8,6 +8,7 @@
002_maxpathlen.diff
003_glibc_dev_aicasm.diff
004_xargs.diff
+005_gcc46.diff
007_clone_signals.diff
008_config.diff
#009_disable_duped_modules.diff
Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-9/debian/changelog 2011-10-07 23:07:41 UTC (rev 3726)
@@ -1,3 +1,10 @@
+kfreebsd-9 (9.0~svn225873-2) experimental; urgency=low
+
+ * 008_gcc46.diff: Add -fno-gcse to CFLAGS to fix GCC 4.6 builds.
+ (Closes: #644417)
+
+ -- Robert Millan <rmh at debian.org> Sat, 08 Oct 2011 01:05:51 +0200
+
kfreebsd-9 (9.0~svn225873-1) experimental; urgency=low
* New upstream snapshot.
Added: trunk/kfreebsd-9/debian/patches/008_gcc46.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/008_gcc46.diff (rev 0)
+++ trunk/kfreebsd-9/debian/patches/008_gcc46.diff 2011-10-07 23:07:41 UTC (rev 3726)
@@ -0,0 +1,14 @@
+--- a/sys/conf/kern.mk
++++ b/sys/conf/kern.mk
+@@ -144,3 +144,11 @@
+ .if defined(WITH_CTF)
+ .undef NO_CTF
+ .endif
++
++#
++# GCC 4.4 onwards automatically enables -fgcse with -O2, which is not
++# currently supported. Avoid.
++#
++.if ${CC} != "icc"
++CFLAGS+= -fno-gcse
++.endif
Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series 2011-10-07 18:07:18 UTC (rev 3725)
+++ trunk/kfreebsd-9/debian/patches/series 2011-10-07 23:07:41 UTC (rev 3726)
@@ -5,6 +5,7 @@
005_linux_cflags.diff
006_mips_i8259_alloc.diff
#007_clone_signals.diff
+008_gcc46.diff
#009_disable_duped_modules.diff
020_linker.diff
103_stat_pipe.diff
More information about the Glibc-bsd-commits
mailing list