svn commit: r212540 - head/share/mk

[Warner Losh]

Author: imp
Date: Mon Sep 13 07:22:14 2010
New Revision: 212540
URL: http://svn.freebsd.org/changeset/base/212540

Log:
  Prefer MACHINE_CPUARCH to MACHINE_ARCH unless there's a good reason...

Modified:
  head/share/mk/bsd.cpu.mk

Modified: head/share/mk/bsd.cpu.mk
==
--- head/share/mk/bsd.cpu.mkMon Sep 13 07:18:00 2010(r212539)
+++ head/share/mk/bsd.cpu.mkMon Sep 13 07:22:14 2010(r212540)
@@ -6,18 +6,18 @@
 
 .if !defined(CPUTYPE) || empty(CPUTYPE)
 _CPUCFLAGS =
-. if ${MACHINE_ARCH} == "i386"
+. if ${MACHINE_CPUARCH} == "i386"
 MACHINE_CPU = i486
-. elif ${MACHINE_ARCH} == "amd64"
+. elif ${MACHINE_CPUARCH} == "amd64"
 MACHINE_CPU = amd64 sse2 sse mmx
-. elif ${MACHINE_ARCH} == "ia64"
+. elif ${MACHINE_CPUARCH} == "ia64"
 MACHINE_CPU = itanium
-. elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+. elif ${MACHINE_CPUARCH} == "powerpc"
 MACHINE_CPU = aim
-. elif ${MACHINE_ARCH} == "sparc64"
-. elif ${MACHINE_ARCH} == "arm"
+. elif ${MACHINE_CPUARCH} == "sparc64"
+. elif ${MACHINE_CPUARCH} == "arm"
 MACHINE_CPU = arm
-. elif ${MACHINE_ARCH} == "mips"
+. elif ${MACHINE_CPUARCH} == "mips"
 MACHINE_CPU = mips
 . endif
 .else
@@ -25,7 +25,7 @@ MACHINE_CPU = mips
 # Handle aliases (not documented in make.conf to avoid user confusion
 # between e.g. i586 and pentium)
 
-. if ${MACHINE_ARCH} == "i386"
+. if ${MACHINE_CPUARCH} == "i386"
 .  if ${CPUTYPE} == "nocona"
 CPUTYPE = prescott
 .  elif ${CPUTYPE} == "core" || ${CPUTYPE} == "core2"
@@ -54,7 +54,7 @@ CPUTYPE = athlon-mp
 .  elif ${CPUTYPE} == "k7"
 CPUTYPE = athlon
 .  endif
-. elif ${MACHINE_ARCH} == "amd64"
+. elif ${MACHINE_CPUARCH} == "amd64"
 .  if ${CPUTYPE} == "prescott" || ${CPUTYPE} == "core2"
 CPUTYPE = nocona
 .  endif
@@ -71,7 +71,7 @@ CPUTYPE = nocona
 #  http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html
 #  http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86_002d64-Options.html
 
-. if ${MACHINE_ARCH} == "i386"
+. if ${MACHINE_CPUARCH} == "i386"
 .  if ${CPUTYPE} == "crusoe"
 _CPUCFLAGS = -march=i686 -falign-functions=0 -falign-jumps=0 -falign-loops=0
 .  elif ${CPUTYPE} == "k5"
@@ -104,9 +104,9 @@ _ICC_CPUCFLAGS = -tpp5
 .  else
 _ICC_CPUCFLAGS =
 .  endif # ICC on 'i386'
-. elif ${MACHINE_ARCH} == "amd64"
+. elif ${MACHINE_CPUARCH} == "amd64"
 _CPUCFLAGS = -march=${CPUTYPE}
-. elif ${MACHINE_ARCH} == "arm"
+. elif ${MACHINE_CPUARCH} == "arm"
 .  if ${CPUTYPE} == "xscale"
 #XXX: gcc doesn't seem to like -mcpu=xscale, and dies while rebuilding itself
 #_CPUCFLAGS = -mcpu=xscale
@@ -123,7 +123,7 @@ _CPUCFLAGS = -mcpu=${CPUTYPE} -mno-power
 .  endif
 . elif ${MACHINE_ARCH} == "powerpc64"
 _CPUCFLAGS = -mcpu=${CPUTYPE}
-. elif ${MACHINE_ARCH} == "mips"
+. elif ${MACHINE_CPUARCH} == "mips"
 .  if ${CPUTYPE} == "mips32"
 _CPUCFLAGS = -march=mips32
 .  elif ${CPUTYPE} == "mips32r2"
@@ -143,7 +143,7 @@ _CPUCFLAGS = -march=24kc
 # unordered list to make it easy for client makefiles to test for the
 # presence of a CPU feature.
 
-. if ${MACHINE_ARCH} == "i386"
+. if ${MACHINE_CPUARCH} == "i386"
 .  if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386
 .  elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \
@@ -182,27 +182,27 @@ MACHINE_CPU = i486 i386
 .  elif ${CPUTYPE} == "i386"
 MACHINE_CPU = i386
 .  endif
-. elif ${MACHINE_ARCH} == "amd64"
+. elif ${MACHINE_CPUARCH} == "amd64"
 .  if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
 .  elif ${CPUTYPE} == "nocona"
 MACHINE_CPU = sse3
 .  endif
 MACHINE_CPU += amd64 sse2 sse mmx
-. elif ${MACHINE_ARCH} == "ia64"
+. elif ${MACHINE_CPUARCH} == "ia64"
 .  if ${CPUTYPE} == "itanium"
 MACHINE_CPU = itanium
 .  endif
 . endif
 .endif
 
-.if ${MACHINE_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+.if ${MACHINE_CPUARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
 CFLAGS += -mbig-endian
 LDFLAGS += -mbig-endian
 LD += -EB
 .endif
 
-.if ${MACHINE_ARCH} == "mips" 
+.if ${MACHINE_CPUARCH} == "mips" 
 CFLAGS += -G0
 .endif
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212542 - head/sys/conf

[Warner Losh]

Author: imp
Date: Mon Sep 13 07:27:03 2010
New Revision: 212542
URL: http://svn.freebsd.org/changeset/base/212542

Log:
  Prefer MACHINE_CPUARCH over MACHINE_ARCH

Modified:
  head/sys/conf/kern.mk

Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk   Mon Sep 13 07:25:35 2010(r212541)
+++ head/sys/conf/kern.mk   Mon Sep 13 07:27:03 2010(r212542)
@@ -29,7 +29,7 @@ CWARNFLAGS?=  -Wall -Wredundant-decls -Wn
 # operations inside the kernel itself.  These operations are exclusively
 # reserved for user applications.
 #
-.if ${MACHINE_ARCH} == "i386" && ${CC:T:Micc} != "icc"
+.if ${MACHINE_CPUARCH} == "i386" && ${CC:T:Micc} != "icc"
 .if ${CC:T:Mclang} != "clang"
 CFLAGS+=   -mno-align-long-strings -mpreferred-stack-boundary=2
 .endif
@@ -37,14 +37,14 @@ CFLAGS+=-mno-mmx -mno-3dnow -mno-sse -m
 INLINE_LIMIT?= 8000
 .endif
 
-.if ${MACHINE_ARCH} == "arm"
+.if ${MACHINE_CPUARCH} == "arm"
 INLINE_LIMIT?= 8000
 .endif
 #
 # For IA-64, we use r13 for the kernel globals pointer and we only use
 # a very small subset of float registers for integer divides.
 #
-.if ${MACHINE_ARCH} == "ia64"
+.if ${MACHINE_CPUARCH} == "ia64"
 CFLAGS+=   -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata
 INLINE_LIMIT?= 15000
 .endif
@@ -54,7 +54,7 @@ INLINE_LIMIT?=15000
 # point emulation.  This avoids using floating point registers for integer
 # operations which it has a tendency to do.
 #
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_CPUARCH} == "sparc64"
 CFLAGS+=   -mcmodel=medany -msoft-float
 INLINE_LIMIT?= 15000
 .endif
@@ -64,7 +64,7 @@ INLINE_LIMIT?=15000
 # operations inside the kernel itself.  These operations are exclusively
 # reserved for user applications.
 #
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=   -mcmodel=kernel -mno-red-zone \
-mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow \
-msoft-float -fno-asynchronous-unwind-tables
@@ -76,7 +76,7 @@ INLINE_LIMIT?=8000
 # floating point registers for integer operations which it has a tendency to 
do.
 # Also explicitly disable Altivec instructions inside the kernel.
 #
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
+.if ${MACHINE_CPUARCH} == "powerpc"
 CFLAGS+=   -msoft-float -mno-altivec
 INLINE_LIMIT?= 15000
 .endif
@@ -84,7 +84,7 @@ INLINE_LIMIT?=15000
 #
 # For MIPS we also tell gcc to use floating point emulation
 #
-.if ${MACHINE_ARCH} == "mips"
+.if ${MACHINE_CPUARCH} == "mips"
 CFLAGS+=   -msoft-float
 INLINE_LIMIT?= 8000
 .endif
@@ -106,8 +106,9 @@ CFLAGS+=-restrict
 #
 # GCC SSP support.
 #
-.if ${MK_SSP} != "no" && ${CC:T:Micc} != "icc" && ${MACHINE_ARCH} != "ia64" && 
\
-   ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
+.if ${MK_SSP} != "no" && ${CC:T:Micc} != "icc" && \
+${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" && \
+${MACHINE_CPUARCH} != "mips"
 CFLAGS+=   -fstack-protector
 .endif
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212543 - in head/sys/modules: opensolaris zfs

[Warner Losh]

Author: imp
Date: Mon Sep 13 07:29:02 2010
New Revision: 212543
URL: http://svn.freebsd.org/changeset/base/212543

Log:
  Simplify atomic selection

Modified:
  head/sys/modules/opensolaris/Makefile
  head/sys/modules/zfs/Makefile

Modified: head/sys/modules/opensolaris/Makefile
==
--- head/sys/modules/opensolaris/Makefile   Mon Sep 13 07:27:03 2010
(r212542)
+++ head/sys/modules/opensolaris/Makefile   Mon Sep 13 07:29:02 2010
(r212543)
@@ -8,8 +8,12 @@ SRCS=  opensolaris.c   \
opensolaris_kmem.c  \
opensolaris_misc.c
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} 
== "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc64"
-.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+_A=${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic
+.if exists(${_A}/${MACHINE_CPUARCH}/opensolaris_atomic.S)
+.PATH: ${_A}/${MACHINE_CPUARCH}
+SRCS+= opensolaris_atomic.S
+.elif exists(${_A}/${MACHINE_ARCH}/opensolaris_atomic.S)
+.PATH: ${_A}/${MACHINE_ARCH}
 SRCS+= opensolaris_atomic.S
 .else
 SRCS+= opensolaris_atomic.c

Modified: head/sys/modules/zfs/Makefile
==
--- head/sys/modules/zfs/Makefile   Mon Sep 13 07:27:03 2010
(r212542)
+++ head/sys/modules/zfs/Makefile   Mon Sep 13 07:29:02 2010
(r212543)
@@ -27,12 +27,15 @@ SRCS+=  opensolaris_uio.c
 SRCS+= opensolaris_vfs.c
 SRCS+= opensolaris_zone.c
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} 
== "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc64"
-.PATH: ${SUNW}/common/atomic/${MACHINE_ARCH}
-SRCS+= opensolaris_atomic.S
+_A=${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic
+.if exists(${_A}/${MACHINE_CPUARCH}/opensolaris_atomic.S)
+.PATH: ${_A}/${MACHINE_CPUARCH}
+SRCS+= opensolaris_atomic.S
+.elif exists(${_A}/${MACHINE_ARCH}/opensolaris_atomic.S)
+.PATH: ${_A}/${MACHINE_ARCH}
+SRCS+= opensolaris_atomic.S
 .else
-.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
-SRCS+= opensolaris_atomic.c
+SRCS+= opensolaris_atomic.c
 .endif
 
 .PATH: ${SUNW}/uts/common/fs
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212558 - head/usr.bin

[Warner Losh]

Author: imp
Date: Mon Sep 13 15:30:09 2010
New Revision: 212558
URL: http://svn.freebsd.org/changeset/base/212558

Log:
  Move to using Makefile.arch to include the proper target-specific programs.

Modified:
  head/usr.bin/Makefile

Modified: head/usr.bin/Makefile
==
--- head/usr.bin/Makefile   Mon Sep 13 15:19:49 2010(r212557)
+++ head/usr.bin/Makefile   Mon Sep 13 15:30:09 2010(r212558)
@@ -11,48 +11,29 @@
 
 SUBDIR=alias \
apply \
-   ${_ar} \
asa \
-   ${_at} \
-   ${_atm} \
awk \
banner \
basename \
-   ${_bc} \
-   ${_biff} \
-   ${_bluetooth} \
brandelf \
bsdiff \
bzip2 \
bzip2recover \
-   ${_c89} \
-   ${_c99} \
-   ${_calendar} \
cap_mkdb \
-   ${_catman} \
chat \
-   ${_checknr} \
-   ${_chkey} \
chpass \
cksum \
${_clang} \
cmp \
col \
-   ${_colcrt} \
colldef \
colrm \
column \
comm \
-   ${_compile_et} \
compress \
-   ${_cpio} \
cpuset \
csplit \
-   ${_csup} \
-   ${_ctags} \
cut \
-   ${_dc} \
-   ${_dig} \
dirname \
du \
ee \
@@ -64,12 +45,10 @@ SUBDIR= alias \
false \
fetch \
file \
-   ${_file2c} \
find \
finger \
fmt \
fold \
-   ${_from} \
fstat \
fsync \
ftp \
@@ -78,15 +57,11 @@ SUBDIR= alias \
getconf \
getent \
getopt \
-   ${_gprof} \
${_grep} \
gzip \
head \
-   ${_hesinfo} \
hexdump \
-   ${_host} \
id \
-   ${_indent} \
ipcrm \
ipcs \
join \
@@ -105,10 +80,8 @@ SUBDIR= alias \
less \
lessecho \
lesskey \
-   ${_lex} \
limits \
locale \
-   ${_locate} \
lock \
lockf \
logger \
@@ -120,8 +93,6 @@ SUBDIR=  alias \
lsvfs \
lzmainfo \
m4 \
-   ${_mail} \
-   ${_make} \
${_makewhatis} \
mesg \
minigzip \
@@ -129,24 +100,16 @@ SUBDIR=   alias \
mkdep \
mkfifo \
mklocale \
-   ${_mkstr} \
mktemp \
mkuzip \
-   ${_msgs} \
mt \
-   ${_nc} \
ncal \
-   ${_ncplist} \
-   ${_ncplogin} \
netstat \
newgrp \
-   ${_newkey} \
nfsstat \
nice \
nl \
nohup \
-   ${_nslookup} \
-   ${_nsupdate} \
opieinfo \
opiekey \
opiepasswd \
@@ -159,26 +122,19 @@ SUBDIR=   alias \
printenv \
printf \
procstat \
-   ${_quota} \
renice \
rev \
revoke \
-   ${_rlogin} \
-   ${_rpcgen} \
rpcinfo \
rs \
-   ${_rsh} \
rup \
-   ${_ruptime} \
rusers \
rwall \
-   ${_rwho} \
script \
sed \
seq \
shar \
showmount \
-   ${_smbutil} \
sockstat \
split \
stat \
@@ -190,7 +146,6 @@ SUBDIR= alias \
tar \
tcopy \
tee \
-   ${_telnet} \
tftp \
time \
tip \
@@ -200,25 +155,19 @@ SUBDIR=   alias \
tr \
true \
truncate \
-   ${_truss} \
+   truss \
tset \
tsort \
tty \
-   ${_ul} \
uname \
unexpand \
-   ${_unifdef} \
uniq \
unzip \
units \
unvis \
-   ${_usbhidaction} \
-   ${_usbhidctl} \
users \
uudecode \
uuencode \
-   ${_vacation} \
-   ${_vgrind} \
vi \
vis \
vmstat \
@@ -244,37 +193,33 @@ SUBDIR=   alias \
${_ypmatch} \
${_ypwhich}
 
-.if ${MACHINE_ARCH} != "arm"
-_truss=truss
-.endif
-
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_AT} != "no"
-_at=   at
+SUBDIR+=   at
 .endif
 
 .if ${MK_ATM} != "no"
-_atm=  atm
+SUBDIR+=   atm
 .endif
 
 .if ${MK_MAN_UTILS} != "no"
-_catman=   catman
+SUBDIR+=   catman
 .endif
 
 .if ${MK_BIND_UTILS} != "no"
-_dig=  dig
-_host= host
-_nslookup= nslookup
-_nsupdate= nsupdate
+SUBDIR+=   dig
+SUBDIR+=   host
+SUBDIR+=   nslookup
+SUBDIR+=   nsupdate
 .endif
 
 .if ${MK_BLUETOOTH} != "no"
-_bluetooth=bluetooth
+SUBDIR+=   bluetooth
 .endif
 
 .if ${MK_BSD_CPIO} != "no"
-_cpio= cpio
+SUBDIR+=   cpio
 .endif
 
 .if ${MK_BSD_GREP} != "no"
@@ -282,7 +227,7 @@ _grep=  grep
 .endif
 
 .if ${MK_CALENDAR} != "no"
-_calendar= calendar
+SUBDIR+=   calendar
 .endif
 
 .if ${MK_CLANG} != "no"
@@ -290,33 +235,33 @@ _clang=   clang
 .endif
 
 .if ${MK_HESIOD} != "

svn commit: r212560 - in head/sys: conf mips/conf

[Warner Losh]

Author: imp
Date: Mon Sep 13 16:39:33 2010
New Revision: 212560
URL: http://svn.freebsd.org/changeset/base/212560

Log:
  TARGET_64BIT isn't needed anymore, GC it (partial merge from tbemd).

Modified:
  head/sys/conf/Makefile.mips
  head/sys/mips/conf/MALTA64
  head/sys/mips/conf/OCTEON1

Modified: head/sys/conf/Makefile.mips
==
--- head/sys/conf/Makefile.mips Mon Sep 13 15:36:42 2010(r212559)
+++ head/sys/conf/Makefile.mips Mon Sep 13 16:39:33 2010(r212560)
@@ -54,20 +54,12 @@ SYSTEM_LD+=-EB
 EXTRA_FLAGS+=-EB 
 TRAMP_LDFLAGS+=-Wl,-EB 
 HACK_EXTRA_FLAGS+=-EB -Wl,-EB
-.if defined(TARGET_64BIT)
-SYSTEM_LD+=-m elf64btsmip_fbsd
-HACK_EXTRA_FLAGS+=-Wl,-m,elf64btsmip_fbsd
-.endif
 .else
 CFLAGS+=-EL
 SYSTEM_LD+=-EL
 EXTRA_FLAGS+=-EL
 TRAMP_LDFLAGS+=-Wl,-EL
 HACK_EXTRA_FLAGS+=-EL -Wl,-EL
-.if defined(TARGET_64BIT)
-SYSTEM_LD+=-m elf64ltsmip_fbsd
-HACK_EXTRA_FLAGS+=-Wl,-m,elf64ltsmip_fbsd
-.endif
 .endif
 
 

Modified: head/sys/mips/conf/MALTA64
==
--- head/sys/mips/conf/MALTA64  Mon Sep 13 15:36:42 2010(r212559)
+++ head/sys/mips/conf/MALTA64  Mon Sep 13 16:39:33 2010(r212560)
@@ -21,7 +21,6 @@ ident MALTA
 
 makeoptionsARCH_FLAGS="-march=mips64 -mabi=64"
 makeoptionsMIPS_LITTLE_ENDIAN=defined
-makeoptionsTARGET_64BIT=t
 makeoptionsLDSCRIPT_NAME=  ldscript.mips.mips64
 
 optionsYAMON

Modified: head/sys/mips/conf/OCTEON1
==
--- head/sys/mips/conf/OCTEON1  Mon Sep 13 15:36:42 2010(r212559)
+++ head/sys/mips/conf/OCTEON1  Mon Sep 13 16:39:33 2010(r212560)
@@ -34,7 +34,6 @@ makeoptions   LDSCRIPT_NAME=ldscript.mips.
 # Don't build any modules yet.
 makeoptionsMODULES_OVERRIDE=""
 makeoptionsTARGET_BIG_ENDIAN=defined
-makeoptionsTARGET_64BIT=defined
 makeoptionsKERNLOADADDR=0x8010
 
 include"../cavium/std.octeon1"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212665 - head/libexec/tftpd

[Warner Losh]

Author: imp
Date: Wed Sep 15 15:38:47 2010
New Revision: 212665
URL: http://svn.freebsd.org/changeset/base/212665

Log:
  Move the pfrom initialization from before the setjmp to after the
  setjmp to avoid warnings on the powerpc build...

Modified:
  head/libexec/tftpd/tftp-io.c

Modified: head/libexec/tftpd/tftp-io.c
==
--- head/libexec/tftpd/tftp-io.cWed Sep 15 15:33:51 2010
(r212664)
+++ head/libexec/tftpd/tftp-io.cWed Sep 15 15:38:47 2010
(r212665)
@@ -398,8 +398,6 @@ receive_packet(int peer, char *data, int
int n;
static int waiting;
 
-   pfrom = (from == NULL) ? &from_local : from;
-
if (debug&DEBUG_PACKETS)
tftp_log(LOG_DEBUG,
"Waiting %d seconds for packet", timeoutpacket);
@@ -423,6 +421,7 @@ receive_packet(int peer, char *data, int
}
 
waiting++;
+   pfrom = (from == NULL) ? &from_local : from;
fromlen = sizeof(*pfrom);
n = recvfrom(peer, data, size, 0, (struct sockaddr *)pfrom, &fromlen);
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212692 - head/share/man/man4

[Warner Losh]

Author: imp
Date: Wed Sep 15 19:40:08 2010
New Revision: 212692
URL: http://svn.freebsd.org/changeset/base/212692

Log:
  Don't suggest using bwn for the bcm4306 cards in the list.  The
  bcm4306 cards are ambiguous.  BCM4306 rev 2 requires bwi.  BCM4306 rev
  3 will work with either.  Since we can't easily determine which is
  which, just remove them.

Modified:
  head/share/man/man4/bwn.4

Modified: head/share/man/man4/bwn.4
==
--- head/share/man/man4/bwn.4   Wed Sep 15 19:34:18 2010(r212691)
+++ head/share/man/man4/bwn.4   Wed Sep 15 19:40:08 2010(r212692)
@@ -78,18 +78,14 @@ driver supports Broadcom BCM43xx based w
 .Pp
 .Bl -column -compact "Apple Airport Extreme" "BCM4306" "Mini PCI" "a/b/g" 
-offset 6n
 .It Em "Card   ChipBus Standard"
-.It "Apple Airport Extreme BCM4306 PCI b/g"
 .It "Apple Airport Extreme BCM4318 PCI b/g"
 .It "ASUS WL-138g  BCM4318 PCI b/g"
 .It "Buffalo WLI-CB-G54S   BCM4318 CardBus b/g"
-.It "Buffalo WLI-PCI-G54S  BCM4306 PCI b/g"
-.It "Compaq R4035 onboard  BCM4306 PCI b/g"
 .It "Dell Wireless 1470BCM4318 Mini PCIb/g"
 .It "Dell Truemobile 1400  BCM4309 Mini PCIb/g"
 .It "HP nx6125 BCM4319 PCI b/g"
 .It "Linksys WPC54G Ver 3  BCM4318 CardBus b/g"
 .It "Linksys WPC54GS Ver 2 BCM4318 CardBus b/g"
-.It "TRENDnet TEW-401PCplusBCM4306 CardBus b/g"
 .It "US Robotics 5411  BCM4318 CardBus b/g"
 .El
 .Pp
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212693 - head/share/man/man4

[Warner Losh]

Author: imp
Date: Wed Sep 15 19:40:42 2010
New Revision: 212693
URL: http://svn.freebsd.org/changeset/base/212693

Log:
  Add note abotu bwn and newer chipsets

Modified:
  head/share/man/man4/bwi.4

Modified: head/share/man/man4/bwi.4
==
--- head/share/man/man4/bwi.4   Wed Sep 15 19:40:08 2010(r212692)
+++ head/share/man/man4/bwi.4   Wed Sep 15 19:40:42 2010(r212693)
@@ -90,6 +90,20 @@ driver supports Broadcom BCM43xx based w
 .It "TRENDnet TEW-401PCplusBCM4306 CardBus b/g"
 .It "US Robotics 5411  BCM4318 CardBus b/g"
 .El
+.Pp
+The 
+.Nm 
+driver uses the older v3 version of Broadcom's firmware.
+While this older firmware does support most BCM43xx parts, the
+.Xr bwn 4 
+driver works better for the newer chips it supports.
+You must use the 
+.Nm 
+driver if you are using older Broadcom chipsets (BCM4301, BCM4303 and
+BCM4306 rev 2).
+The v4 version of the firmware that 
+.Xr bwn 4 
+uses does not support these chips.
 .Sh EXAMPLES
 Join an existing BSS network (i.e., connect to an access point):
 .Pp
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212798 - head/sys/kern

[Warner Losh]

Author: imp
Date: Fri Sep 17 16:05:25 2010
New Revision: 212798
URL: http://svn.freebsd.org/changeset/base/212798

Log:
  By popular demand, kill all the non GIANT related interrupt messages.
  They are confusing and add little value.
  
  Reviewed by:  jhb@

Modified:
  head/sys/kern/subr_bus.c

Modified: head/sys/kern/subr_bus.c
==
--- head/sys/kern/subr_bus.cFri Sep 17 15:58:05 2010(r212797)
+++ head/sys/kern/subr_bus.cFri Sep 17 16:05:25 2010(r212798)
@@ -3998,15 +3998,6 @@ bus_setup_intr(device_t dev, struct reso
return (error);
if (handler != NULL && !(flags & INTR_MPSAFE))
device_printf(dev, "[GIANT-LOCKED]\n");
-   if (bootverbose && (flags & INTR_MPSAFE))
-   device_printf(dev, "[MPSAFE]\n");
-   if (filter != NULL) {
-   if (handler == NULL)
-   device_printf(dev, "[FILTER]\n");
-   else 
-   device_printf(dev, "[FILTER+ITHREAD]\n");
-   } else 
-   device_printf(dev, "[ITHREAD]\n");
return (0);
 }
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r212938 - head/tools/tools/nanobsd

[Warner Losh]

Author: imp
Date: Mon Sep 20 23:36:54 2010
New Revision: 212938
URL: http://svn.freebsd.org/changeset/base/212938

Log:
  Support new variable NANO_LABEL.  When set to a non-null string,
  nanobsd will build a system that uses this label (via
  /dev/ufs/${NANO_LABEL}sX) in preference to NANO_DRIVE (well, it forces
  NANO_DRIVE to be ufs/${NANO_LABEL}).  This allows images that will
  boot off usb stick or CF card easily well.
  
  There is no change if you don't set this variable.

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==
--- head/tools/tools/nanobsd/nanobsd.sh Mon Sep 20 23:17:26 2010
(r212937)
+++ head/tools/tools/nanobsd/nanobsd.sh Mon Sep 20 23:36:54 2010
(r212938)
@@ -135,9 +135,16 @@ NANO_MD_BACKING="file"
 # Progress Print level
 PPLEVEL=3
 
+# Set NANO_LABEL to non-blank to form the basis for using /dev/ufs/label
+# in preference to /dev/${NANO_DRIVE}
+# Root partition will be ${NANO_LABEL}s{1,2}
+# /cfg partition will be ${NANO_LABEL}s3
+# /data partition will be ${NANO_LABEL}s4
+NANO_LABEL=""
+
 ###
 # Architecture to build.  Corresponds to TARGET_ARCH in a buildworld.
-# Unfortunately, there's no way to set TARGET at this time, and it 
+# Unfortunately, there's no way to set TARGET at this time, and it
 # conflates the two, so architectures where TARGET != TARGET_ARCH do
 # not work.  This defaults to the arch of the current machine.
 
@@ -361,16 +368,26 @@ prune_usr() (
done
 )
 
+newfs_part ( ) (
+   local dev mnt lbl
+   dev=$1
+   mnt=$2
+   lbl=$3
+   echo newfs ${NANO_NEWFS} ${NANO_LABEL:+-L${NANO_LABEL}${lbl}} ${dev}
+   newfs ${NANO_NEWFS} ${NANO_LABEL:+-L${NANO_LABEL}${lbl}} ${dev}
+   mount ${dev} ${mnt}
+)
+
 populate_slice ( ) (
-   local dev dir mnt
+   local dev dir mnt lbl
dev=$1
dir=$2
mnt=$3
+   lbl=$4
test -z $2 && dir=/var/empty
-   test -d $d || dir=/var/empty
+   test -d $dir || dir=/var/empty
echo "Creating ${dev} with ${dir} (mounting on ${mnt})"
-   newfs ${NANO_NEWFS} ${dev}
-   mount ${dev} ${mnt}
+   newfs_part $dev $mnt $lbl
cd ${dir}
find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt}
df -i ${mnt}
@@ -378,11 +395,11 @@ populate_slice ( ) (
 )
 
 populate_cfg_slice ( ) (
-   populate_slice "$1" "$2" "$3"
+   populate_slice "$1" "$2" "$3" "$4"
 )
 
 populate_data_slice ( ) (
-   populate_slice "$1" "$2" "$3"
+   populate_slice "$1" "$2" "$3" "$4"
 )
 
 create_i386_diskimage ( ) (
@@ -484,13 +501,8 @@ create_i386_diskimage ( ) (
bsdlabel ${MD}s1
 
# Create first image
-   # XXX: should use populate_slice for easier override
-   newfs ${NANO_NEWFS} /dev/${MD}s1a
+   populate_slice /dev/${MD}s1a ${NANO_WORLDDIR} ${MNT} "s1"
mount /dev/${MD}s1a ${MNT}
-   df -i ${MNT}
-   echo "Copying worlddir..."
-   ( cd ${NANO_WORLDDIR} && find . -print | cpio -dump ${MNT} )
-   df -i ${MNT}
echo "Generating mtree..."
( cd ${MNT} && mtree -c ) > ${NANO_OBJ}/_.mtree
( cd ${MNT} && du -k ) > ${NANO_OBJ}/_.du
@@ -506,14 +518,17 @@ create_i386_diskimage ( ) (
sed -i "" "s=${NANO_DRIVE}s1=${NANO_DRIVE}s2=g" $f
done
umount ${MNT}
+   if [ ! -z ${NANO_LABEL} ]; then
+   tunefs -L ${NANO_LABEL}"s2" /dev/${MD}s2a
+   fi
fi

# Create Config slice
-   populate_cfg_slice /dev/${MD}s3 "${NANO_CFGDIR}" ${MNT}
+   populate_cfg_slice /dev/${MD}s3 "${NANO_CFGDIR}" ${MNT} "s3"
 
# Create Data slice, if any.
if [ $NANO_DATASIZE -ne 0 ] ; then
-   populate_data_slice /dev/${MD}s4 "${NANO_DATADIR}" ${MNT}
+   populate_data_slice /dev/${MD}s4 "${NANO_DATADIR}" ${MNT} "s4"
fi
 
if [ "${NANO_MD_BACKING}" = "swap" ] ; then
@@ -612,7 +627,7 @@ cust_comconsole () (
sed -i "" -e '/^ttyv[0-8]/s/on/ off/' ${NANO_WORLDDIR}/etc/ttys
 
# Tell loader to use serial console early.
-   echo "${NANO_BOOT2CFG}" > ${NANO_WORLDDIR}/boot.config
+   echo " -h" > ${NANO_WORLDDIR}/boot.config
 )
 
 ###
@@ -820,6 +835,11 @@ else
NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN"
 fi
 
+# Override user's NANO_DRIVE if they specified a NANO_LABEL
+if [ ! -z "${NANO_LABEL}" ]; then
+   NANO_DRIVE=ufs/${NANO_LABEL}
+fi
+
 export MAKEOBJDIRPREFIX
 
 export NANO_ARCH
@@ -844,6 +864,7 @@ export NANO_TOOLS
 export NANO_WORLDDIR
 export NANO_BOOT0CFG
 export NANO_BOOTLOADER
+export NANO_LABEL
 
 ###
 # And then it is as simple as that...

svn commit: r212990 - head/tools/tools/nanobsd

[Warner Losh]

Author: imp
Date: Wed Sep 22 04:48:39 2010
New Revision: 212990
URL: http://svn.freebsd.org/changeset/base/212990

Log:
  Make the labels match the device name that's mounted, not just the
  slice they are on.  When NANO_LABEL is not defined, the fstab
  generates entries that specify /dev/ad0s1a.  When NANO_LABEL is
  defined, it generates /dev/usb/${NANO_LABEL}s1a.  The prior code
  created the file system with a label of ${NANO_LABEL}s1, leading to
  problems on boot.
  
  Pointy hat to: imp@

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==
--- head/tools/tools/nanobsd/nanobsd.sh Wed Sep 22 02:26:07 2010
(r212989)
+++ head/tools/tools/nanobsd/nanobsd.sh Wed Sep 22 04:48:39 2010
(r212990)
@@ -501,7 +501,7 @@ create_i386_diskimage ( ) (
bsdlabel ${MD}s1
 
# Create first image
-   populate_slice /dev/${MD}s1a ${NANO_WORLDDIR} ${MNT} "s1"
+   populate_slice /dev/${MD}s1a ${NANO_WORLDDIR} ${MNT} "s1a"
mount /dev/${MD}s1a ${MNT}
echo "Generating mtree..."
( cd ${MNT} && mtree -c ) > ${NANO_OBJ}/_.mtree
@@ -518,8 +518,10 @@ create_i386_diskimage ( ) (
sed -i "" "s=${NANO_DRIVE}s1=${NANO_DRIVE}s2=g" $f
done
umount ${MNT}
+   # Override the label from the first partition so we
+   # don't confuse glabel with duplicates.
if [ ! -z ${NANO_LABEL} ]; then
-   tunefs -L ${NANO_LABEL}"s2" /dev/${MD}s2a
+   tunefs -L ${NANO_LABEL}"s2a" /dev/${MD}s2a
fi
fi

___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213077 - head/sys/conf

[Warner Losh]

Author: imp
Date: Thu Sep 23 17:12:47 2010
New Revision: 213077
URL: http://svn.freebsd.org/changeset/base/213077

Log:
  Simplify how we find the kernel source.  Rather than depending on sys,
  or some variation in the path, the new version assumes that $0 is
  newvers.sh path, and that dirname $0/.. is the same as $S aka $SYSDIR.
  It also removes knowledge of ${MACHINE} and ${MACHINE_ARCH}, which is
  also good.
  
  # I've had this in my tree for about 6 months now, which is why I
  # didn't notice that I broke it in r209510 and that was fixed in
  # r212954.  This should finally resolve the issues people had with
  # r204824 as well as address the issues that motivated r204824.

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shThu Sep 23 15:10:28 2010(r213076)
+++ head/sys/conf/newvers.shThu Sep 23 17:12:47 2010(r213077)
@@ -38,13 +38,14 @@ if [ "X${BRANCH_OVERRIDE}" != "X" ]; the
 fi
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
+SYSDIR=$(dirname $0)/..
 
 if [ "X${PARAMFILE}" != "X" ]; then
RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \
${PARAMFILE})
 else
RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \
-   $(dirname $0)/../sys/param.h)
+   ${SYSDIR}/sys/param.h)
 fi
 
 
@@ -87,51 +88,43 @@ touch version
 v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
 i=`${MAKE:-make} -V KERN_IDENT`
 
-case "$d" in
-*/sys/*)
-   SRCDIR=${d##*obj}
-   if [ -n "$MACHINE" ]; then
-   SRCDIR=${SRCDIR##/$MACHINE.$MACHINE_ARCH}
+for dir in /bin /usr/bin /usr/local/bin; do
+   if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
+   svnversion=${dir}/svnversion
+   break
+   fi
+   if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
+   git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
+   break
fi
-   SRCDIR=${SRCDIR%%/sys/*}
+done
 
-   for dir in /bin /usr/bin /usr/local/bin; do
-   if [ -d "${SRCDIR}/sys/.svn" -a -x "${dir}/svnversion" ] ; then
-   svnversion=${dir}/svnversion
-   break
-   fi
-   if [ -d "${SRCDIR}/.git" -a -x "${dir}/git" ] ; then
-   git_cmd="${dir}/git --git-dir=${SRCDIR}/.git"
-   break
-   fi
-   done
+if [ -n "$svnversion" ] ; then
+echo "$svnversion"
+   svn=" r`cd ${SYSDIR} && $svnversion`"
+fi
 
-   if [ -n "$svnversion" ] ; then
-   svn=" r`cd ${SRCDIR}/sys && $svnversion`"
-   fi
-   if [ -n "$git_cmd" ] ; then
-   git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null`
-   svn=`$git_cmd svn find-rev $git 2>/dev/null`
-   if [ -n "$svn" ] ; then
+if [ -n "$git_cmd" ] ; then
+   git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null`
+   svn=`$git_cmd svn find-rev $git 2>/dev/null`
+   if [ -n "$svn" ] ; then
+   svn=" r${svn}"
+   git="=${git}"
+   else
+   svn=`$git_cmd log | fgrep 'git-svn-id:' | head -1 | \
+sed -n 's/^...@\([0-9][0-9]*\).*$/\1/p'`
+   if [ -n $svn ] ; then
svn=" r${svn}"
-   git="=${git}"
+   git="+${git}"
else
-   svn=`$git_cmd log | fgrep 'git-svn-id:' | head -1 | \
-sed -n 's/^...@\([0-9][0-9]*\).*$/\1/p'`
-   if [ -n $svn ] ; then
-   svn=" r${svn}"
-   git="+${git}"
-   else
-   git=" ${git}"
-   fi
-   fi
-   if $git_cmd --work-tree=${SRCDIR} diff-index \
-   --name-only HEAD | read dummy; then
-   git="${git}-dirty"
+   git=" ${git}"
fi
fi
-   ;;
-esac
+   if $git_cmd --work-tree=${SYSDIR}/.. diff-index \
+   --name-only HEAD | read dummy; then
+   git="${git}-dirty"
+   fi
+fi
 
 cat << EOF > vers.c
 $COPYRIGHT
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213078 - head/sys/conf

[Warner Losh]

Author: imp
Date: Thu Sep 23 17:29:59 2010
New Revision: 213078
URL: http://svn.freebsd.org/changeset/base/213078

Log:
  Clean up stray line in 213077

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shThu Sep 23 17:12:47 2010(r213077)
+++ head/sys/conf/newvers.shThu Sep 23 17:29:59 2010(r213078)
@@ -48,7 +48,6 @@ else
${SYSDIR}/sys/param.h)
 fi
 
-
 b=share/examples/etc/bsd-style-copyright
 year=`date '+%Y'`
 # look for copyright template
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213157 - head/sys/ia64/include

[Warner Losh]

Author: imp
Date: Sat Sep 25 04:41:42 2010
New Revision: 213157
URL: http://svn.freebsd.org/changeset/base/213157

Log:
  Remove clauses 3 and 4, per changes to NetBSD versions of these files.

Modified:
  head/sys/ia64/include/_stdint.h
  head/sys/ia64/include/bus.h

Modified: head/sys/ia64/include/_stdint.h
==
--- head/sys/ia64/include/_stdint.h Sat Sep 25 04:39:12 2010
(r213156)
+++ head/sys/ia64/include/_stdint.h Sat Sep 25 04:41:42 2010
(r213157)
@@ -14,13 +14,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *This product includes software developed by the NetBSD
- *Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *contributors may be used to endorse or promote products derived
- *from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: head/sys/ia64/include/bus.h
==
--- head/sys/ia64/include/bus.h Sat Sep 25 04:39:12 2010(r213156)
+++ head/sys/ia64/include/bus.h Sat Sep 25 04:41:42 2010(r213157)
@@ -42,13 +42,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *contributors may be used to endorse or promote products derived
- *from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213202 - head/etc/rc.d

[Warner Losh]

Author: imp
Date: Mon Sep 27 15:55:39 2010
New Revision: 213202
URL: http://svn.freebsd.org/changeset/base/213202

Log:
  Prefer echo over printf

Modified:
  head/etc/rc.d/nsswitch

Modified: head/etc/rc.d/nsswitch
==
--- head/etc/rc.d/nsswitch  Mon Sep 27 15:55:30 2010(r213201)
+++ head/etc/rc.d/nsswitch  Mon Sep 27 15:55:39 2010(r213202)
@@ -80,7 +80,7 @@ generate_host_conf()
cache | *=*)
;;
*)
-   printf "Warning: unrecognized source [%s]\n" $_s >&2
+   echo "Warning: unrecognized source [$_s]" >&2
;;
esac
 done
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213248 - head/sys/kern

[Warner Losh]

Author: imp
Date: Tue Sep 28 15:33:30 2010
New Revision: 213248
URL: http://svn.freebsd.org/changeset/base/213248

Log:
  This file has been unused for ages.  Retire it.
  
  Submitted by: pluknet

Deleted:
  head/sys/kern/Makefile
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213368 - head/sys/kern

[Warner Losh]

Author: imp
Date: Sat Oct  2 21:35:33 2010
New Revision: 213368
URL: http://svn.freebsd.org/changeset/base/213368

Log:
  Turns out this file was how we make sysent stuff, so add that part only 
back...

Added:
  head/sys/kern/Makefile   (contents, props changed)

Added: head/sys/kern/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/kern/Makefile  Sat Oct  2 21:35:33 2010(r213368)
@@ -0,0 +1,20 @@
+#  @(#)Makefile8.2 (Berkeley) 3/21/94
+# $FreeBSD$
+
+# Makefile for init_sysent
+
+all:
+   @echo "make tags, make links or make sysent only"
+
+sysent: init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \
+../sys/sysproto.h
+
+init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \
+../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master
+   -mv -f init_sysent.c init_sysent.c.bak
+   -mv -f syscalls.c syscalls.c.bak
+   -mv -f systrace_args.c systrace_args.c.bak
+   -mv -f ../sys/syscall.h ../sys/syscall.h.bak
+   -mv -f ../sys/syscall.mk ../sys/syscall.mk.bak
+   -mv -f ../sys/sysproto.h ../sys/sysproto.h.bak
+   sh makesyscalls.sh syscalls.master
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213372 - head/sys/kern

[Warner Losh]

Author: imp
Date: Sat Oct  2 22:12:41 2010
New Revision: 213372
URL: http://svn.freebsd.org/changeset/base/213372

Log:
  Adjust the all target message (but maybe all: sysent is better?

Modified:
  head/sys/kern/Makefile

Modified: head/sys/kern/Makefile
==
--- head/sys/kern/Makefile  Sat Oct  2 22:12:04 2010(r213371)
+++ head/sys/kern/Makefile  Sat Oct  2 22:12:41 2010(r213372)
@@ -4,7 +4,7 @@
 # Makefile for init_sysent
 
 all:
-   @echo "make tags, make links or make sysent only"
+   @echo "make sysent only"
 
 sysent: init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \
 ../sys/sysproto.h
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213493 - head/usr.bin/make

[Warner Losh]

Author: imp
Date: Wed Oct  6 20:49:45 2010
New Revision: 213493
URL: http://svn.freebsd.org/changeset/base/213493

Log:
  Use more portable errx instead of errc.  The latter doesn't buy us
  anyting anyway, since the error EAGAIN's error message doesn't add
  anything to the error strings that are there now.

Modified:
  head/usr.bin/make/main.c

Modified: head/usr.bin/make/main.c
==
--- head/usr.bin/make/main.cWed Oct  6 20:35:07 2010(r213492)
+++ head/usr.bin/make/main.cWed Oct  6 20:49:45 2010(r213493)
@@ -686,11 +686,9 @@ check_make_level(void)
int level = (value == NULL) ? 0 : atoi(value);
 
if (level < 0) {
-   errc(2, EAGAIN, "Invalid value for recursion level (%d).",
-   level);
+   errx(2, "Invalid value for recursion level (%d).", level);
} else if (level > MKLVL_MAXVAL) {
-   errc(2, EAGAIN, "Max recursion level (%d) exceeded.",
-   MKLVL_MAXVAL);
+   errx(2, "Max recursion level (%d) exceeded.", MKLVL_MAXVAL);
} else {
char new_value[32];
sprintf(new_value, "%d", level + 1);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213494 - head/usr.bin/make

[Warner Losh]

Author: imp
Date: Wed Oct  6 20:54:17 2010
New Revision: 213494
URL: http://svn.freebsd.org/changeset/base/213494

Log:
  Remove hack needed by 6.x machines and older machines to run newer
  makes on FreeBSD/pc98.  The need for this hack has passed.  If you are
  one of the rare people that may need this, then you should setenv
  MACHINE=pc98 as a workaround.

Modified:
  head/usr.bin/make/main.c

Modified: head/usr.bin/make/main.c
==
--- head/usr.bin/make/main.cWed Oct  6 20:49:45 2010(r213493)
+++ head/usr.bin/make/main.cWed Oct  6 20:54:17 2010(r213494)
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -931,26 +930,6 @@ main(int argc, char **argv)
 #endif
 
/*
-* Prior to 7.0, FreeBSD/pc98 kernel used to set the
-* utsname.machine to "i386", and MACHINE was defined as
-* "i386", so it could not be distinguished from FreeBSD/i386.
-* Therefore, we had to check machine.ispc98 and adjust the
-* MACHINE variable.  NOTE: The code is still here to be able
-* to compile new make binary on old FreeBSD/pc98 systems, and
-* have the MACHINE variable set properly.
-*/
-   if ((machine = getenv("MACHINE")) == NULL) {
-   int ispc98;
-   size_t  len;
-
-   len = sizeof(ispc98);
-   if (!sysctlbyname("machdep.ispc98", &ispc98, &len, NULL, 0)) {
-   if (ispc98)
-   machine = "pc98";
-   }
-   }
-
-   /*
 * Get the name of this type of MACHINE from utsname
 * so we can share an executable for similar machines.
 * (i.e. m68k: amiga hp300, mac68k, sun3, ...)
@@ -958,7 +937,7 @@ main(int argc, char **argv)
 * Note that both MACHINE and MACHINE_ARCH are decided at
 * run-time.
 */
-   if (machine == NULL) {
+   if ((machine = getenv("MACHINE")) == NULL) {
static struct utsname utsname;
 
if (uname(&utsname) == -1)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213646 - head/sbin/devd

[Warner Losh]

Author: imp
Date: Sat Oct  9 07:29:13 2010
New Revision: 213646
URL: http://svn.freebsd.org/changeset/base/213646

Log:
  Allow the kernel to generate more spacy things and still have devd
  cope.  Skip multiple spaces in a few contexts.
  
  PR:   96854
  Submitted by: Shin'ya Kumabuchi
  MFC after:1 week

Modified:
  head/sbin/devd/devd.cc

Modified: head/sbin/devd/devd.cc
==
--- head/sbin/devd/devd.cc  Sat Oct  9 05:57:23 2010(r213645)
+++ head/sbin/devd/devd.cc  Sat Oct  9 07:29:13 2010(r213646)
@@ -749,9 +749,13 @@ process_event(char *buffer)
if (sp == NULL)
return; /* Can't happen? */
*sp++ = '\0';
+   while (isspace(*sp))
+   sp++;
if (strncmp(sp, "at ", 3) == 0)
sp += 3;
sp = cfg.set_vars(sp);
+   while (isspace(*sp))
+   sp++;
if (strncmp(sp, "on ", 3) == 0)
cfg.set_variable("bus", sp + 3);
break;
@@ -762,9 +766,13 @@ process_event(char *buffer)
return; /* Can't happen? */
*sp++ = '\0';
cfg.set_variable("device-name", buffer);
+   while (isspace(*sp))
+   sp++;
if (strncmp(sp, "at ", 3) == 0)
sp += 3;
sp = cfg.set_vars(sp);
+   while (isspace(*sp))
+   sp++;
if (strncmp(sp, "on ", 3) == 0)
cfg.set_variable("bus", sp + 3);
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213647 - in head/usr.sbin/pc-sysinstall: backend examples

[Warner Losh]

Author: imp
Date: Sat Oct  9 07:45:24 2010
New Revision: 213647
URL: http://svn.freebsd.org/changeset/base/213647

Log:
  Enable softupdate + journals support.
  
  PR: 150862
  Submitted by: Kris Moore

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
  head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
  head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
  head/usr.sbin/pc-sysinstall/examples/README

Modified: head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh   Sat Oct  9 
07:29:13 2010(r213646)
+++ head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh   Sat Oct  9 
07:45:24 2010(r213647)
@@ -217,7 +217,7 @@ setup_mbr_partitions()
   
   # Now check that these values are sane
   case $FS in
-UFS|UFS+S|UFS+J|ZFS|SWAP) ;;
+UFS|UFS+S|UFS+J||UFS+SUJ|ZFS|SWAP) ;;
*) exit_err "ERROR: Invalid file system specified on $line" ;;
   esac
 
@@ -261,7 +261,7 @@ setup_mbr_partitions()
 check_for_mount "${MNT}" "/boot"
 if [ "${?}" = "0" ] ; then
   USINGBOOTPART="0" ; export USINGBOOTPART
-  if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ]
+  if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a 
"${FS}" != "UFS+SUJ" ]
   then
 exit_err "/boot partition must be formatted with UFS"
   fi
@@ -401,7 +401,7 @@ setup_gpt_partitions()
   
   # Now check that these values are sane
   case $FS in
-UFS|UFS+S|UFS+J|ZFS|SWAP) ;;
+UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP) ;;
*) exit_err "ERROR: Invalid file system specified on $line" ;;
   esac
 
@@ -438,7 +438,7 @@ setup_gpt_partitions()
   if [ "${?}" = "0" ] ; then
 if [ "${CURPART}" = "2" ] ; then
   USINGBOOTPART="0" ; export USINGBOOTPART
-  if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" ]
+  if [ "${FS}" != "UFS" -a "${FS}" != "UFS+S" -a "${FS}" != "UFS+J" -a 
"${FS}" != "UFS+SUJ" ]
   then
 exit_err "/boot partition must be formatted with UFS"
   fi

Modified: head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh  Sat Oct  9 
07:29:13 2010(r213646)
+++ head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh  Sat Oct  9 
07:45:24 2010(r213647)
@@ -124,6 +124,7 @@ mount_all_filesystems()
   case ${PARTFS} in
 UFS) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
 UFS+S) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
+UFS+SUJ) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" 
;;
 UFS+J) mount_partition ${PART}${EXT}.journal ${PARTFS} ${PARTMNT} 
"async,noatime" ;;
 ZFS) mount_partition ${PART} ${PARTFS} ${PARTMNT} ;;
 *) exit_err "ERROR: Got unknown file-system type $PARTFS" ;;
@@ -158,6 +159,7 @@ mount_all_filesystems()
case ${PARTFS} in
  UFS) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
  UFS+S) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" ;;
+ UFS+SUJ) mount_partition ${PART}${EXT} ${PARTFS} ${PARTMNT} "noatime" 
;;
  UFS+J) mount_partition ${PART}${EXT}.journal ${PARTFS} ${PARTMNT} 
"async,noatime" ;;
  ZFS) mount_partition ${PART} ${PARTFS} ${PARTMNT} ;;
  SWAP)

Modified: head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh  Sat Oct  9 
07:29:13 2010(r213646)
+++ head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh  Sat Oct  9 
07:45:24 2010(r213647)
@@ -154,6 +154,25 @@ setup_filesystems()
 sleep 2
 ;;
 
+  UFS+SUJ)
+echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
+sleep 2
+rc_halt "newfs -U /dev/${PART}${EXT}"
+sleep 2
+rc_halt "sync"
+rc_halt "tunefs -j enable /dev/${PART}${EXT}"
+sleep 2
+rc_halt "sync"
+rc_halt "glabel label ${PARTLABEL} /dev/${PART}${EXT}"
+rc_halt "sync"
+   # Set flag that we've found a boot partition
+   if [ "$PARTMNT" = "/boot" -o "${PARTMNT}" = "/" ] ; then
+  HAVEBOOT="YES"
+fi
+sleep 2
+;;
+
+
   UFS+J)
 echo_log "NEWFS: /dev/${PART} - ${PARTFS}"
 sleep 2

Modified: head/usr.sbin/pc-sysinstall/backend/functions-unmount.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-unm

svn commit: r213649 - head/usr.sbin/pc-sysinstall/backend

[Warner Losh]

Author: imp
Date: Sat Oct  9 08:39:14 2010
New Revision: 213649
URL: http://svn.freebsd.org/changeset/base/213649

Log:
  Fix typo: thanks Kris for pointing this out.

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh   Sat Oct  9 
08:07:49 2010(r213648)
+++ head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh   Sat Oct  9 
08:39:14 2010(r213649)
@@ -217,7 +217,7 @@ setup_mbr_partitions()
   
   # Now check that these values are sane
   case $FS in
-UFS|UFS+S|UFS+J||UFS+SUJ|ZFS|SWAP) ;;
+UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP) ;;
*) exit_err "ERROR: Invalid file system specified on $line" ;;
   esac
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r213650 - in head/usr.sbin/pc-sysinstall: backend conf examples

[Warner Losh]

Author: imp
Date: Sat Oct  9 08:52:09 2010
New Revision: 213650
URL: http://svn.freebsd.org/changeset/base/213650

Log:
  Initial patches to install images...
  
  PR: 150921

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
  head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
  head/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh
  head/usr.sbin/pc-sysinstall/backend/functions-newfs.sh
  head/usr.sbin/pc-sysinstall/backend/functions.sh
  head/usr.sbin/pc-sysinstall/backend/parseconfig.sh
  head/usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf
  head/usr.sbin/pc-sysinstall/examples/README

Modified: head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh   Sat Oct  9 
08:39:14 2010(r213649)
+++ head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh   Sat Oct  9 
08:52:09 2010(r213650)
@@ -165,7 +165,6 @@ setup_mbr_partitions()
   WRKSLICE="$2"
   FOUNDPARTS="1"
 
-
   # Lets setup the BSDLABEL
   BSDLABEL="${TMPDIR}/bsdLabel-${WRKSLICE}"
   export BSDLABEL
@@ -193,6 +192,11 @@ setup_mbr_partitions()
   SIZE=`echo $STRING | tr -s '\t' ' ' | cut -d ' ' -f 2` 
   MNT=`echo $STRING | tr -s '\t' ' ' | cut -d ' ' -f 3` 
 
+  if echo $STRING | grep -E '^/.+' >/dev/null 2>&1
+  then
+IMAGE=`echo ${STRING} | cut -f1 -d' '`
+  fi
+
   # Check if we have a .eli extension on this FS
   echo ${FS} | grep ".eli" >/dev/null 2>/dev/null
   if [ "$?" = "0" ]
@@ -254,7 +258,7 @@ setup_mbr_partitions()
 # Check if we found a valid root partition
 check_for_mount "${MNT}" "/"
 if [ "$?" = "0" ] ; then
-FOUNDROOT="0" ; export FOUNDROOT
+  FOUNDROOT="0" ; export FOUNDROOT
 fi
 
 # Check if we have a "/boot" instead
@@ -267,7 +271,7 @@ setup_mbr_partitions()
   fi
 fi
 
-  else
+   else
 # Done with the a: partitions
 
 # Check if we found a valid root partition not on a:
@@ -306,7 +310,7 @@ setup_mbr_partitions()
   fi
 
   # Save this data to our partition config dir
-  echo "${FS}:${MNT}:${ENC}:${PLABEL}:MBR:${XTRAOPTS}" 
>${PARTDIR}/${WRKSLICE}${PARTLETTER}
+  echo "${FS}:${MNT}:${ENC}:${PLABEL}:MBR:${XTRAOPTS}:${IMAGE}" 
>${PARTDIR}/${WRKSLICE}${PARTLETTER}
 
   # If we have a enc password, save it as well
   if [ ! -z "${ENCPASS}" ] ; then
@@ -327,6 +331,8 @@ setup_mbr_partitions()
 *) exit_err "ERROR: bsdlabel only supports up to letter h for 
partitions." ;;
   esac
 
+  unset IMAGE
+
 fi # End of subsection locating a slice in config
 
 echo $line | grep "^commitDiskLabel" >/dev/null 2>/dev/null
@@ -567,7 +573,7 @@ setup_disk_label()
 {
   # We are ready to start setting up the label, lets read the config and do 
the actions
   # First confirm that we have a valid WORKINGSLICES
-  if [ -z "${WORKINGSLICES}" -a -z "${WORKINGIMAGES}" ]; then
+  if [ -z "${WORKINGSLICES}" ]; then
 exit_err "ERROR: No slices were setup! Please report this to the 
maintainers"
   fi
 
@@ -612,12 +618,6 @@ setup_disk_label()
 populate_disk_label "${i}"
   done
 
-  for i in $WORKINGIMAGES
-  do
-image=`echo "${i}"|cut -f2 -d:`
-check_image_layout "${image}" 
-  done
-
   # Check if we made a root partition
   if [ "$FOUNDROOT" = "-1" ]
   then
@@ -653,7 +653,7 @@ check_fstab_mbr()
   then
 PARTLETTER=`echo "$SLICE" | sed -E 's|^.+([a-h])$|\1|'`
 
-grep -E '^.+ +/ +' "${FSTAB}" >/dev/null 2>&1
+cat "${FSTAB}" | awk '{ print $2 }' | grep -E '^/$' >/dev/null 2>&1
 if [ "$?" = "0" ]
 then
   if [ "${PARTLETTER}" = "a" ]
@@ -662,10 +662,14 @@ check_fstab_mbr()
   else
 FOUNDROOT="1"
   fi
+
+  ROOTIMAGE="1"
+
   export FOUNDROOT
+  export ROOTIMAGE
 fi
 
-grep -E '^.+ +/boot +' "${FSTAB}" >/dev/null 2>&1
+cat "${FSTAB}" | awk '{ print $2 }' | grep -E '^/boot$' >/dev/null 2>&1
 if [ "$?" = "0" ]
 then
   if [ "${PARTLETTER}" = "a" ]
@@ -700,7 +704,7 @@ check_fstab_gpt()
   then
 PARTNUMBER=`echo "${SLICE}" | sed -E 's|^.+p([0-9]*)$|\1|'`
 
-grep -E '^.+ +/ +' "${FSTAB}" >/dev/null 2>&1
+cat "${FSTAB}" | awk '{ print $2 }' | grep -E '^/$' >/dev/null 2>&1
 if [ "$?" = "0" ]
 then
   if [ "${PARTNUMBER}" = "2" ]
@@ -709,10 +713,14 @@ check_fstab_gpt()
   else
 FOUNDROOT="1"
   fi
+
+  ROOTIMAGE="1"
+
   export FOUNDROOT
+  export ROOTIMAGE
 fi
 
-grep -E '^.+ +/boot +' "${FSTAB}" >/dev/null 2>&1
+cat "${FSTAB}" | awk '{ print $2 }' | grep -E '^/boot$' >/dev/null 2>&1
 if [ "$?" = "0" ]
 then
   if [ "${PARTNUMBER}" = "2" ]
@@ -731,42 +739,45 @@ check_fstab_gpt()
   return 1
 };
 
-check_image_layout()
+check_disk_layout()
 {
   local SLICES
-  local IMA

svn commit: r213784 - head/lib/libz

[Warner Losh]

Author: imp
Date: Wed Oct 13 16:34:08 2010
New Revision: 213784
URL: http://svn.freebsd.org/changeset/base/213784

Log:
  Revert 212517 to restore pristine state of this file

Modified:
  head/lib/libz/minigzip.c

Modified: head/lib/libz/minigzip.c
==
--- head/lib/libz/minigzip.cWed Oct 13 16:30:41 2010(r213783)
+++ head/lib/libz/minigzip.cWed Oct 13 16:34:08 2010(r213784)
@@ -13,8 +13,6 @@
  * or in pipe mode.
  */
 
-#include 
-__FBSDID("$FreeBSD$");
 /* @(#) $Id$ */
 
 #include "zlib.h"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r213845 - head/sys/dev/aic7xxx/aicasm

[Warner Losh]

From: John Baldwin 
Subject: Re: svn commit: r213845 - head/sys/dev/aic7xxx/aicasm
Date: Fri, 15 Oct 2010 08:45:22 -0400

> On Thursday, October 14, 2010 5:09:58 pm Dimitry Andric wrote:
> > On 2010-10-14 21:39, John Baldwin wrote:
> > > On Thursday, October 14, 2010 3:19:19 pm Rui Paulo wrote:
> > ...
> > >>Revert r213765. This is required because our build infrastructure uses
> > >>the host lex instead of the lex built during buildworld. I will MFC 
> > >> the
> > >>lex changes soon and in a few weeks this I'll commit again r213765.
> > > Can't you make 'lex' a build-tool to workaround this?
> > 
> > That will not help for "cd conf/CONF && make kernel", apparently.  It
> > will always use the host lex.
> 
> Well, yes, but that is always true.  build-tools are only used for
> buildkernel.  However, if an 8.x lex cannot build a 9.x kernel, then having
> lex be a build-tool (or cross-tool, ru@ knows which category better than I)
> will let a 'make kernel-toolchain' followed by 'make buildkernel' of a 9.x
> source tree work on an 8.x host.

Agreed.  Just because it doesn't fix one case doesn't invalidate the
usefulness for the other.

In general, we support the config FOO method of building only on
kernels that are "close" versions to the host...

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r213845 - head/sys/dev/aic7xxx/aicasm

[Warner Losh]

From: Rui Paulo 
Subject: Re: svn commit: r213845 - head/sys/dev/aic7xxx/aicasm
Date: Fri, 15 Oct 2010 19:50:46 +0100

> On 15 Oct 2010, at 13:45, John Baldwin wrote:
> 
> > On Thursday, October 14, 2010 5:09:58 pm Dimitry Andric wrote:
> >> On 2010-10-14 21:39, John Baldwin wrote:
> >>> On Thursday, October 14, 2010 3:19:19 pm Rui Paulo wrote:
> >> ...
>    Revert r213765. This is required because our build infrastructure uses
>    the host lex instead of the lex built during buildworld. I will MFC the
>    lex changes soon and in a few weeks this I'll commit again r213765.
> >>> Can't you make 'lex' a build-tool to workaround this?
> >> 
> >> That will not help for "cd conf/CONF && make kernel", apparently.  It
> >> will always use the host lex.
> > 
> > Well, yes, but that is always true.  build-tools are only used for
> > buildkernel.  However, if an 8.x lex cannot build a 9.x kernel, then having
> > lex be a build-tool (or cross-tool, ru@ knows which category better than I)
> > will let a 'make kernel-toolchain' followed by 'make buildkernel' of a 9.x
> > source tree work on an 8.x host.
> 
> Yes, but I was told that 'cd conf/CONF && make kernel' is a supported 
> configuration (without requiring kernel-toolchain first).

Only on "similar" versions...

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214138 - head/usr.sbin/pc-sysinstall/backend

[Warner Losh]

Author: imp
Date: Thu Oct 21 17:14:44 2010
New Revision: 214138
URL: http://svn.freebsd.org/changeset/base/214138

Log:
  This small patch updates the "geli setkey" flags pc-sysinstall uses
  when saving a users passphrase, to make it work in HEAD with recent
  geli improvements.
  
  Submitted by: Kris Moore
  PR: 151002

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-cleanup.shThu Oct 21 
17:05:15 2010(r214137)
+++ head/usr.sbin/pc-sysinstall/backend/functions-cleanup.shThu Oct 21 
17:14:44 2010(r214138)
@@ -296,7 +296,7 @@ setup_geli_loading()
 
  # If we have a passphrase, set it up now
  if [ -e "${PARTDIR}-enc/${PART}-encpass" ] ; then
-   cat ${PARTDIR}-enc/${PART}-encpass | geli setkey -S -n 0 -p -k 
${KEYFILE} -K ${KEYFILE} ${PART}
+   geli setkey -J ${PARTDIR}-enc/${PART}-encpass -n 0 -p -k ${KEYFILE} -K 
${KEYFILE} ${PART}
geli configure -b ${PART}
  fi
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214139 - head/usr.sbin/pc-sysinstall/backend

[Warner Losh]

Author: imp
Date: Thu Oct 21 17:20:37 2010
New Revision: 214139
URL: http://svn.freebsd.org/changeset/base/214139

Log:
  This is an updated patch to the last patch to do this which fixes a
  local variable issue. This patch decompresses compressed images to the
  stdout when writing to a device to avoid running out of space issues.
  
  Submitted by: John Hixson
  Pr: 151049

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions.shThu Oct 21 17:14:44 
2010(r214138)
+++ head/usr.sbin/pc-sysinstall/backend/functions.shThu Oct 21 17:20:37 
2010(r214139)
@@ -325,64 +325,8 @@ get_compression_type()
   export VAL
 }
 
-decompress_file()
-{
-  local FILE
-  local COMPRESSION
-
-  FILE="$1"
-  COMPRESSION="$2"
-
-  if [ -n "${COMPRESSION}" ]
-  then
-case "${COMPRESSION}" in
-  lzw)
-rc_halt "uncompress ${FILE}"
-VAL="${FILE%.Z}"
-;;
-
-  lzo)
-rc_halt "lzop -d ${FILE}"
-VAL="${FILE%.lzo}"
-;;
-
-  lzma)
-rc_halt "lzma -d ${FILE}"
-VAL="${FILE%.lzma}"
-;;
-
-  gzip)
-rc_halt "gunzip ${FILE}"
-VAL="${FILE%.gz}"
-;;
-
-  bzip2)
-rc_halt "bunzip2 ${FILE}"
-VAL="${FILE%.bz2}"
-;;
-
-  xz)
-rc_halt "xz -d ${FILE}"
-VAL="${FILE%.xz}"
-;;
-
-  zip)
-rc_halt "unzip ${FILE}"
-VAL="${FILE%.zip}"
-;;
-
-  *) 
-exit_err "ERROR: ${COMPRESSION} compression is not supported"
-;;
-esac
-  fi
-
-  export VAL
-}
-
 write_image()
 {
-  local IMAGE_FILE
   local DEVICE_FILE
 
   IMAGE_FILE="$1"
@@ -418,11 +362,51 @@ write_image()
 get_compression_type "${IMAGE_FILE}"
COMPRESSION="${VAL}"
 
-   decompress_file "${IMAGE_FILE}" "${COMPRESSION}"
-   IMAGE_FILE="${VAL}"
-  fi
+case "${COMPRESSION}" in
+  lzw)
+rc_halt "uncompress ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+IMAGE_FILE="${IMAGE_FILE%.Z}"
+;;
+
+  lzo)
+rc_halt "lzop -d $IMAGE_{FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+IMAGE_FILE="${IMAGE_FILE%.lzo}"
+;;
+
+  lzma)
+rc_halt "lzma -d ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+IMAGE_FILE="${IMAGE_FILE%.lzma}"
+;;
+
+  gzip)
+rc_halt "gunzip ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+IMAGE_FILE="${IMAGE_FILE%.gz}"
+;;
 
-  rc_halt "dd if=${IMAGE_FILE} of=${DEVICE_FILE} bs=128k"
+  bzip2)
+rc_halt "bunzip2 ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+IMAGE_FILE="${IMAGE_FILE%.bz2}"
+;;
+
+  xz)
+rc_halt "xz -d ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+IMAGE_FILE="${IMAGE_FILE%.xz}"
+;;
+
+  zip)
+rc_halt "unzip ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+IMAGE_FILE="${IMAGE_FILE%.zip}"
+;;
+
+  *) 
+exit_err "ERROR: ${COMPRESSION} compression is not supported"
+;;
+esac
+
+  else
+rc_halt "dd if=${IMAGE_FILE} of=${DEVICE_FILE} bs=128k"
+
+  fi
 };
 
 install_fresh()
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214141 - head/usr.sbin/pc-sysinstall/backend-query

[Warner Losh]

Author: imp
Date: Thu Oct 21 17:23:48 2010
New Revision: 214141
URL: http://svn.freebsd.org/changeset/base/214141

Log:
  This patch will only list components if the directory exists. The
  directory exist on PC-BSD but not FreeBSD, so an extra check is made.
  
  Submitted by: John Hixson
  PR: 151461

Modified:
  head/usr.sbin/pc-sysinstall/backend-query/list-components.sh

Modified: head/usr.sbin/pc-sysinstall/backend-query/list-components.sh
==
--- head/usr.sbin/pc-sysinstall/backend-query/list-components.shThu Oct 
21 17:23:09 2010(r214140)
+++ head/usr.sbin/pc-sysinstall/backend-query/list-components.shThu Oct 
21 17:23:48 2010(r214141)
@@ -32,23 +32,24 @@
 
 echo "Available Components:"
 
-cd ${COMPDIR}
-for i in `ls -d *`
-do
-  if [ -e "${i}/component.cfg" -a -e "${i}/install.sh" -a -e "${i}/distfiles" ]
-  then
-NAME="`grep 'name:' ${i}/component.cfg | cut -d ':' -f 2`"
-DESC="`grep 'description:' ${i}/component.cfg | cut -d ':' -f 2`"
-TYPE="`grep 'type:' ${i}/component.cfg | cut -d ':' -f 2`"
-echo " "
-echo "name: ${i}"
-echo "desc:${DESC}"
-echo "type:${TYPE}"
-if [ -e "${i}/component.png" ]
+if [ -d "${COMPDIR}" ]
+then
+  cd ${COMPDIR}
+  for i in `ls -d *`
+  do
+if [ -e "${i}/component.cfg" -a -e "${i}/install.sh" -a -e 
"${i}/distfiles" ]
 then
-  echo "icon: ${COMPDIR}/${i}/component.png"
+  NAME="`grep 'name:' ${i}/component.cfg | cut -d ':' -f 2`"
+  DESC="`grep 'description:' ${i}/component.cfg | cut -d ':' -f 2`"
+  TYPE="`grep 'type:' ${i}/component.cfg | cut -d ':' -f 2`"
+  echo " "
+  echo "name: ${i}"
+  echo "desc:${DESC}"
+  echo "type:${TYPE}"
+  if [ -e "${i}/component.png" ]
+  then
+echo "icon: ${COMPDIR}/${i}/component.png"
+  fi
 fi
-  fi
-
-done
-
+  done
+fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214143 - head/usr.sbin/pc-sysinstall/backend

[Warner Losh]

Author: imp
Date: Thu Oct 21 17:29:18 2010
New Revision: 214143
URL: http://svn.freebsd.org/changeset/base/214143

Log:
  Left over from prior patch removed.
  
  Submitted by: John Hixon
  PR: 151442 (but the patch was backwards there)

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-disk.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-disk.sh   Thu Oct 21 
17:27:39 2010(r214142)
+++ head/usr.sbin/pc-sysinstall/backend/functions-disk.sh   Thu Oct 21 
17:29:18 2010(r214143)
@@ -507,17 +507,6 @@ setup_disk_slice()
DEST="${DISK}"
   fi 
 
-  if iscompressed "${IMAGE}"
-  then
-local COMPRESSION
-  
-get_compression_type "${IMAGE}"
-COMPRESSION="${VAL}"
-  
-decompress_file "${IMAGE}" "${COMPRESSION}"
-IMAGE="${VAL}"
-  fi
-
   write_image "${IMAGE}" "${DEST}"
   check_disk_layout "${DEST}"
fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214187 - head/usr.sbin/pc-sysinstall/backend

[Warner Losh]

Author: imp
Date: Thu Oct 21 22:33:50 2010
New Revision: 214187
URL: http://svn.freebsd.org/changeset/base/214187

Log:
  Minor tweaks in compression support:
  o We need an eval here to get the right expansion of the command
  o bs=128k doesn't work in some cases, so eliminate it and cope with the
minor performance hit.
  
  Submitted by: john hixson

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions.shThu Oct 21 22:18:12 
2010(r214186)
+++ head/usr.sbin/pc-sysinstall/backend/functions.shThu Oct 21 22:33:50 
2010(r214187)
@@ -138,7 +138,7 @@ rc_halt()
   fi
 
   echo "Running: ${CMD}" >>${LOGOUT}
-  ${CMD} >>${LOGOUT} 2>>${LOGOUT}
+  eval ${CMD} >>${LOGOUT} 2>>${LOGOUT}
   STATUS="$?"
   if [ "${STATUS}" != "0" ]
   then
@@ -364,37 +364,37 @@ write_image()
 
 case "${COMPRESSION}" in
   lzw)
-rc_halt "uncompress ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+rc_halt "uncompress ${IMAGE_FILE} -c | dd of=${DEVICE_FILE}"
 IMAGE_FILE="${IMAGE_FILE%.Z}"
 ;;
 
   lzo)
-rc_halt "lzop -d $IMAGE_{FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+rc_halt "lzop -d $IMAGE_{FILE} -c | dd of=${DEVICE_FILE}"
 IMAGE_FILE="${IMAGE_FILE%.lzo}"
 ;;
 
   lzma)
-rc_halt "lzma -d ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+rc_halt "lzma -d ${IMAGE_FILE} -c | dd of=${DEVICE_FILE}"
 IMAGE_FILE="${IMAGE_FILE%.lzma}"
 ;;
 
   gzip)
-rc_halt "gunzip ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+rc_halt "gunzip ${IMAGE_FILE} -c | dd of=${DEVICE_FILE}"
 IMAGE_FILE="${IMAGE_FILE%.gz}"
 ;;
 
   bzip2)
-rc_halt "bunzip2 ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+rc_halt "bunzip2 ${IMAGE_FILE} -c | dd of=${DEVICE_FILE}"
 IMAGE_FILE="${IMAGE_FILE%.bz2}"
 ;;
 
   xz)
-rc_halt "xz -d ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+rc_halt "xz -d ${IMAGE_FILE} -c | dd of=${DEVICE_FILE}"
 IMAGE_FILE="${IMAGE_FILE%.xz}"
 ;;
 
   zip)
-rc_halt "unzip ${IMAGE_FILE} -c | dd of=${DEVICE_FILE} bs=128k"
+rc_halt "unzip ${IMAGE_FILE} -c | dd of=${DEVICE_FILE}"
 IMAGE_FILE="${IMAGE_FILE%.zip}"
 ;;
 
@@ -404,7 +404,7 @@ write_image()
 esac
 
   else
-rc_halt "dd if=${IMAGE_FILE} of=${DEVICE_FILE} bs=128k"
+rc_halt "dd if=${IMAGE_FILE} of=${DEVICE_FILE}"
 
   fi
 };
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214188 - head/usr.sbin/pc-sysinstall/backend

[Warner Losh]

Author: imp
Date: Thu Oct 21 22:46:10 2010
New Revision: 214188
URL: http://svn.freebsd.org/changeset/base/214188

Log:
  More support for IMAGE installations

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh   Thu Oct 21 
22:33:50 2010(r214187)
+++ head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh   Thu Oct 21 
22:46:10 2010(r214188)
@@ -219,9 +219,17 @@ setup_mbr_partitions()
 USINGENCROOT="0" ; export USINGENCROOT
   fi
   
+  if [ -n "${IMAGE}" ]
+  then
+FS="IMAGE"
+SIZE=`ls -l "${IMAGE}" | awk '{ print $5 }'`
+MNT=`echo $STRING | tr -s '\t' ' ' | cut -d ' ' -f 2`
+   SIZE=`convert_byte_to_megabyte $SIZE`
+  fi
+
   # Now check that these values are sane
   case $FS in
-UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP) ;;
+UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP|IMAGE) ;;
*) exit_err "ERROR: Invalid file system specified on $line" ;;
   esac
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214189 - head/usr.sbin/pc-sysinstall/backend

[Warner Losh]

Author: imp
Date: Thu Oct 21 23:08:42 2010
New Revision: 214189
URL: http://svn.freebsd.org/changeset/base/214189

Log:
  Fix two typos
  
  Submitted by: Benedict Reuschling

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh   Thu Oct 
21 22:46:10 2010(r214188)
+++ head/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh   Thu Oct 
21 23:08:42 2010(r214189)
@@ -70,7 +70,7 @@ start_extract_uzip_tar()
   if [ "$?" != "0" ]
   then
 cd /
-echo "TAR failure occured:" >>${LOGOUT}
+echo "TAR failure occurred:" >>${LOGOUT}
 cat ${FSMNT}/.tar-extract.log | grep "tar:" >>${LOGOUT}
 umount ${FSMNT}.uzip
 mdconfig -d -u ${MDDEVICE}
@@ -275,7 +275,7 @@ EOF
   INSFILE="${OUTFILE}" ; export INSFILE
 }
 
-# Function which does the rsync download from the server specifed in cfg
+# Function which does the rsync download from the server specified in cfg
 start_rsync_copy()
 {
   # Load our rsync config values
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214191 - head/usr.sbin/pc-sysinstall/backend-query

[Warner Losh]

Author: imp
Date: Fri Oct 22 00:10:48 2010
New Revision: 214191
URL: http://svn.freebsd.org/changeset/base/214191

Log:
  Remove unnecessary variable.
  
  Submitted by:  Alex Kozlov

Modified:
  head/usr.sbin/pc-sysinstall/backend-query/query-langs.sh

Modified: head/usr.sbin/pc-sysinstall/backend-query/query-langs.sh
==
--- head/usr.sbin/pc-sysinstall/backend-query/query-langs.shThu Oct 21 
23:45:57 2010(r214190)
+++ head/usr.sbin/pc-sysinstall/backend-query/query-langs.shFri Oct 22 
00:10:48 2010(r214191)
@@ -25,8 +25,6 @@
 #
 # $FreeBSD$
 
-FOUND="0"
-
 cat ${PROGDIR}/conf/avail-langs
 
 exit 0
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214192 - head/usr.sbin/pc-sysinstall/backend-query

[Warner Losh]

Author: imp
Date: Fri Oct 22 00:11:55 2010
New Revision: 214192
URL: http://svn.freebsd.org/changeset/base/214192

Log:
  More simplifications
  
  Submitted by:  Alex Kozlov

Modified:
  head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
  head/usr.sbin/pc-sysinstall/backend-query/test-live.sh

Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
==
--- head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh  Fri Oct 22 
00:10:48 2010(r214191)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh  Fri Oct 22 
00:11:55 2010(r214192)
@@ -26,25 +26,16 @@
 # $FreeBSD$
 
 # Query a disk for partitions and display them
-#
+#
 
-. ${PROGDIR}/backend/functions.sh
 . ${PROGDIR}/backend/functions-disk.sh
 
-if [ -z "${1}" ]
-then
-  echo "Error: No disk specified!"
-  exit 1
-fi
-
-if [ ! -e "/dev/${1}" ]
-then
-  echo "Error: Disk /dev/${1} does not exist!"
-  exit 1
-fi
-
 DISK="${1}"
 
+[ -z "${DISK}" ] && { echo 'Error: No disk specified!'; exit 1; }
+[ ! -e "/dev/${DISK}" ] && \
+   { echo "Error: Disk /dev/${DISK} does not exist!"; exit 1; }
+
 get_disk_cyl "${DISK}"
 CYLS="${VAL}"
 

Modified: head/usr.sbin/pc-sysinstall/backend-query/test-live.sh
==
--- head/usr.sbin/pc-sysinstall/backend-query/test-live.sh  Fri Oct 22 
00:10:48 2010(r214191)
+++ head/usr.sbin/pc-sysinstall/backend-query/test-live.sh  Fri Oct 22 
00:11:55 2010(r214192)
@@ -28,13 +28,6 @@
 # Script which checks if we are running from install media, or real system
 #
 
-dmesg | grep "md0: Preloaded image" >/dev/null 2>/dev/null
-if [ "$?" = "0" ]
-then
-  echo "INSTALL-MEDIA"
-  exit 0
-else
-  echo "REAL-DISK"
-  exit 1
-fi
+dmesg | grep -q 'md0: Preloaded image' || { echo 'REAL-DISK'; exit 1; }
 
+echo 'INSTALL-MEDIA'
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r214210 - head/sys/boot/i386/boot2

[Warner Losh]

>   Avoid using memcpy() for copying 32bit chunks. This shrinks
>   the resulting code a little.

I think I put the memcpy code in when I was porting to ARM to reduce
the diffs since it is needed there...

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r214210 - head/sys/boot/i386/boot2

[Warner Losh]

In message: <4cc1ebeb.2020...@freebsd.org>
Dimitry Andric  writes:
: On 2010-10-22 20:46, Warner Losh wrote:
: >>Avoid using memcpy() for copying 32bit chunks. This shrinks
: >>the resulting code a little.
: >
: > I think I put the memcpy code in when I was porting to ARM to reduce
: > the diffs since it is needed there...
: Due to alignment problems otherwise?

Yes.  At the time it didn't make a difference to the size of boot2.
Now I know that we're looking for every byte to trim...

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r214445 - head/usr.sbin/pc-sysinstall/backend-query

[Warner Losh]

Author: imp
Date: Thu Oct 28 06:45:20 2010
New Revision: 214445
URL: http://svn.freebsd.org/changeset/base/214445

Log:
  Turns out we need functions.sh in this file for convert_to_megabytes call.

Modified:
  head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh

Modified: head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
==
--- head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh  Thu Oct 28 
04:14:28 2010(r21)
+++ head/usr.sbin/pc-sysinstall/backend-query/disk-info.sh  Thu Oct 28 
06:45:20 2010(r214445)
@@ -28,6 +28,7 @@
 # Query a disk for partitions and display them
 #
 
+. ${PROGDIR}/backend/functions.sh
 . ${PROGDIR}/backend/functions-disk.sh
 
 DISK="${1}"
@@ -57,4 +58,3 @@ echo "heads=${HEADS}"
 echo "sectors=${SECS}"
 echo "size=${MB}"
 echo "type=${CTYPE}"
-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r227749 - head/sys/kern

[Warner Losh]

Is this right?  Passing 0 to timo causes a panic?  That can't be good.

Wanrer


On Nov 20, 2011, at 1:36 AM, Hans Petter Selasky wrote:

> Author: hselasky
> Date: Sun Nov 20 08:36:18 2011
> New Revision: 227749
> URL: http://svn.freebsd.org/changeset/base/227749
> 
> Log:
>  Given that the typical usage of pause() is pause("zzz", hz / N), where N can
>  be greater than hz in some cases, simply ignore a timeout value of zero.
> 
>  Suggested by:Bruce Evans
>  MFC after:   1 week
> 
> Modified:
>  head/sys/kern/kern_synch.c
> 
> Modified: head/sys/kern/kern_synch.c
> ==
> --- head/sys/kern/kern_synch.cSun Nov 20 08:29:23 2011
> (r227748)
> +++ head/sys/kern/kern_synch.cSun Nov 20 08:36:18 2011
> (r227749)
> @@ -333,7 +333,7 @@ msleep_spin(void *ident, struct mtx *mtx
> int
> pause(const char *wmesg, int timo)
> {
> - KASSERT(timo > 0, ("pause: timo must be > 0"));
> + KASSERT(timo >= 0, ("pause: timo must be >= 0"));
> 
>   /* silently convert invalid timeouts */
>   if (timo < 1)
> 
> 

___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228143 - in head: . share/mk tools/build/options

[Warner Losh]

[[ I know it is a bit late here ]]


On Nov 29, 2011, at 1:50 PM, Doug Barton wrote:

> On 11/29/2011 12:47, Gábor Kövesdán wrote:
>> On 2011.11.29. 20:46, Max Khon wrote:
>>> Log:
>>>   Turn off profiled libs build by default.
>>>   Can be enabled back using WITH_PROFILE=yes in /etc/src.conf
>> I think it was useful. Profiling is useful for developing any piece of
>> software that builds on libc or other common libs, even for software
>> that is not directly related to FreeBSD. I think it should be reverted.
> 
> Since we ask users to read -current, it would be useful if our
> developers did too. :)

But that's not the place to discuss this...  It should have gone through arch@ 
not current@

> As Max pointed out in his message about this, the profiled libs are only
> really useful to a tiny percentage of developers. If you need them,
> twist the knob. Building them should be off by default.

I can't profile my programs effectively without them.  Am I now forced to build 
profile libs with a full FreeBSD to get them?  Seems like a big step backwards.

Warner

___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228143 - in head: . share/mk tools/build/options

[Warner Losh]

On Nov 29, 2011, at 1:53 PM, Garrett Cooper wrote:

> 2011/11/29 Doug Barton :
>> On 11/29/2011 12:47, Gábor Kövesdán wrote:
>>> On 2011.11.29. 20:46, Max Khon wrote:
 Log:
Turn off profiled libs build by default.
Can be enabled back using WITH_PROFILE=yes in /etc/src.conf
>>> I think it was useful. Profiling is useful for developing any piece of
>>> software that builds on libc or other common libs, even for software
>>> that is not directly related to FreeBSD. I think it should be reverted.
>> 
>> Since we ask users to read -current, it would be useful if our
>> developers did too. :)
>> 
>> As Max pointed out in his message about this, the profiled libs are only
>> really useful to a tiny percentage of developers. If you need them,
>> twist the knob. Building them should be off by default.
> 
> +1. The needs of the many outweigh the needs of the few. As suggested
> elsewhere, I think it would also be a good idea to enable it in
> tinderbox builds.

-1.  The needs of the many?  Please.  Let's break a useful feature because some 
people don't understand it and are impatient?  That's lame.

Enabling it only on tinderbox builds will ensure more accidental breakage.

Warner


___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228143 - in head: . share/mk tools/build/options

[Warner Losh]

On Dec 20, 2011, at 2:21 AM, Garrett Cooper wrote:
> 
>The assumption (that isn't clearly stated) is that I am building
> things on suped up x86 hardware, not arm CPUs, Intel Atoms, etc. On
> those platforms building superfluous things still do matter (in
> particular because cross-building some things still isn't doable 100%
> of the time, but also because flash, some platter media, etc is slow).
> But I suppose I digress...

When is cross building not doable?  Please, give examples, not fud.

Warner


___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r228143 - in head: . share/mk tools/build/options

[Warner Losh]

On Dec 20, 2011, at 12:21 PM, Garrett Cooper wrote:

> On Tue, Dec 20, 2011 at 9:40 AM, Warner Losh  wrote:
>> 
>> On Dec 20, 2011, at 2:21 AM, Garrett Cooper wrote:
>> 
>> 
>>The assumption (that isn't clearly stated) is that I am building
>> things on suped up x86 hardware, not arm CPUs, Intel Atoms, etc. On
>> those platforms building superfluous things still do matter (in
>> particular because cross-building some things still isn't doable 100%
>> of the time, but also because flash, some platter media, etc is slow).
>> But I suppose I digress...
>> 
>> 
>> When is cross building not doable?  Please, give examples, not fud.
> 
> ports.

Which affects profiled libraries how?

Warner


___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215065 - head

[Warner Losh]

Author: imp
Date: Tue Nov  9 22:32:09 2010
New Revision: 215065
URL: http://svn.freebsd.org/changeset/base/215065

Log:
  Merge from tbemd:
  o TARGET=mips --> little endian 32-bit mips build
  o mipsel and mipseb TARGET_ARCH are both mips TARGETs
  o Add some more architecture combinations

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==
--- head/Makefile.inc1  Tue Nov  9 22:18:20 2010(r215064)
+++ head/Makefile.inc1  Tue Nov  9 22:32:09 2010(r215065)
@@ -118,16 +118,16 @@ VERSION+= ${OSRELDATE}
 
 # Guess machine architecture from machine type, and vice versa.
 .if !defined(TARGET_ARCH) && defined(TARGET)
-TARGET_ARCH=   ${TARGET:S/pc98/i386/:S/sun4v/sparc64/}
+TARGET_ARCH=   ${TARGET:S/pc98/i386/:S/sun4v/sparc64/:S/mips/mipsel/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
 ${TARGET_ARCH} != ${MACHINE_ARCH}
-TARGET=${TARGET_ARCH}
+TARGET=${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm}
 .endif
 # Otherwise, default to current machine type and architecture.
 TARGET?=   ${MACHINE}
 TARGET_ARCH?=  ${MACHINE_ARCH}
 
-KNOWN_ARCHES?= amd64 arm i386 i386/pc98 ia64 mips powerpc powerpc64/powerpc 
sparc64 sparc64/sun4v
+KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 mipsel/mips mipseb/mips 
powerpc powerpc64/powerpc sparc64 sparc64/sun4v
 .if ${TARGET} == ${TARGET_ARCH}
 _t=${TARGET}
 .else
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215068 - head/sys/mips/conf

[Warner Losh]

Author: imp
Date: Wed Nov 10 00:28:20 2010
New Revision: 215068
URL: http://svn.freebsd.org/changeset/base/215068

Log:
  rename SWARM_COMMON to std.SWARM so universe doesn't try to build it 
standalone

Added:
  head/sys/mips/conf/std.SWARM
 - copied unchanged from r215066, head/sys/mips/conf/SWARM_COMMON
Deleted:
  head/sys/mips/conf/SWARM_COMMON
Modified:
  head/sys/mips/conf/SWARM
  head/sys/mips/conf/SWARM64
  head/sys/mips/conf/SWARM64_SMP
  head/sys/mips/conf/SWARM_SMP

Modified: head/sys/mips/conf/SWARM
==
--- head/sys/mips/conf/SWARMTue Nov  9 23:53:47 2010(r215067)
+++ head/sys/mips/conf/SWARMWed Nov 10 00:28:20 2010(r215068)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-includeSWARM_COMMON
+includestd.SWARM
 
 ident  SWARM
 

Modified: head/sys/mips/conf/SWARM64
==
--- head/sys/mips/conf/SWARM64  Tue Nov  9 23:53:47 2010(r215067)
+++ head/sys/mips/conf/SWARM64  Wed Nov 10 00:28:20 2010(r215068)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-includeSWARM_COMMON
+includestd.SWARM
 
 ident  SWARM64
 

Modified: head/sys/mips/conf/SWARM64_SMP
==
--- head/sys/mips/conf/SWARM64_SMP  Tue Nov  9 23:53:47 2010
(r215067)
+++ head/sys/mips/conf/SWARM64_SMP  Wed Nov 10 00:28:20 2010
(r215068)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-includeSWARM_COMMON
+includestd.SWARM
 
 ident  SWARM64_SMP
 

Modified: head/sys/mips/conf/SWARM_SMP
==
--- head/sys/mips/conf/SWARM_SMPTue Nov  9 23:53:47 2010
(r215067)
+++ head/sys/mips/conf/SWARM_SMPWed Nov 10 00:28:20 2010
(r215068)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-includeSWARM_COMMON
+includestd.SWARM
 
 ident  SWARM_SMP
 

Copied: head/sys/mips/conf/std.SWARM (from r215066, 
head/sys/mips/conf/SWARM_COMMON)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/mips/conf/std.SWARMWed Nov 10 00:28:20 2010
(r215068, copy of r215066, head/sys/mips/conf/SWARM_COMMON)
@@ -0,0 +1,60 @@
+#
+# $FreeBSD$
+#
+
+files  "../sibyte/files.sibyte"
+hints  "SWARM.hints"
+
+optionsCFE
+optionsCFE_CONSOLE
+optionsCFE_ENV
+optionsALT_BREAK_TO_DEBUGGER
+
+cpuCPU_SB1
+
+makeoptionsDEBUG=-g#Build kernel with gdb(1) debug symbols
+makeoptionsMODULES_OVERRIDE=""
+
+optionsDDB
+optionsKDB
+
+optionsSCHED_4BSD  #4BSD scheduler
+optionsINET#InterNETworking
+optionsNFSCLIENT   #Network Filesystem Client
+optionsNFS_ROOT#NFS usable as /, requires 
NFSCLIENT
+optionsPSEUDOFS#Pseudo-filesystem framework
+options_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time 
extensions
+
+# Debugging for use in -current
+#options   DEADLKRES
+optionsINVARIANTS
+optionsINVARIANT_SUPPORT
+optionsWITNESS
+
+optionsFFS #Fast filesystem
+
+optionsKTRACE
+
+device pci
+device miibus
+device bge
+device loop
+device ether
+device md
+device random
+
+optionsUSB_DEBUG
+device usb
+device ohci
+device uhci
+device ehci
+
+device umass
+
+device scbus
+device da
+
+device ata
+device atadisk
+device atapicd
+optionsATA_STATIC_ID
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215069 - head/tools/tools/nanobsd

[Warner Losh]

Author: imp
Date: Wed Nov 10 00:39:42 2010
New Revision: 215069
URL: http://svn.freebsd.org/changeset/base/215069

Log:
  Document NANO_CFGDIR and NANO_DATADIR
  
  Submitted by: n_hibma@

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==
--- head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 00:28:20 2010
(r215068)
+++ head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 00:39:42 2010
(r215069)
@@ -153,6 +153,12 @@ NANO_LABEL=""
 
 NANO_ARCH=`uname -p`
 
+# Directory to populate /cfg from
+NANO_CFGDIR=""
+
+# Directory to populate /data from
+NANO_DATADIR=""
+
 ###
 #
 # The functions which do the real work.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215070 - head/tools/tools/nanobsd

[Warner Losh]

Author: imp
Date: Wed Nov 10 00:56:44 2010
New Revision: 215070
URL: http://svn.freebsd.org/changeset/base/215070

Log:
  Build make.conf when the world is not selected to build, but the
  kernel is.
  
  PR:   151696
  Submitted by: lev@

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==
--- head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 00:39:42 2010
(r215069)
+++ head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 00:56:44 2010
(r215070)
@@ -917,6 +917,9 @@ else
 fi
 
 if $do_kernel ; then
+   if ! $do_world ; then
+   make_conf_build
+   fi
build_kernel
 else
pprint 2 "Skipping buildkernel (as instructed)"
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215078 - head/usr.sbin/pc-sysinstall/backend

[Warner Losh]

Author: imp
Date: Wed Nov 10 05:32:36 2010
New Revision: 215078
URL: http://svn.freebsd.org/changeset/base/215078

Log:
  When we switched to the gpart backend, and provided selection between
  MBR & GPT, the MBR full-disk init failed to stamp boot1, and results
  in a boot not found error. This patch fixes the issue.
  
  PR:   151990
  Submitted by: Kris Moore

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-disk.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-disk.sh
==
--- head/usr.sbin/pc-sysinstall/backend/functions-disk.sh   Wed Nov 10 
05:22:12 2010(r215077)
+++ head/usr.sbin/pc-sysinstall/backend/functions-disk.sh   Wed Nov 10 
05:32:36 2010(r215078)
@@ -646,8 +646,11 @@ init_mbr_full_disk()
   rc_halt "dd if=/dev/zero of=/dev/${_intDISK}s1 count=1024"
   
   if [ "$_intBOOT" = "bsd" ] ; then
-echo_log "Stamping boot sector on ${_intDISK}"
+echo_log "Stamping boot0 on ${_intDISK}"
 rc_halt "gpart bootcode -b /boot/boot0 ${_intDISK}"
+  else
+echo_log "Stamping boot1 on ${_intDISK}"
+rc_halt "gpart bootcode -b /boot/boot1 ${_intDISK}"
   fi
 
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215081 - head/tools/tools/nanobsd

[Warner Losh]

Author: imp
Date: Wed Nov 10 06:24:16 2010
New Revision: 215081
URL: http://svn.freebsd.org/changeset/base/215081

Log:
  Insulate the nanobsd build from the current system by opting out of
  the SRCCONF processing.
  
  Noted by: gcopper@

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==
--- head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 05:54:05 2010
(r215080)
+++ head/tools/tools/nanobsd/nanobsd.sh Wed Nov 10 06:24:16 2010
(r215081)
@@ -182,6 +182,7 @@ make_conf_build ( ) (
 
echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_BUILD}
echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF_BUILD}
+   echo "_WITHOUT_SRCCONF=t" >> ${NANO_MAKE_CONF_BUILD}
 )
 
 build_world ( ) (
@@ -244,6 +245,7 @@ make_conf_install ( ) (
 
echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_INSTALL}
echo "${CONF_INSTALL}" >> ${NANO_MAKE_CONF_INSTALL}
+   echo "_WITHOUT_SRCCONF=t" >> ${NANO_MAKE_CONF_INSTALL}
 )
 
 install_world ( ) (
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215082 - in head: . gnu/lib/libgcc gnu/usr.bin/binutils gnu/usr.bin/binutils/as gnu/usr.bin/binutils/ld gnu/usr.bin/binutils/libbfd gnu/usr.bin/cc gnu/usr.bin/cc/cc_int gnu/usr.bin/cc/...

[Warner Losh]

Author: imp
Date: Wed Nov 10 06:39:49 2010
New Revision: 215082
URL: http://svn.freebsd.org/changeset/base/215082

Log:
  Complete the integration of tbemd branch into head.
  
  TARGET_BIG_ENDIAN is now completely dead, except where it was
  originally supposed to be used (internally in the toolchain building).
  
  TARGET_ARCH has changed in three cases:
  (1) Little endian mips has changed to mipsel.
  (2) Big endian mips has changed to mipseb.
  (3) Big endian arm has changed to armeb.
  
  Some additional changes are needed to make 'make universe' work on arm
  and mips after this change, so those are commented out for now.
  
  UPDATING information will be forthcoming.  Any remaining rough edges
  will be hammered out in -current.

Modified:
  head/Makefile
  head/gnu/lib/libgcc/Makefile
  head/gnu/usr.bin/binutils/Makefile.inc0
  head/gnu/usr.bin/binutils/as/Makefile
  head/gnu/usr.bin/binutils/ld/Makefile.arm
  head/gnu/usr.bin/binutils/ld/Makefile.mips
  head/gnu/usr.bin/binutils/libbfd/Makefile.arm
  head/gnu/usr.bin/binutils/libbfd/Makefile.mips
  head/gnu/usr.bin/cc/Makefile.inc
  head/gnu/usr.bin/cc/Makefile.tgt
  head/gnu/usr.bin/cc/cc_int/Makefile
  head/gnu/usr.bin/cc/cc_tools/Makefile
  head/gnu/usr.bin/gdb/Makefile.inc
  head/gnu/usr.bin/gdb/kgdb/Makefile
  head/gnu/usr.bin/gdb/libgdb/Makefile
  head/share/mk/bsd.cpu.mk
  head/share/mk/bsd.endian.mk
  head/sys/conf/Makefile.mips

Modified: head/Makefile
==
--- head/Makefile   Wed Nov 10 06:24:16 2010(r215081)
+++ head/Makefile   Wed Nov 10 06:39:49 2010(r215082)
@@ -281,7 +281,7 @@ tinderbox:
 # existing system is.
 #
 .if make(universe) || make(universe_kernels) || make(tinderbox)
-TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v
+TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v
 
 .if defined(DOING_TINDERBOX)
 FAILFILE=tinderbox.failed

Modified: head/gnu/lib/libgcc/Makefile
==
--- head/gnu/lib/libgcc/MakefileWed Nov 10 06:24:16 2010
(r215081)
+++ head/gnu/lib/libgcc/MakefileWed Nov 10 06:39:49 2010
(r215082)
@@ -27,7 +27,7 @@ CFLAGS+=  -DIN_GCC -DIN_LIBGCC2 -D__GCC_F
 LDFLAGS+=  -nodefaultlibs
 LDADD+=-lc
 
-OBJS=  # added to below in various ways depending on TARGET_ARCH
+OBJS=  # added to below in various ways depending on TARGET_CPUARCH
 
 #---
 #
@@ -100,7 +100,7 @@ LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udi
 #  Platform specific bits.
 #  When upgrading GCC, get the following definitions from config//t-*
 #
-.if ${TARGET_ARCH} == "arm"
+.if ${TARGET_CPUARCH} == "arm"
 #  from config/arm/t-strongarm-elf
 CFLAGS+=   -Dinhibit_libc -fno-inline
 LIB1ASMSRC =   lib1funcs.asm
@@ -116,7 +116,7 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns
 #  _fixsfsi _fixunssfsi _floatdidf _floatdisf
 .endif
 
-.if ${TARGET_ARCH} == "mips"
+.if ${TARGET_CPUARCH} == "mips"
 LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
 .if defined(TARGET_ABI) && ${TARGET_ABI} != "o32"
 LIB2FUNCS_EXTRA+= floatdidf.c fixunsdfsi.c
@@ -126,7 +126,7 @@ LIB2FUNCS_EXTRA+= fixdfdi.c fixunssfsi.c
 .endif
 .endif
 
-.if ${TARGET_ARCH} == "ia64"
+.if ${TARGET_CPUARCH} == "ia64"
 #  from config/ia64/t-ia64
 LIB1ASMSRC   = lib1funcs.asm
 LIB1ASMFUNCS = __divxf3 __divdf3 __divsf3 \
@@ -137,18 +137,18 @@ LIB1ASMFUNCS = __divxf3 __divdf3 __divsf
 LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c
 .endif
 
-.if ${TARGET_ARCH} == "powerpc"
+.if ${TARGET_CPUARCH} == "powerpc"
 #  from config/rs6000/t-ppccomm
 LIB2FUNCS_EXTRA = tramp.asm
 LIB2FUNCS_STATIC_EXTRA = eabi.asm
 .endif
 
-.if ${TARGET_ARCH} == "powerpc64"
+.if ${TARGET_CPUARCH} == "powerpc64"
 #  from config/rs6000/t-ppccomm
 LIB2FUNCS_EXTRA = tramp.asm
 .endif
 
-.if ${TARGET_ARCH} == "sparc64"
+.if ${TARGET_CPUARCH} == "sparc64"
 #  from config/sparc/t-elf
 LIB1ASMSRC =   lb1spc.asm
 LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3
@@ -195,8 +195,8 @@ OBJ_GRPS =  STD DIV
 #
 # Floating point emulation functions
 #
-.if ${TARGET_ARCH} == "armNOT_YET" || \
-${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
+.if ${TARGET_CPUARCH} == "armNOT_YET" || \
+${TARGET_CPUARCH} == "powerpc" || ${TARGET_CPUARCH} == "sparc64"
 
 FPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES -DFLOAT
 DPBIT_CFLAGS = -DFINE_GRAINED_LIBRARIES

Modified: head/gnu/usr.bin/binutils/Makefile.inc0
==
--- head/gnu/usr.bin/binutils/Makefile.inc0 Wed Nov 10 06:24:16 2010
(r215081)
+++ head/gnu/usr.bin/binutils/Makefile.inc0 Wed Nov 10 06:39:49 2010
(r215082)
@@ -6,13 +6,17 @@
 
 VERSION=   "2.15 [FreeBSD] 2004-05-23"
 
-TARGET_ARCH?=  ${MACHINE_ARCH}
-.if ${TARGET_ARCH} == "amd64"
-BINUTILS_ARCH=x86_64
+.

svn commit: r215251 - head/sys/conf

[Warner Losh]

Author: imp
Date: Sat Nov 13 18:38:35 2010
New Revision: 215251
URL: http://svn.freebsd.org/changeset/base/215251

Log:
  Let the linker pick the right output format automatically

Modified:
  head/sys/conf/ldscript.mips

Modified: head/sys/conf/ldscript.mips
==
--- head/sys/conf/ldscript.mips Sat Nov 13 18:10:44 2010(r215250)
+++ head/sys/conf/ldscript.mips Sat Nov 13 18:38:35 2010(r215251)
@@ -30,16 +30,9 @@
  * $FreeBSD$
  */
 
-OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", 
-   "elf32-tradlittlemips")
-
 OUTPUT_ARCH(mips)
 ENTRY(_start)
 SEARCH_DIR(/usr/lib);
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;
-PROVIDE (_DYNAMIC = 0);
-*/
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215252 - head

[Warner Losh]

Author: imp
Date: Sat Nov 13 18:39:24 2010
New Revision: 215252
URL: http://svn.freebsd.org/changeset/base/215252

Log:
  Add legacy names for mips:mips and arm with TARGET_BIG_ENDIAN, for the moment.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==
--- head/Makefile.inc1  Sat Nov 13 18:38:35 2010(r215251)
+++ head/Makefile.inc1  Sat Nov 13 18:39:24 2010(r215252)
@@ -123,6 +123,20 @@ TARGET_ARCH=   ${TARGET:S/pc98/i386/:S/sun
 ${TARGET_ARCH} != ${MACHINE_ARCH}
 TARGET=${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm}
 .endif
+# Legacy names, for a transition period mips:mips -> mipsel:mips
+.if ${TARGET_ARCH} == "mips" && ${TARGET} == "mips"
+.warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb"
+.if defined(TARGET_BIG_ENDIAN)
+TARGET_ARCH=mipseb
+.else
+TARGET_ARCH=mipsel
+.endif
+.endif
+# arm with TARGET_BIG_ENDIAN -> armeb
+.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+.warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated.  use armeb"
+TARGET_ARCH=armeb
+.endif
 # Otherwise, default to current machine type and architecture.
 TARGET?=   ${MACHINE}
 TARGET_ARCH?=  ${MACHINE_ARCH}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215255 - head/sys/modules

[Warner Losh]

Author: imp
Date: Sat Nov 13 20:28:06 2010
New Revision: 215255
URL: http://svn.freebsd.org/changeset/base/215255

Log:
  Correct mips/arm elimination of sym

Modified:
  head/sys/modules/Makefile

Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile   Sat Nov 13 19:26:45 2010(r215254)
+++ head/sys/modules/Makefile   Sat Nov 13 20:28:06 2010(r215255)
@@ -330,7 +330,7 @@ _syscons=   syscons
 _vpo=  vpo
 .endif
 
-.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
+.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 # no BUS_SPACE_UNSPECIFIED
 # No barrier instruction support (specific to this driver)
 _sym=  sym
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215256 - head/contrib/binutils/bfd

[Warner Losh]

Author: imp
Date: Sat Nov 13 20:30:24 2010
New Revision: 215256
URL: http://svn.freebsd.org/changeset/base/215256

Log:
  Default to little endian output when building for little endian.  This
  got lost as a result of a mismerge a few months back and I didn't
  notice until I collapsed tbemd into -head.
  
  Submitted by: similar patch by kan@

Modified:
  head/contrib/binutils/bfd/config.bfd

Modified: head/contrib/binutils/bfd/config.bfd
==
--- head/contrib/binutils/bfd/config.bfdSat Nov 13 20:28:06 2010
(r215255)
+++ head/contrib/binutils/bfd/config.bfdSat Nov 13 20:30:24 2010
(r215256)
@@ -772,14 +772,18 @@ case "${targ}" in
 targ_defvec=bfd_elf32_littlemips_vec
 targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec 
bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
 ;;
-  mips*-*-freebsd*)
-targ_defvec=bfd_elf32_tradbigmips_vec
-targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec 
bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec 
bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
-;;
   mips*-*-netbsd*)
 targ_defvec=bfd_elf32_bigmips_vec
 targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec 
bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec"
 ;;
+  mips*el-*-freebsd*)
+targ_defvec=bfd_elf32_tradlittlemips_vec
+targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf32_ntradbigmisp_vec 
bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec 
bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+;;
+  mips*-*-freebsd*)
+targ_defvec=bfd_elf32_tradbigmips_vec
+targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec 
bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec 
bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+;;
   mips*-dec-* | mips*el-*-ecoff*)
 targ_defvec=ecoff_little_vec
 targ_selvecs=ecoff_big_vec
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215257 - head

[Warner Losh]

Author: imp
Date: Sat Nov 13 20:41:47 2010
New Revision: 215257
URL: http://svn.freebsd.org/changeset/base/215257

Log:
  The fixes for mips/mips arm/arm compat hacks broke if TARGET or
  TARGET_ARCH wasn't defined.  Fix it for that case.
  
  Submitted by: Garrett Cooper

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==
--- head/Makefile.inc1  Sat Nov 13 20:30:24 2010(r215256)
+++ head/Makefile.inc1  Sat Nov 13 20:41:47 2010(r215257)
@@ -124,7 +124,8 @@ TARGET_ARCH=${TARGET:S/pc98/i386/:S/sun
 TARGET=${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm}
 .endif
 # Legacy names, for a transition period mips:mips -> mipsel:mips
-.if ${TARGET_ARCH} == "mips" && ${TARGET} == "mips"
+.if defined(TARGET) && defined(TARGET_ARCH) && \
+${TARGET_ARCH} == "mips" && ${TARGET} == "mips"
 .warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb"
 .if defined(TARGET_BIG_ENDIAN)
 TARGET_ARCH=mipseb
@@ -133,7 +134,7 @@ TARGET_ARCH=mipsel
 .endif
 .endif
 # arm with TARGET_BIG_ENDIAN -> armeb
-.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+.if defined(TARGET_ARCH) && ${TARGET_ARCH} == "arm" && 
defined(TARGET_BIG_ENDIAN)
 .warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated.  use armeb"
 TARGET_ARCH=armeb
 .endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215270 - in head/sys/mips: adm5120 alchemy atheros cavium conf idt sentry5 sibyte

[Warner Losh]

Author: imp
Date: Sat Nov 13 22:34:12 2010
New Revision: 215270
URL: http://svn.freebsd.org/changeset/base/215270

Log:
  Remove the 'machine mips' from DEFAULTS.  Put the proper 'machine mips
  mipsel' or 'machine mips mipseb' into the config file (with a few 64's
  tossed in for good measure).  This will let us build the proper
  kernels with different worlds as part of make universe.

Added:
  head/sys/mips/atheros/std.ar71xx   (contents, props changed)
  head/sys/mips/sentry5/std.sentry5   (contents, props changed)
  head/sys/mips/sibyte/std.sibyte   (contents, props changed)
Modified:
  head/sys/mips/adm5120/std.adm5120
  head/sys/mips/alchemy/std.alchemy
  head/sys/mips/cavium/std.octeon1
  head/sys/mips/conf/ADM5120
  head/sys/mips/conf/ALCHEMY
  head/sys/mips/conf/AR71XX
  head/sys/mips/conf/DEFAULTS
  head/sys/mips/conf/MALTA
  head/sys/mips/conf/MALTA64
  head/sys/mips/conf/OCTEON1
  head/sys/mips/conf/OCTEON1-32
  head/sys/mips/conf/QEMU
  head/sys/mips/conf/SENTRY5
  head/sys/mips/conf/SWARM
  head/sys/mips/conf/SWARM64
  head/sys/mips/conf/SWARM64_SMP
  head/sys/mips/conf/SWARM_SMP
  head/sys/mips/conf/XLR
  head/sys/mips/conf/XLR64
  head/sys/mips/conf/XLRN32
  head/sys/mips/conf/std.SWARM
  head/sys/mips/idt/std.idt

Modified: head/sys/mips/adm5120/std.adm5120
==
--- head/sys/mips/adm5120/std.adm5120   Sat Nov 13 22:22:18 2010
(r215269)
+++ head/sys/mips/adm5120/std.adm5120   Sat Nov 13 22:34:12 2010
(r215270)
@@ -1,11 +1,13 @@
 # $FreeBSD$
+#
 # Standard include file for ADM5120
 
-files  "../adm5120/files.adm5120"
+files  "../adm5120/files.adm5120"
 
+machinemips mipsel
 cpuCPU_MIPS4KC
 optionsISA_MIPS32
 
-# device   admpci
+# device   admpci
 device admsw
 device pci

Modified: head/sys/mips/alchemy/std.alchemy
==
--- head/sys/mips/alchemy/std.alchemy   Sat Nov 13 22:22:18 2010
(r215269)
+++ head/sys/mips/alchemy/std.alchemy   Sat Nov 13 22:34:12 2010
(r215270)
@@ -4,5 +4,6 @@
 
 files  "../alchemy/files.alchemy"
 
+machinemips mipsel
 cpuCPU_MIPS4KC
 optionsISA_MIPS32

Added: head/sys/mips/atheros/std.ar71xx
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/mips/atheros/std.ar71xxSat Nov 13 22:34:12 2010
(r215270)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+#
+# standard config for all ar71xx based kernels.
+
+files  "../atheros/files.ar71xx"
+
+machinemips mipseb
+cpuCPU_MIPS4KC
+optionsISA_MIPS32

Modified: head/sys/mips/cavium/std.octeon1
==
--- head/sys/mips/cavium/std.octeon1Sat Nov 13 22:22:18 2010
(r215269)
+++ head/sys/mips/cavium/std.octeon1Sat Nov 13 22:34:12 2010
(r215270)
@@ -5,3 +5,5 @@
 # $FreeBSD$
 # 
 files  "../cavium/files.octeon1"
+machinemips mips64eb
+cpuCPU_CNMIPS

Modified: head/sys/mips/conf/ADM5120
==
--- head/sys/mips/conf/ADM5120  Sat Nov 13 22:22:18 2010(r215269)
+++ head/sys/mips/conf/ADM5120  Sat Nov 13 22:34:12 2010(r215270)
@@ -19,9 +19,6 @@
 
 ident  ADM5120
 
-#makeoptions   ARCH_FLAGS=-march=mips32
-makeoptionsMIPS_LITTLE_ENDIAN=defined
-
 # Don't build any modules yet.
 makeoptionsMODULES_OVERRIDE=""
 

Modified: head/sys/mips/conf/ALCHEMY
==
--- head/sys/mips/conf/ALCHEMY  Sat Nov 13 22:22:18 2010(r215269)
+++ head/sys/mips/conf/ALCHEMY  Sat Nov 13 22:34:12 2010(r215270)
@@ -19,9 +19,6 @@
 
 ident  ALCHEMY
 
-makeoptionsARCH_FLAGS=-march=mips32
-makeoptionsMIPS_LITTLE_ENDIAN=defined
-
 # Don't build any modules yet.
 makeoptionsMODULES_OVERRIDE=""
 

Modified: head/sys/mips/conf/AR71XX
==
--- head/sys/mips/conf/AR71XX   Sat Nov 13 22:22:18 2010(r215269)
+++ head/sys/mips/conf/AR71XX   Sat Nov 13 22:34:12 2010(r215270)
@@ -5,14 +5,11 @@
 #
 
 ident  AR71XX
-cpuCPU_MIPS4KC
-optionsISA_MIPS32
-makeoptionsTARGET_BIG_ENDIAN
 makeoptionsKERNLOADADDR=0x8005
 optionsHZ=1000
 
-files  "../atheros/files.ar71xx"
 hints  "AR71XX.hints"
+include"../atheros/std.ar71xx"
 
 makeoptionsDEBUG=-g#Build kernel with gdb(1) debug symbols
 #makeoptions   MODULES_OVERRIDE=""

Modified: head/sys/mips/conf/DEFAULTS

svn commit: r215271 - head

[Warner Losh]

Author: imp
Date: Sat Nov 13 22:38:33 2010
New Revision: 215271
URL: http://svn.freebsd.org/changeset/base/215271

Log:
  Add mips back to universe

Modified:
  head/Makefile

Modified: head/Makefile
==
--- head/Makefile   Sat Nov 13 22:34:12 2010(r215270)
+++ head/Makefile   Sat Nov 13 22:38:33 2010(r215271)
@@ -281,7 +281,7 @@ tinderbox:
 # existing system is.
 #
 .if make(universe) || make(universe_kernels) || make(tinderbox)
-TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v
+TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v mips
 
 .if defined(DOING_TINDERBOX)
 FAILFILE=tinderbox.failed
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215274 - head/share/mk

[Warner Losh]

Author: imp
Date: Sun Nov 14 01:37:08 2010
New Revision: 215274
URL: http://svn.freebsd.org/changeset/base/215274

Log:
  This case is actually powerpc specific, and doesn't apply to powerpc64.
  
  Submitted by: nathanw@

Modified:
  head/share/mk/bsd.cpu.mk

Modified: head/share/mk/bsd.cpu.mk
==
--- head/share/mk/bsd.cpu.mkSun Nov 14 01:06:10 2010(r215273)
+++ head/share/mk/bsd.cpu.mkSun Nov 14 01:37:08 2010(r215274)
@@ -114,7 +114,7 @@ _CPUCFLAGS = -march=armv5te -D__XSCALE__
 .  else
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 .  endif
-. elif ${MACHINE_CPUARCH} == "powerpc"
+. elif ${MACHINE_ARCH} == "powerpc"
 .  if ${CPUTYPE} == "e500"
 MACHINE_CPU = booke
 _CPUCFLAGS = -Wa,-me500 -msoft-float
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215275 - head/gnu/lib/libgcc

[Warner Losh]

Author: imp
Date: Sun Nov 14 01:50:40 2010
New Revision: 215275
URL: http://svn.freebsd.org/changeset/base/215275

Log:
  These two cases should be different...
  
  Submitted by: nathanw@

Modified:
  head/gnu/lib/libgcc/Makefile

Modified: head/gnu/lib/libgcc/Makefile
==
--- head/gnu/lib/libgcc/MakefileSun Nov 14 01:37:08 2010
(r215274)
+++ head/gnu/lib/libgcc/MakefileSun Nov 14 01:50:40 2010
(r215275)
@@ -140,13 +140,13 @@ LIB1ASMFUNCS = __divxf3 __divdf3 __divsf
 LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c
 .endif
 
-.if ${TARGET_CPUARCH} == "powerpc"
+.if ${TARGET_ARCH} == "powerpc"
 #  from config/rs6000/t-ppccomm
 LIB2FUNCS_EXTRA = tramp.asm
 LIB2FUNCS_STATIC_EXTRA = eabi.asm
 .endif
 
-.if ${TARGET_CPUARCH} == "powerpc64"
+.if ${TARGET_ARCH} == "powerpc64"
 #  from config/rs6000/t-ppccomm
 LIB2FUNCS_EXTRA = tramp.asm
 .endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215276 - in head/gnu/usr.bin: binutils cc gdb gdb/libgdb

[Warner Losh]

Author: imp
Date: Sun Nov 14 01:52:19 2010
New Revision: 215276
URL: http://svn.freebsd.org/changeset/base/215276

Log:
  We need to add powerpc64->powerpc translations (I knew I hated copying
  this code in the first place).
  
  Also MACHINE_ARCH powerpc is 32-bit, not MACHINE_CPUARCH == powerpc.
  
  Submitted by: nathanw

Modified:
  head/gnu/usr.bin/binutils/Makefile.inc0
  head/gnu/usr.bin/cc/Makefile.tgt
  head/gnu/usr.bin/gdb/Makefile.inc
  head/gnu/usr.bin/gdb/libgdb/Makefile

Modified: head/gnu/usr.bin/binutils/Makefile.inc0
==
--- head/gnu/usr.bin/binutils/Makefile.inc0 Sun Nov 14 01:50:40 2010
(r215275)
+++ head/gnu/usr.bin/binutils/Makefile.inc0 Sun Nov 14 01:52:19 2010
(r215276)
@@ -7,7 +7,7 @@
 VERSION=   "2.15 [FreeBSD] 2004-05-23"
 
 .if defined(TARGET_ARCH)
-TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/}
+TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif
@@ -27,7 +27,7 @@ RELSRC=   ${RELTOP}/../../../contrib/binut
 SRCDIR=${.CURDIR}/${RELSRC}
 
 .if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "i386" || \
-   ${TARGET_CPUARCH} == "powerpc" || \
+   ${TARGET_ARCH} == "powerpc" || \
(${TARGET_CPUARCH} == "mips" && \
(!defined(TARGET_ABI) || ${TARGET_ABI} != "n64"))
 CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32

Modified: head/gnu/usr.bin/cc/Makefile.tgt
==
--- head/gnu/usr.bin/cc/Makefile.tgtSun Nov 14 01:50:40 2010
(r215275)
+++ head/gnu/usr.bin/cc/Makefile.tgtSun Nov 14 01:52:19 2010
(r215276)
@@ -4,7 +4,7 @@
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
 
 .if defined(TARGET_ARCH)
-TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/}
+TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif

Modified: head/gnu/usr.bin/gdb/Makefile.inc
==
--- head/gnu/usr.bin/gdb/Makefile.inc   Sun Nov 14 01:50:40 2010
(r215275)
+++ head/gnu/usr.bin/gdb/Makefile.inc   Sun Nov 14 01:52:19 2010
(r215276)
@@ -20,7 +20,7 @@ OBJ_GDB= ${OBJ_ROOT}/gdb
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
 
 .if defined(TARGET_ARCH)
-TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/}
+TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif

Modified: head/gnu/usr.bin/gdb/libgdb/Makefile
==
--- head/gnu/usr.bin/gdb/libgdb/MakefileSun Nov 14 01:50:40 2010
(r215275)
+++ head/gnu/usr.bin/gdb/libgdb/MakefileSun Nov 14 01:52:19 2010
(r215276)
@@ -4,7 +4,7 @@
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
 
 .if defined(TARGET_ARCH)
-TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/}
+TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215279 - head

[Warner Losh]

Author: imp
Date: Sun Nov 14 05:01:40 2010
New Revision: 215279
URL: http://svn.freebsd.org/changeset/base/215279

Log:
  add / to the translation of TARGET_ARCH to TARGET

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==
--- head/Makefile.inc1  Sun Nov 14 02:38:29 2010(r215278)
+++ head/Makefile.inc1  Sun Nov 14 05:01:40 2010(r215279)
@@ -121,7 +121,7 @@ VERSION+=   ${OSRELDATE}
 TARGET_ARCH=   ${TARGET:S/pc98/i386/:S/sun4v/sparc64/:S/mips/mipsel/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
 ${TARGET_ARCH} != ${MACHINE_ARCH}
-TARGET=${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm}
+TARGET=${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm/}
 .endif
 # Legacy names, for a transition period mips:mips -> mipsel:mips
 .if defined(TARGET) && defined(TARGET_ARCH) && \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r215271 - head

[Warner Losh]

 On 11/14/2010 03:43, Ulrich Spörlein wrote:

On Sat, 13.11.2010 at 22:38:33 +, Warner Losh wrote:

Author: imp
Date: Sat Nov 13 22:38:33 2010
New Revision: 215271
URL: http://svn.freebsd.org/changeset/base/215271

Log:
   Add mips back to universe

Modified:
   head/Makefile

Modified: head/Makefile
==
--- head/Makefile   Sat Nov 13 22:34:12 2010(r215270)
+++ head/Makefile   Sat Nov 13 22:38:33 2010(r215271)
@@ -281,7 +281,7 @@ tinderbox:
  # existing system is.
  #
  .if make(universe) || make(universe_kernels) || make(tinderbox)
-TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v
+TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v mips

Can we have that sorted, please? I'm sure it was sorted before ...

-TARGETS?=amd64 i386 ia64 pc98 powerpc sparc64 sun4v mips
+TARGETS?=amd64 i386 ia64 mips pc98 powerpc sparc64 sun4v
I'll sort it when I'm 100% it works for everybody and that I don't have 
any uncommitted changes in my test tree.  My first run suggests it 
works, but the test in my pristine loopback tree are still running.


Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r215274 - head/share/mk

[Warner Losh]

 On 11/14/2010 20:47, Alexey Dokuchaev wrote:

On Sun, Nov 14, 2010 at 07:38:51PM -0800, Garrett Cooper wrote:

2010/11/14 Alexey Dokuchaev:

On Sun, Nov 14, 2010 at 01:37:09AM +, Warner Losh wrote:

Log:
   This case is actually powerpc specific, and doesn't apply to powerpc64.

   Submitted by:   nathanw@

finger nath...@freebsd.org
[...]
finger: nathanw: no such user

Was supposed to be nwhitehorn@

You know that, I know, and others likely know it as well.  My point,
however, is that this might not be true to someone reading the logs 10
years from now.

Point taken.  I'd forgotten he's backwards in email than in irc. :)

Warner


./danfe





___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r215309 - in head/sys: amd64/amd64 i386/i386 sys vm

[Warner Losh]

From: Kostik Belousov 
Subject: Re: svn commit: r215309 - in head/sys: amd64/amd64 i386/i386 sys vm
Date: Sun, 14 Nov 2010 23:37:49 +0200

> On Mon, Nov 15, 2010 at 12:20:37AM +0300, Anonymous wrote:
> > Konstantin Belousov  writes:
> > 
> > > Author: kib
> > > Date: Sun Nov 14 18:24:12 2010
> > > New Revision: 215309
> > > URL: http://svn.freebsd.org/changeset/base/215309
> > >
> > > Log:
> > >   Use symbolic names instead of hardcoding values for magic p_osrel 
> > > constants.
> > >   
> > >   MFC after:   1 week
> > [...]
> > > Modified: head/sys/sys/param.h
> > > ==
> > > --- head/sys/sys/param.h  Sun Nov 14 18:05:03 2010(r215308)
> > > +++ head/sys/sys/param.h  Sun Nov 14 18:24:12 2010(r215309)
> > > @@ -60,6 +60,11 @@
> > >  #undef __FreeBSD_version
> > >  #define __FreeBSD_version 900025 /* Master, propagated to newvers */
> > >  
> > > +#ifdef _KERNEL
> > > +#define  __FreeBSD_version_SIGSEGV   74
> > > +#define  __FreeBSD_version_MAP_ANON  800104
> > > +#endif
> > > +
> > 
> > This breaks bsd.port.mk regexp to determine OSVERSION.
> > 
> >   # Get __FreeBSD_version
> >   .if !defined(OSVERSION)
> >   .if exists(/usr/include/sys/param.h)
> >   OSVERSION!=   ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print 
> > $$3}' < /usr/include/sys/param.h
> >   .elif exists(/usr/src/sys/sys/param.h)
> >   OSVERSION!=   ${AWK} '/^\#define[[:blank::]]__FreeBSD_version/ {print 
> > $$3}' < /usr/src/sys/sys/param.h
> >   .else
> >   OSVERSION!=   ${SYSCTL} -n kern.osreldate
> >   .endif
> >   .endif
> > 
> >   $ make -V OSVERSION
> >   900025 74 800104
> > 
> > And every port chokes on it.
> > 
> >  $ make -C devel/libpthread-stubs
> >   "Makefile", line 26: warning: String comparison operator should be either 
> > == or !=
> >   "Makefile", line 26: Malformed conditional (${OSVERSION} < 70)
> >   "Makefile", line 28: if-less endif
> >   "/usr/ports/Mk/bsd.port.mk", line 1739: warning: String comparison 
> > operator should be either == or !=
> >   "/usr/ports/Mk/bsd.port.mk", line 1739: Malformed conditional 
> > (defined(USE_XZ) && ( (${OSVERSION} >= 90 && ${OSVERSION} < 900012) || 
> > ${OSVERSION} < 800505 ))
> >   "/usr/ports/Mk/bsd.port.mk", line 6394: if-less endif
> >   make: fatal errors encountered -- cannot continue
> > 
> > %%
> > Index: Mk/bsd.port.mk
> > ===
> > RCS file: /a/.cvsup/ports/Mk/bsd.port.mk,v
> > retrieving revision 1.654
> > diff -u -p -r1.654 bsd.port.mk
> > --- Mk/bsd.port.mk  8 Nov 2010 16:07:03 -   1.654
> > +++ Mk/bsd.port.mk  14 Nov 2010 21:18:32 -
> > @@ -1219,9 +1219,9 @@ OSREL!=   ${UNAME} -r | ${SED} -e 's/[-(].
> >  # Get __FreeBSD_version
> >  .if !defined(OSVERSION)
> >  .if exists(/usr/include/sys/param.h)
> > -OSVERSION!=${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print 
> > $$3}' < /usr/include/sys/param.h
> > +OSVERSION!=${AWK} 
> > '/^\#define[[:blank:]]__FreeBSD_version[[:blank:]]/ {print $$3}' < 
> > /usr/include/sys/param.h
> >  .elif exists(/usr/src/sys/sys/param.h)
> > -OSVERSION!=${AWK} '/^\#define[[:blank::]]__FreeBSD_version/ {print 
> > $$3}' < /usr/src/sys/sys/param.h
> > +OSVERSION!=${AWK} 
> > '/^\#define[[:blank::]]__FreeBSD_version[[:blank:]]/ {print $$3}' < 
> > /usr/src/sys/sys/param.h
> >  .else
> >  OSVERSION!=${SYSCTL} -n kern.osreldate
> >  .endif
> > %%
> 
> I think it is better to select different namespace for the special versions.
> Can you confirm that the following patch fixes the ports mk for you ?
> It is enough to cd /usr/src/include && make install after patching.

I think this is a better idea.  There's a number of other places
lurking that make a similar assumption.

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r215344 - head/sys/boot/arm/uboot

[Warner Losh]

Author: imp
Date: Mon Nov 15 19:05:09 2010
New Revision: 215344
URL: http://svn.freebsd.org/changeset/base/215344

Log:
  We no longer need the OUTPUT_FORMAT line, so fix the build by removing it.

Modified:
  head/sys/boot/arm/uboot/ldscript.arm

Modified: head/sys/boot/arm/uboot/ldscript.arm
==
--- head/sys/boot/arm/uboot/ldscript.armMon Nov 15 18:49:42 2010
(r215343)
+++ head/sys/boot/arm/uboot/ldscript.armMon Nov 15 19:05:09 2010
(r215344)
@@ -1,6 +1,5 @@
 /* $FreeBSD$ */
 
-OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
 SECTIONS
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216070 - head/sys/kern

[Warner Losh]

Author: imp
Date: Tue Nov 30 05:54:21 2010
New Revision: 216070
URL: http://svn.freebsd.org/changeset/base/216070

Log:
  Remove redundant (and bogus) insertion of pnp info when announcing new
  and retiring devices.  That's already inserted elsewhere.
  
  Submitted by: n_hibma
  MFC after:3 days

Modified:
  head/sys/kern/subr_bus.c

Modified: head/sys/kern/subr_bus.c
==
--- head/sys/kern/subr_bus.cTue Nov 30 01:27:54 2010(r216069)
+++ head/sys/kern/subr_bus.cTue Nov 30 05:54:21 2010(r216070)
@@ -708,25 +708,7 @@ bad:
 static void
 devadded(device_t dev)
 {
-   char *pnp = NULL;
-   char *tmp = NULL;
-
-   pnp = malloc(1024, M_BUS, M_NOWAIT);
-   if (pnp == NULL)
-   goto fail;
-   tmp = malloc(1024, M_BUS, M_NOWAIT);
-   if (tmp == NULL)
-   goto fail;
-   *pnp = '\0';
-   bus_child_pnpinfo_str(dev, pnp, 1024);
-   snprintf(tmp, 1024, "%s %s", device_get_nameunit(dev), pnp);
-   devaddq("+", tmp, dev);
-fail:
-   if (pnp != NULL)
-   free(pnp, M_BUS);
-   if (tmp != NULL)
-   free(tmp, M_BUS);
-   return;
+   devaddq("+", device_get_nameunit(dev), dev);
 }
 
 /*
@@ -736,24 +718,7 @@ fail:
 static void
 devremoved(device_t dev)
 {
-   char *pnp = NULL;
-   char *tmp = NULL;
-
-   pnp = malloc(1024, M_BUS, M_NOWAIT);
-   if (pnp == NULL)
-   goto fail;
-   tmp = malloc(1024, M_BUS, M_NOWAIT);
-   if (tmp == NULL)
-   goto fail;
-   *pnp = '\0';
-   bus_child_pnpinfo_str(dev, pnp, 1024);
-   snprintf(tmp, 1024, "%s %s", device_get_nameunit(dev), pnp);
-   devaddq("-", tmp, dev);
-fail:
-   if (pnp != NULL)
-   free(pnp, M_BUS);
-   if (tmp != NULL)
-   free(tmp, M_BUS);
+   devaddq("+", device_get_nameunit(dev), dev);
return;
 }
 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216112 - head/sys/kern

[Warner Losh]

Author: imp
Date: Thu Dec  2 04:28:01 2010
New Revision: 216112
URL: http://svn.freebsd.org/changeset/base/216112

Log:
  removed tag is '-', not '+'.
  remove extra return.

Modified:
  head/sys/kern/subr_bus.c

Modified: head/sys/kern/subr_bus.c
==
--- head/sys/kern/subr_bus.cThu Dec  2 03:53:29 2010(r216111)
+++ head/sys/kern/subr_bus.cThu Dec  2 04:28:01 2010(r216112)
@@ -718,8 +718,7 @@ devadded(device_t dev)
 static void
 devremoved(device_t dev)
 {
-   devaddq("+", device_get_nameunit(dev), dev);
-   return;
+   devaddq("-", device_get_nameunit(dev), dev);
 }
 
 /*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216141 - head/sys/vm

[Warner Losh]

Author: imp
Date: Fri Dec  3 04:39:48 2010
New Revision: 216141
URL: http://svn.freebsd.org/changeset/base/216141

Log:
  To make minidumps work properly on mips for memory that's direct
  mapped and entered via vm_page_setup, keep track of it like we do
  for amd64.
  
  # A separate commit will be made to move this to a capability-based ifdef
  # rather than arch-based ifdef.
  
  Submitted by: alc@
  MFC after:1 week

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==
--- head/sys/vm/vm_page.c   Fri Dec  3 02:07:34 2010(r216140)
+++ head/sys/vm/vm_page.c   Fri Dec  3 04:39:48 2010(r216141)
@@ -430,11 +430,12 @@ vm_page_startup(vm_offset_t vaddr)
 */
new_end = vm_reserv_startup(&vaddr, new_end, high_water);
 #endif
-#ifdef __amd64__
+#if defined(__amd64__) || defined(__mips__)
/*
-* pmap_map on amd64 comes out of the direct-map, not kvm like i386,
-* so the pages must be tracked for a crashdump to include this data.
-* This includes the vm_page_array and the early UMA bootstrap pages.
+* pmap_map on amd64 and mips can come out of the direct-map, not kvm
+* like i386, so the pages must be tracked for a crashdump to include
+* this data.  This includes the vm_page_array and the early UMA
+* bootstrap pages.
 */
for (pa = new_end; pa < phys_avail[biggestone + 1]; pa += PAGE_SIZE)
dump_add_page(pa);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216144 - head/tools/tools/nanobsd

[Warner Losh]

Author: imp
Date: Fri Dec  3 07:33:43 2010
New Revision: 216144
URL: http://svn.freebsd.org/changeset/base/216144

Log:
  _WITHOUT_SRCCONF has too much baggage.  Instead, use the simpler
  SRCCONF=/dev/null.

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==
--- head/tools/tools/nanobsd/nanobsd.sh Fri Dec  3 07:09:23 2010
(r216143)
+++ head/tools/tools/nanobsd/nanobsd.sh Fri Dec  3 07:33:43 2010
(r216144)
@@ -182,7 +182,7 @@ make_conf_build ( ) (
 
echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_BUILD}
echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF_BUILD}
-   echo "_WITHOUT_SRCCONF=t" >> ${NANO_MAKE_CONF_BUILD}
+   echo "SRCCONF=/dev/null" >> ${NANO_MAKE_CONF_BUILD}
 )
 
 build_world ( ) (
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216145 - head/tools/tools/nanobsd

[Warner Losh]

Author: imp
Date: Fri Dec  3 07:39:29 2010
New Revision: 216145
URL: http://svn.freebsd.org/changeset/base/216145

Log:
  o Mount the device async when we're doing the copy.
  o Create a sparse file instead of a fully zerod one.  This trades the
possibiltiy of running out of space during the build for the speed
gain not having do write all those zeros...
  
  Submitted by: n_hibma

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==
--- head/tools/tools/nanobsd/nanobsd.sh Fri Dec  3 07:33:43 2010
(r216144)
+++ head/tools/tools/nanobsd/nanobsd.sh Fri Dec  3 07:39:29 2010
(r216145)
@@ -404,7 +404,7 @@ newfs_part ( ) (
lbl=$3
echo newfs ${NANO_NEWFS} ${NANO_LABEL:+-L${NANO_LABEL}${lbl}} ${dev}
newfs ${NANO_NEWFS} ${NANO_LABEL:+-L${NANO_LABEL}${lbl}} ${dev}
-   mount ${dev} ${mnt}
+   mount -o async ${dev} ${mnt}
 )
 
 populate_slice ( ) (
@@ -513,8 +513,8 @@ create_i386_diskimage ( ) (
-y ${NANO_HEADS}`
else
echo "Creating md backing file..."
-   dd if=/dev/zero of=${IMG} bs=${NANO_SECTS}b \
-   count=`expr ${NANO_MEDIASIZE} / ${NANO_SECTS}`
+   rm -f ${IMG}
+   dd if=/dev/zero of=${IMG} seek=${NANO_MEDIASIZE} count=0
MD=`mdconfig -a -t vnode -f ${IMG} -x ${NANO_SECTS} \
-y ${NANO_HEADS}`
fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216230 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Warner Losh]

From: Bruce Cran 
Subject: Re: svn commit: r216230 - 
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Date: Tue, 7 Dec 2010 11:51:06 +

> On Tue, Dec 07, 2010 at 01:31:27PM +0200, Alexander Motin wrote:
> > Not necessary. Some places indeed may have some legacy requirements,
> > for example, in theory MBR want partition to be aligned to "track
> > boundary" (but I've seen many pre-formatted SD cards with MBR
> > violating it to align partition to flash sector). Same time for BSD
> > label I see no problem to align partitions any way we want. I also
> > see no problems to make FAT cluster, UFS block/fragment, etc, to
> > match some sizes.
> 
> From a new installation of Windows 7 and FreeBSD CURRENT:
> 
> GEOM: ada0: partition 3 does not start on a track boundary.
> GEOM: ada0: partition 3 does not end on a track boundary.
> GEOM: ada0: partition 2 does not start on a track boundary.
> GEOM: ada0: partition 2 does not end on a track bounary.
> 
> Partition 2 is the reserved partition while 3 is an NTFS partition, both
> created in the Windows setup application.
> 
> Since Windows isn't bothering to align partitions do we still need to
> warn about it?

The geom warnings are totally bogus, and no conclusion about anything
can be drawn from them other than the disk partitions don't match the
*FAKE* geometry cam creates for the disk.

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216230 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Warner Losh]

From: Erik Trulsson 
Subject: Re: svn commit: r216230 - 
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Date: Tue, 7 Dec 2010 13:10:58 +0100

> On Tue, Dec 07, 2010 at 01:57:04PM +0200, Andriy Gapon wrote:
> > on 07/12/2010 13:51 Bruce Cran said the following:
> > > On Tue, Dec 07, 2010 at 01:31:27PM +0200, Alexander Motin wrote:
> > >> Not necessary. Some places indeed may have some legacy requirements,
> > >> for example, in theory MBR want partition to be aligned to "track
> > >> boundary" (but I've seen many pre-formatted SD cards with MBR
> > >> violating it to align partition to flash sector). Same time for BSD
> > >> label I see no problem to align partitions any way we want. I also
> > >> see no problems to make FAT cluster, UFS block/fragment, etc, to
> > >> match some sizes.
> > > 
> > >>From a new installation of Windows 7 and FreeBSD CURRENT:
> > > 
> > > GEOM: ada0: partition 3 does not start on a track boundary.
> > > GEOM: ada0: partition 3 does not end on a track boundary.
> > > GEOM: ada0: partition 2 does not start on a track boundary.
> > > GEOM: ada0: partition 2 does not end on a track bounary.
> > > 
> > > Partition 2 is the reserved partition while 3 is an NTFS partition, both
> > > created in the Windows setup application.
> > > 
> > > Since Windows isn't bothering to align partitions do we still need to
> > > warn about it?
> > > 
> > 
> > No.
> > And another reason is that modern drives do not actually report any CHS
> > parameters, so I don't even know where we get them and how we (pretend to) 
> > know
> > we track boundaries are.
> 
> Modern drives do actually report CHS parameters.  The values reported
> rarely (if ever) have any relationship whatsoever to reality, but they
> are reported.  I guess the reason for them still being reported is to
> satisfy old systems that do not undestand LBA and insist on getting CHS
> parameters.

And even if the CHS parameters are reported, they are molested at many
layers so cannot be trusted at all.  CF Cards will report one thing if
attached via usb adapters and another thing if attached directly to a
pata bus, for example.  Sometimes this is software (cam lying), other
times this is hardware (usb adapter lying).

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216269 - head/sys/geom/part

[Warner Losh]

From: Matthew Jacob 
> Geometry is still important.  Trying booting a USB flash drive on all 
> BIOS' with a 63/255 geometry instead of a 64/32 geometry.

At least most modern BIOSes I've had to deal with can be configured to
use packet mode which makes the problem go away...  Don't know if I'm
lucky or if that's really wide spread...

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216409 - head/usr.bin/calendar/calendars

[Warner Losh]

Author: imp
Date: Mon Dec 13 16:23:02 2010
New Revision: 216409
URL: http://svn.freebsd.org/changeset/base/216409

Log:
  FreeBSD committer Dan Moschuk has passed away.  Here is his death notice:
  http://www.lifenews.ca/thespec/profile/98251--moschuk-daniel
  
  PR:   147479

Modified:
  head/usr.bin/calendar/calendars/calendar.freebsd

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdMon Dec 13 14:30:35 
2010(r216408)
+++ head/usr.bin/calendar/calendars/calendar.freebsdMon Dec 13 16:23:02 
2010(r216409)
@@ -149,6 +149,7 @@
 05/17  Thomas Abthorpe  born in Port Arthur, Ontario, 
Canada, 1968
 05/19  Philippe Charnier  born in Fontainebleau, France, 
1966
 05/19  Ian Dowse  born in Dublin, Ireland, 1975
+05/20  Dan Moschuk  died in Burlington, Ontario, Canada, 
2010 
 05/21  Kris Kennaway  born in Winnipeg, Manitoba, Canada, 
1978
 05/22  Clive Tong-I Lin  born in Changhua, Taiwan, Republic 
of China, 1978
 05/22  Michael Bushkov  born in Rostov-on-Don, Russian 
Federation, 1985
@@ -284,7 +285,6 @@
 10/19  Nick Barkas  born in Longview, Washington, United 
States, 1981
 10/20  Joel Dahl  born in Lidkoping, Sweden, 1983
 10/20  Dmitry Marakasov  born in Moscow, Russian 
Federation, 1984
-10/21  Dan Moschuk  born in Halifax, Nova Scotia, Canada, 
1980
 10/21  Ben Smithurst  born in Sheffield, South Yorkshire, 
United Kingdom, 1981
 10/22  Jean-Sebastien Pedron  born in Redon, 
Ille-et-Vilaine, France, 1980
 10/23  Mario Sergio Fujikawa Ferreira  born in Brasilia, 
Distrito Federal, Brazil, 1976
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216493 - head/sbin/geom/class/eli

[Warner Losh]

On 12/16/2010 11:54, Garrett Cooper wrote:

On Thu, Dec 16, 2010 at 9:54 AM, David E. O'Brien  wrote:

Author: obrien
Date: Thu Dec 16 17:54:56 2010
New Revision: 216493
URL: http://svn.freebsd.org/changeset/base/216493

Log:
  Revert r216473.
  WARNS=6 causes "warning: cast increases required alignment of target type"
  on arm, ia64, mips, and sparc64.

Modified:
  head/sbin/geom/class/eli/Makefile

Modified: head/sbin/geom/class/eli/Makefile
==
--- head/sbin/geom/class/eli/Makefile   Thu Dec 16 17:14:37 2010
(r216492)
+++ head/sbin/geom/class/eli/Makefile   Thu Dec 16 17:54:56 2010
(r216493)
@@ -11,7 +11,7 @@ SRCS+=sha2.c
  DPADD= ${LIBMD} ${LIBCRYPTO}
  LDADD= -lmd -lcrypto

-WARNS?=6
+WARNS?=3

  CFLAGS+=-I${.CURDIR}/../../../../sys

 I think it's actually safe to bump it to WARNS = 6 if you define
NO_WCAST_ALIGN = 1, but that would need to be tested.
And the code in question needs to be audited to make sure that the 
alignment changes are benign.  Blindly setting this just papers over the 
bugs...


Warner

Cheers,
-Garrett





___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216473 - head/sbin/geom/class/eli

[Warner Losh]

On 12/17/2010 08:22, Nathan Whitehorn wrote:

On 12/16/10 13:04, Robert Watson wrote:

On Thu, 16 Dec 2010, David O'Brien wrote:


Log:
  Bump WARNS to 6.

Modified:
  head/sbin/geom/class/eli/Makefile


FYI, this broke the tinderbox on arm, ia64, mips, and sparc64.


Errr.  Reverted.  I built it on the architectures I had access to...


For WARNS-related changes, I generally use "make universe" to test 
across architectures.  This builds all of our architectures world + 
all available kernels, and seems the most effective way to avoid the 
above situations. (I've fallen into exactly the same trap...)


The one thing to be cautious about is that make universe won't fail 
if an individual build fails, so you need to check the logs to make 
sure everything actually succeeded.


The trouble with make universe is that it has been broken for months 
and months now. ARM and powerpc64 are disconnected from the build 
entirely, as are big-endian and 64-bit MIPS, and an increasing number 
of ARM and PowerPC kernels depend on FDT tools not built by default, 
and so do not build. Build infrastructure changes also make it appear 
that the PowerPC GENERIC64 kernel is broken when it is not. This 
severely reduces the coverage of make universe for problems like this.


I have a patch at http://people.freebsd.org/~nwhitehorn/universe.diff 
that fixes both of these problems, by teaching the universe rule in 
src/Makefile about MACHINEs with multiple MACHINE_ARCHs and by 
enabling the build of the FDT tools by default, which adds about 300K 
to world. The way these are done is probably not optimal, but it is a 
better than the current situation and is a good stopgap. With the 
patch, all architectures succeed except for the ARM AVILA kernel, 
which seems genuinely broken, and the various 64-bit MIPS kernels, 
since 64-bit MIPS is not hooked up to the build yet. If I don't hear 
any objections, I would like to commit it on Wednesday the 22nd.
That works for me.  As far as I can tell, doing the MIPS64 stuff will 
just take about a day of patiently fixing some breakage...  Maybe I'll 
get to it over the holidays.


Warner


-Nathan





___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216473 - head/sbin/geom/class/eli

[Warner Losh]

On 12/18/2010 08:34, Nathan Whitehorn wrote:

On 12/17/10 13:07, Warner Losh wrote:

On 12/17/2010 08:22, Nathan Whitehorn wrote:

On 12/16/10 13:04, Robert Watson wrote:

On Thu, 16 Dec 2010, David O'Brien wrote:


Log:
  Bump WARNS to 6.

Modified:
  head/sbin/geom/class/eli/Makefile


FYI, this broke the tinderbox on arm, ia64, mips, and sparc64.


Errr.  Reverted.  I built it on the architectures I had access to...


For WARNS-related changes, I generally use "make universe" to test 
across architectures.  This builds all of our architectures world + 
all available kernels, and seems the most effective way to avoid 
the above situations. (I've fallen into exactly the same trap...)


The one thing to be cautious about is that make universe won't fail 
if an individual build fails, so you need to check the logs to make 
sure everything actually succeeded.


The trouble with make universe is that it has been broken for months 
and months now. ARM and powerpc64 are disconnected from the build 
entirely, as are big-endian and 64-bit MIPS, and an increasing 
number of ARM and PowerPC kernels depend on FDT tools not built by 
default, and so do not build. Build infrastructure changes also make 
it appear that the PowerPC GENERIC64 kernel is broken when it is 
not. This severely reduces the coverage of make universe for 
problems like this.


I have a patch at 
http://people.freebsd.org/~nwhitehorn/universe.diff that fixes both 
of these problems, by teaching the universe rule in src/Makefile 
about MACHINEs with multiple MACHINE_ARCHs and by enabling the build 
of the FDT tools by default, which adds about 300K to world. The way 
these are done is probably not optimal, but it is a better than the 
current situation and is a good stopgap. With the patch, all 
architectures succeed except for the ARM AVILA kernel, which seems 
genuinely broken, and the various 64-bit MIPS kernels, since 64-bit 
MIPS is not hooked up to the build yet. If I don't hear any 
objections, I would like to commit it on Wednesday the 22nd.
That works for me.  As far as I can tell, doing the MIPS64 stuff will 
just take about a day of patiently fixing some breakage...  Maybe 
I'll get to it over the holidays.


Thanks! With your imprimatur, I've committed the src/Makefile portion 
of the patch early. The FDT piece will wait until Wednesday, as 
announced.
FDT should have always been built from the moment it went into the 
tree.  It was a mistake to make it optional, since we have no good way 
to make host tools optional based on the target we're compiling...


Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r196529 - head/sys/kern

[Warner Losh]

Author: imp
Date: Tue Aug 25 06:25:59 2009
New Revision: 196529
URL: http://svn.freebsd.org/changeset/base/196529

Log:
  Rather than havnig enabled/disabled, implement a max queue depth.
  While usually not an issue, this firewalls bugs in the code that may
  run us out of memory.
  
  Fix a memory exhaustion in the case where devctl was disabled, but the
  link was bouncing.  The check to queue was in the wrong place.
  
  Implement a new sysctl hw.bus.devctl_queue to control the depth.  Make
  compatibility hacks for hw.bus.devctl_disable to ease transition.
  
  Reviewed by:  emaste@
  Approved by:  re@ (kib)
  MFC after:asap

Modified:
  head/sys/kern/subr_bus.c

Modified: head/sys/kern/subr_bus.c
==
--- head/sys/kern/subr_bus.cTue Aug 25 06:21:45 2009(r196528)
+++ head/sys/kern/subr_bus.cTue Aug 25 06:25:59 2009(r196529)
@@ -350,11 +350,18 @@ device_sysctl_fini(device_t dev)
  * tested since 3.4 or 2.2.8!
  */
 
+/* Deprecated way to adjust queue length */
 static int sysctl_devctl_disable(SYSCTL_HANDLER_ARGS);
-static int devctl_disable = 0;
-TUNABLE_INT("hw.bus.devctl_disable", &devctl_disable);
+/* XXX Need to support old-style tunable hw.bus.devctl_disable" */
 SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_disable, CTLTYPE_INT | CTLFLAG_RW, NULL,
-0, sysctl_devctl_disable, "I", "devctl disable");
+0, sysctl_devctl_disable, "I", "devctl disable -- deprecated");
+
+#define DEVCTL_DEFAULT_QUEUE_LEN 1000
+static int sysctl_devctl_queue(SYSCTL_HANDLER_ARGS);
+static int devctl_queue_length = DEVCTL_DEFAULT_QUEUE_LEN;
+TUNABLE_INT("hw.bus.devctl_queue", &devctl_queue_length);
+SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_queue, CTLTYPE_INT | CTLFLAG_RW, NULL,
+0, sysctl_devctl_queue, "I", "devctl queue length");
 
 static d_open_tdevopen;
 static d_close_t   devclose;
@@ -385,6 +392,7 @@ static struct dev_softc
 {
int inuse;
int nonblock;
+   int queued;
struct mtx mtx;
struct cv cv;
struct selinfo sel;
@@ -423,7 +431,7 @@ devclose(struct cdev *dev, int fflag, in
mtx_lock(&devsoftc.mtx);
cv_broadcast(&devsoftc.cv);
mtx_unlock(&devsoftc.mtx);
-
+   devsoftc.async_proc = NULL;
return (0);
 }
 
@@ -458,6 +466,7 @@ devread(struct cdev *dev, struct uio *ui
}
n1 = TAILQ_FIRST(&devsoftc.devq);
TAILQ_REMOVE(&devsoftc.devq, n1, dei_link);
+   devsoftc.queued--;
mtx_unlock(&devsoftc.mtx);
rv = uiomove(n1->dei_data, strlen(n1->dei_data), uio);
free(n1->dei_data, M_BUS);
@@ -531,21 +540,33 @@ devctl_process_running(void)
 void
 devctl_queue_data(char *data)
 {
-   struct dev_event_info *n1 = NULL;
+   struct dev_event_info *n1 = NULL, *n2 = NULL;
struct proc *p;
 
-   /*
-* Do not allow empty strings to be queued, as they
-* cause devd to exit prematurely.
-*/
if (strlen(data) == 0)
return;
+   if (devctl_queue_length == 0)
+   return;
n1 = malloc(sizeof(*n1), M_BUS, M_NOWAIT);
if (n1 == NULL)
return;
n1->dei_data = data;
mtx_lock(&devsoftc.mtx);
+   if (devctl_queue_length == 0) {
+   free(n1->dei_data, M_BUS);
+   free(n1, M_BUS);
+   return;
+   }
+   /* Leave at least one spot in the queue... */
+   while (devsoftc.queued > devctl_queue_length - 1) {
+   n2 = TAILQ_FIRST(&devsoftc.devq);
+   TAILQ_REMOVE(&devsoftc.devq, n2, dei_link);
+   free(n2->dei_data, M_BUS);
+   free(n2, M_BUS);
+   devsoftc.queued--;
+   }
TAILQ_INSERT_TAIL(&devsoftc.devq, n1, dei_link);
+   devsoftc.queued++;
cv_broadcast(&devsoftc.cv);
mtx_unlock(&devsoftc.mtx);
selwakeup(&devsoftc.sel);
@@ -614,7 +635,7 @@ devaddq(const char *type, const char *wh
char *pnp = NULL;
const char *parstr;
 
-   if (devctl_disable)
+   if (!devctl_queue_length)/* Rare race, but lost races safely discard */
return;
data = malloc(1024, M_BUS, M_NOWAIT);
if (data == NULL)
@@ -731,12 +752,11 @@ sysctl_devctl_disable(SYSCTL_HANDLER_ARG
struct dev_event_info *n1;
int dis, error;
 
-   dis = devctl_disable;
+   dis = devctl_queue_length == 0;
error = sysctl_handle_int(oidp, &dis, 0, req);
if (error || !req->newptr)
return (error);
mtx_lock(&devsoftc.mtx);
-   devctl_disable = dis;
if (dis) {
while (!TAILQ_EMPTY(&devsoftc.devq)) {
n1 = TAILQ_FIRST(&devsoftc.devq);
@@ -744,6 +764,35 @@ sysctl_devctl_disable(SYSCTL_HANDLER_ARG
free(n1->dei_data, M_BUS);
free(n1, M_BUS);
}
+   devsoft

svn commit: r196636 - in head/sys: conf modules

[Warner Losh]

Author: imp
Date: Sat Aug 29 01:34:42 2009
New Revision: 196636
URL: http://svn.freebsd.org/changeset/base/196636

Log:
  Connect bwi up to the build.  While there are some problems with this
  driver still, it generally works well for most people most of the
  time.  It is still too green for GENERIC, however.
  
  Submitted by: many (latest being kwm@)
  MFC after:2 days (before RC1 if possible)

Modified:
  head/sys/conf/NOTES
  head/sys/modules/Makefile

Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri Aug 28 22:51:07 2009(r196635)
+++ head/sys/conf/NOTES Sat Aug 29 01:34:42 2009(r196636)
@@ -1790,6 +1790,7 @@ devicemiibus
 #  BCM570x family of controllers, including the 3Com 3c996-T,
 #  the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41, and
 #  the embedded gigE NICs on Dell PowerEdge 2550 servers.
+# bwi: Broadcom BCM430* and BCM431* family of wireless adapters.
 # cas: Sun Cassini/Cassini+ and National Semiconductor DP83065 Saturn
 # cm:  Arcnet SMC COM90c26 / SMC COM90c56
 #  (and SMC COM90c66 in '56 compatibility mode) adapters.
@@ -1959,6 +1960,7 @@ devicewb  # Winbond W89C840F
 device xl  # 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # PCI Ethernet NICs.
+device bwi # Broadcom BCM430* BCM431*
 device de  # DEC/Intel DC21x4x (``Tulip'')
 device em  # Intel Pro/1000 Gigabit Ethernet
 device igb # Intel Pro/1000 PCIE Gigabit Ethernet

Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile   Fri Aug 28 22:51:07 2009(r196635)
+++ head/sys/modules/Makefile   Sat Aug 29 01:34:42 2009(r196636)
@@ -40,6 +40,7 @@ SUBDIR=   ${_3dfx} \
${_bktr} \
${_bm} \
bridgestp \
+   bwi \
cam \
${_canbepm} \
${_canbus} \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r196789 - head

[Warner Losh]

Author: imp
Date: Thu Sep  3 17:04:42 2009
New Revision: 196789
URL: http://svn.freebsd.org/changeset/base/196789

Log:
  Time for house-cleaning:
  o remove all entries before RELENG_7 was branched, as is tradition[*].
  o Update examples...  nobody cares about 5.x upgrades.
  o minor format tweaking in a few places.
  o update copyright (although at best I hold an editors copyright these days).
  o Remove giving people permission to buy me beer.  I don't do enough for
this document for that anymore...

Modified:
  head/UPDATING

Modified: head/UPDATING
==
--- head/UPDATING   Thu Sep  3 16:53:11 2009(r196788)
+++ head/UPDATING   Thu Sep  3 17:04:42 2009(r196789)
@@ -1,51 +1,53 @@
 Updating Information for FreeBSD current users
 
-This file is maintained and copyrighted by M. Warner Losh
-.  See end of file for further details.  For commonly
-done items, please see the COMMON ITEMS: section later in the file.
+This file is maintained and copyrighted by M. Warner Losh .
+See end of file for further details.  For commonly done items, please see the
+COMMON ITEMS: section later in the file.  These instructions assume that you
+basically know what you are doing.  If not, then please consult the FreeBSD
+handbook.
 
 Items affecting the ports and packages system can be found in
-/usr/ports/UPDATING.  Please read that file before running
-portupgrade.
+/usr/ports/UPDATING.  Please read that file before running portupgrade.
 
 NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW:
-   FreeBSD 9.x has many debugging features turned on, in
-   both the kernel and userland.  These features attempt to detect
-   incorrect use of system primitives, and encourage loud failure
-   through extra sanity checking and fail stop semantics.  They
-   also substantially impact system performance.  If you want to
-   do performance measurement, benchmarking, and optimization,
-   you'll want to turn them off.  This includes various WITNESS-
-   related kernel options, INVARIANTS, malloc debugging flags
-   in userland, and various verbose features in the kernel.  Many
-   developers choose to disable these features on build machines
-   to maximize performance.  (To disable malloc debugging, run
+   FreeBSD 9.x has many debugging features turned on, in both the kernel
+   and userland.  These features attempt to detect incorrect use of
+   system primitives, and encourage loud failure through extra sanity
+   checking and fail stop semantics.  They also substantially impact
+   system performance.  If you want to do performance measurement,
+   benchmarking, and optimization, you'll want to turn them off.  This
+   includes various WITNESS- related kernel options, INVARIANTS, malloc
+   debugging flags in userland, and various verbose features in the
+   kernel.  Many developers choose to disable these features on build
+   machines to maximize performance.  (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
 
 20090813:
-   Remove the option STOP_NMI.  The default action is now to use NMI
-   only for KDB via the newly introduced function stop_cpus_hard()
-   and maintain stop_cpus() to just use a normal IPI_STOP on ia32
-   and amd64.
+   Remove the option STOP_NMI.  The default action is now to use NMI only
+   for KDB via the newly introduced function stop_cpus_hard() and
+   maintain stop_cpus() to just use a normal IPI_STOP on ia32 and amd64.
+
+20090803:
+   RELENG_8 branched.
 
 20090719:
-   Bump the shared library version numbers for all libraries that
-   do not use symbol versioning as part of the 8.0-RELEASE cycle.
-   Bump __FreeBSD_version to 800105.
+   Bump the shared library version numbers for all libraries that do not
+   use symbol versioning as part of the 8.0-RELEASE cycle.  Bump
+   __FreeBSD_version to 800105.
 
 20090714:
-   Due to changes in the implementation of virtual network stack
-   support, all network-related kernel modules must be recompiled.
-   As this change breaks the ABI, bump __FreeBSD_version to 800104.
+   Due to changes in the implementation of virtual network stack support,
+   all network-related kernel modules must be recompiled.  As this change
+   breaks the ABI, bump __FreeBSD_version to 800104.
 
 20090713:
-   The TOE interface to the TCP syncache has been modified to remove struct
-   tcpopt () from the ABI of the network stack.  The
-   cxgb driver is the only TOE consumer affected by this change, and needs
-   to be recompiled along with the kernel. As this change breaks the ABI,
-   bump __FreeBSD_version to 800103.
+   The TOE interface to the TCP syncache has been modified to remove
+   struct tcpopt () from the ABI of the network stack.
+   

svn commit: r196791 - head

[Warner Losh]

Author: imp
Date: Thu Sep  3 17:13:54 2009
New Revision: 196791
URL: http://svn.freebsd.org/changeset/base/196791

Log:
  Actually, stable/8 is what was created...

Modified:
  head/UPDATING

Modified: head/UPDATING
==
--- head/UPDATING   Thu Sep  3 17:12:45 2009(r196790)
+++ head/UPDATING   Thu Sep  3 17:13:54 2009(r196791)
@@ -28,7 +28,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
maintain stop_cpus() to just use a normal IPI_STOP on ia32 and amd64.
 
 20090803:
-   RELENG_8 branched.
+   stable/8 branch created in subversion.
 
 20090719:
Bump the shared library version numbers for all libraries that do not
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r196855 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci kern

[Warner Losh]

Author: imp
Date: Sat Sep  5 08:03:29 2009
New Revision: 196855
URL: http://svn.freebsd.org/changeset/base/196855

Log:
  MFC r196529:
Rather than having enabled/disabled, implement a max queue depth.
While usually not an issue, this firewalls bugs in the code that may
run us out of memory.
  
Fix a memory exhaustion in the case where devctl was disabled, but the
link was bouncing.  The check to queue was in the wrong place.
  
Implement a new sysctl hw.bus.devctl_queue to control the depth.  Make
compatibility hacks for hw.bus.devctl_disable to ease transition.
  
Reviewed by:emaste@
Approved by:re@ (kib)
MFC after:  asap

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/kern/subr_bus.c

Modified: stable/8/sys/kern/subr_bus.c
==
--- stable/8/sys/kern/subr_bus.cSat Sep  5 06:24:28 2009
(r196854)
+++ stable/8/sys/kern/subr_bus.cSat Sep  5 08:03:29 2009
(r196855)
@@ -350,11 +350,18 @@ device_sysctl_fini(device_t dev)
  * tested since 3.4 or 2.2.8!
  */
 
+/* Deprecated way to adjust queue length */
 static int sysctl_devctl_disable(SYSCTL_HANDLER_ARGS);
-static int devctl_disable = 0;
-TUNABLE_INT("hw.bus.devctl_disable", &devctl_disable);
+/* XXX Need to support old-style tunable hw.bus.devctl_disable" */
 SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_disable, CTLTYPE_INT | CTLFLAG_RW, NULL,
-0, sysctl_devctl_disable, "I", "devctl disable");
+0, sysctl_devctl_disable, "I", "devctl disable -- deprecated");
+
+#define DEVCTL_DEFAULT_QUEUE_LEN 1000
+static int sysctl_devctl_queue(SYSCTL_HANDLER_ARGS);
+static int devctl_queue_length = DEVCTL_DEFAULT_QUEUE_LEN;
+TUNABLE_INT("hw.bus.devctl_queue", &devctl_queue_length);
+SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_queue, CTLTYPE_INT | CTLFLAG_RW, NULL,
+0, sysctl_devctl_queue, "I", "devctl queue length");
 
 static d_open_tdevopen;
 static d_close_t   devclose;
@@ -385,6 +392,7 @@ static struct dev_softc
 {
int inuse;
int nonblock;
+   int queued;
struct mtx mtx;
struct cv cv;
struct selinfo sel;
@@ -423,7 +431,7 @@ devclose(struct cdev *dev, int fflag, in
mtx_lock(&devsoftc.mtx);
cv_broadcast(&devsoftc.cv);
mtx_unlock(&devsoftc.mtx);
-
+   devsoftc.async_proc = NULL;
return (0);
 }
 
@@ -458,6 +466,7 @@ devread(struct cdev *dev, struct uio *ui
}
n1 = TAILQ_FIRST(&devsoftc.devq);
TAILQ_REMOVE(&devsoftc.devq, n1, dei_link);
+   devsoftc.queued--;
mtx_unlock(&devsoftc.mtx);
rv = uiomove(n1->dei_data, strlen(n1->dei_data), uio);
free(n1->dei_data, M_BUS);
@@ -531,21 +540,33 @@ devctl_process_running(void)
 void
 devctl_queue_data(char *data)
 {
-   struct dev_event_info *n1 = NULL;
+   struct dev_event_info *n1 = NULL, *n2 = NULL;
struct proc *p;
 
-   /*
-* Do not allow empty strings to be queued, as they
-* cause devd to exit prematurely.
-*/
if (strlen(data) == 0)
return;
+   if (devctl_queue_length == 0)
+   return;
n1 = malloc(sizeof(*n1), M_BUS, M_NOWAIT);
if (n1 == NULL)
return;
n1->dei_data = data;
mtx_lock(&devsoftc.mtx);
+   if (devctl_queue_length == 0) {
+   free(n1->dei_data, M_BUS);
+   free(n1, M_BUS);
+   return;
+   }
+   /* Leave at least one spot in the queue... */
+   while (devsoftc.queued > devctl_queue_length - 1) {
+   n2 = TAILQ_FIRST(&devsoftc.devq);
+   TAILQ_REMOVE(&devsoftc.devq, n2, dei_link);
+   free(n2->dei_data, M_BUS);
+   free(n2, M_BUS);
+   devsoftc.queued--;
+   }
TAILQ_INSERT_TAIL(&devsoftc.devq, n1, dei_link);
+   devsoftc.queued++;
cv_broadcast(&devsoftc.cv);
mtx_unlock(&devsoftc.mtx);
selwakeup(&devsoftc.sel);
@@ -614,7 +635,7 @@ devaddq(const char *type, const char *wh
char *pnp = NULL;
const char *parstr;
 
-   if (devctl_disable)
+   if (!devctl_queue_length)/* Rare race, but lost races safely discard */
return;
data = malloc(1024, M_BUS, M_NOWAIT);
if (data == NULL)
@@ -731,12 +752,11 @@ sysctl_devctl_disable(SYSCTL_HANDLER_ARG
struct dev_event_info *n1;
int dis, error;
 
-   dis = devctl_disable;
+   dis = devctl_queue_length == 0;
error = sysctl_handle_int(oidp, &dis, 0, req);
if (error || !req->newptr)
return (error);
mtx_lock(&devsoftc.

svn commit: r196856 - head

[Warner Losh]

Author: imp
Date: Sat Sep  5 08:08:14 2009
New Revision: 196856
URL: http://svn.freebsd.org/changeset/base/196856

Log:
  Note migration of tunable from hw.bus.devctl_disable to
  hw.bus.devctl_queue.  The sysctl interface provides legacys upport for
  the latter sysctl, but the tunable support was removed.
  
  MFC after:1 day

Modified:
  head/UPDATING

Modified: head/UPDATING
==
--- head/UPDATING   Sat Sep  5 08:03:29 2009(r196855)
+++ head/UPDATING   Sat Sep  5 08:08:14 2009(r196856)
@@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
machines to maximize performance.  (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
 
+20090825:
+   The old tunable hw.bus.devctl_disable has been superseded by
+   hw.bus.devctl_queue.  hw.bus.devctl_disable=1 in loader.conf should be
+   replaced by hw.bus.devctl_queue=0.  The default for this new tunable
+   is 1000.
+
 20090813:
Remove the option STOP_NMI.  The default action is now to use NMI only
for KDB via the newly introduced function stop_cpus_hard() and
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r196857 - head

[Warner Losh]

Author: imp
Date: Sat Sep  5 08:09:35 2009
New Revision: 196857
URL: http://svn.freebsd.org/changeset/base/196857

Log:
  Go ahead and mention the CVS branch name as well as the svn branch name.

Modified:
  head/UPDATING

Modified: head/UPDATING
==
--- head/UPDATING   Sat Sep  5 08:08:14 2009(r196856)
+++ head/UPDATING   Sat Sep  5 08:09:35 2009(r196857)
@@ -34,7 +34,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
maintain stop_cpus() to just use a normal IPI_STOP on ia32 and amd64.
 
 20090803:
-   stable/8 branch created in subversion.
+   The stable/8 branch created in subversion.  This corresponds to the
+   RELENG_8 branch in CVS.
 
 20090719:
Bump the shared library version numbers for all libraries that do not
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r196858 - head/sys/dev/rp

[Warner Losh]

Author: imp
Date: Sat Sep  5 08:38:25 2009
New Revision: 196858
URL: http://svn.freebsd.org/changeset/base/196858

Log:
  These checks against BUSY aren't needed: the newbus layer does this
  already with the appropriate locks held...  There's no need to do it
  here, so just delete the checks.

Modified:
  head/sys/dev/rp/rp_pci.c

Modified: head/sys/dev/rp/rp_pci.c
==
--- head/sys/dev/rp/rp_pci.cSat Sep  5 08:09:35 2009(r196857)
+++ head/sys/dev/rp/rp_pci.cSat Sep  5 08:38:25 2009(r196858)
@@ -225,11 +225,7 @@ rp_pcidetach(device_t dev)
 {
CONTROLLER_t*ctlp;
 
-   if (device_get_state(dev) == DS_BUSY)
-   return (EBUSY);
-
ctlp = device_get_softc(dev);
-
rp_pcireleaseresource(ctlp);
 
return (0);
@@ -240,11 +236,7 @@ rp_pcishutdown(device_t dev)
 {
CONTROLLER_t*ctlp;
 
-   if (device_get_state(dev) == DS_BUSY)
-   return (EBUSY);
-
ctlp = device_get_softc(dev);
-
rp_pcireleaseresource(ctlp);
 
return (0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r196984 - head/sys/dev/ep

[Warner Losh]

Author: imp
Date: Tue Sep  8 16:37:18 2009
New Revision: 196984
URL: http://svn.freebsd.org/changeset/base/196984

Log:
  Cleanup tortured logic a big.  Noticed by FlexLint, per phk.
  
  # My reading of the docs suggests this can only happen on 10Base5 and
  # 10Base2 setups (and maybe only the former), which I can't test
  # adequately since I have nothing but 10BaseT, etc here.

Modified:
  head/sys/dev/ep/if_ep.c

Modified: head/sys/dev/ep/if_ep.c
==
--- head/sys/dev/ep/if_ep.c Tue Sep  8 16:09:28 2009(r196983)
+++ head/sys/dev/ep/if_ep.c Tue Sep  8 16:37:18 2009(r196984)
@@ -665,14 +665,13 @@ rescan:
 #ifdef EP_LOCAL_STATS
sc->tx_underrun++;
 #endif
-   } else {
-   if (status & TXS_JABBER);
-   else
-   ++ifp->if_collisions;
-   /* TXS_MAX_COLLISION
-* we shouldn't get
-* here
-*/
+   }
+   if (status & TXS_MAX_COLLISION) {
+   /*
+* TXS_MAX_COLLISION we
+* shouldn't get here
+*/
+   ++ifp->if_collisions;
}
++ifp->if_oerrors;
CSR_WRITE_2(sc, EP_COMMAND, TX_ENABLE);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r197020 - head/sys/sys

[Warner Losh]

Author: imp
Date: Wed Sep  9 06:49:49 2009
New Revision: 197020
URL: http://svn.freebsd.org/changeset/base/197020

Log:
  kern_execve.c hasn't been around in ages, so update the file(s) where
  a_magic is used instead of the a_midmag
  
  # maybe we can retire this hack soon...

Modified:
  head/sys/sys/imgact_aout.h

Modified: head/sys/sys/imgact_aout.h
==
--- head/sys/sys/imgact_aout.h  Wed Sep  9 05:53:26 2009(r197019)
+++ head/sys/sys/imgact_aout.h  Wed Sep  9 06:49:49 2009(r197020)
@@ -119,7 +119,7 @@ struct exec {
  uint32_t  a_trsize;   /* text relocation size */
  uint32_t  a_drsize;   /* data relocation size */
 };
-#define a_magic a_midmag /* XXX Hack to work with current kern_execve.c */
+#define a_magic a_midmag /* XXX Hack to work with imgact_{aout,gzip}.c */
 
 /* a_magic */
 #defineOMAGIC  0407/* old impure format */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r197051 - head/usr.sbin/btxld

[Warner Losh]

Author: imp
Date: Thu Sep 10 00:47:32 2009
New Revision: 197051
URL: http://svn.freebsd.org/changeset/base/197051

Log:
  The boot loader is a FreeBSD a.out binary for x86, not a VAX binary.
  Rather than writing out a MID of '0', write a MID of 0x86 (aka
  MID_I386) so that file gets it right.
  
  This is a nop for boot2.  It just checks the MAGIC part of the field,
  ignoring the MID.  boot2 is the only thing that loads this file, and
  only on x86 so the MID_i386 is always the right value (the rest of the
  code is already x86 specific).
  
  Reviewed by:  bde@, jhb@
  MFC after:8.0 is out the door :)

Modified:
  head/usr.sbin/btxld/btxld.c

Modified: head/usr.sbin/btxld/btxld.c
==
--- head/usr.sbin/btxld/btxld.c Wed Sep  9 21:51:54 2009(r197050)
+++ head/usr.sbin/btxld/btxld.c Thu Sep 10 00:47:32 2009(r197051)
@@ -407,7 +407,7 @@ puthdr(int fd, struct hdr *hdr)
 switch (hdr->fmt) {
 case F_AOUT:
memset(&ex, 0, sizeof(ex));
-   N_SETMAGIC(ex, ZMAGIC, MID_ZERO, 0);
+   N_SETMAGIC(ex, ZMAGIC, MID_I386, 0);
hdr->text = N_ALIGN(ex, hdr->text);
ex.a_text = htole32(hdr->text);
hdr->data = N_ALIGN(ex, hdr->data);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r197047 - head/share/man/man4

[Warner Losh]

From: Brooks Davis 
Subject: svn commit: r197047 - head/share/man/man4
Date: Wed, 9 Sep 2009 20:28:58 + (UTC)

> Author: brooks
> Date: Wed Sep  9 20:28:58 2009
> New Revision: 197047
> URL: http://svn.freebsd.org/changeset/base/197047
> 
> Log:
>   Mention that a few ed(4) devices don't emit link state change notices
>   and a workaround for dhclient.

I thought that I'd made it so that we report the link as active always
for those devices that don't support reporting the link status in the
hardware.  Is this really necessary still?

Warner

>   Reviewed by: thierry
>   MFC after:  3 days
> 
> Modified:
>   head/share/man/man4/ed.4
> 
> Modified: head/share/man/man4/ed.4
> ==
> --- head/share/man/man4/ed.4  Wed Sep  9 19:40:54 2009(r197046)
> +++ head/share/man/man4/ed.4  Wed Sep  9 20:28:58 2009(r197047)
> @@ -425,3 +425,21 @@ driver is slow by today's standards.
>  .Pp
>  PC Card attachment supports the D-Link DMF650TX LAN/Modem card's Ethernet
>  port only at this time.
> +.Pp
> +Some devices supported by
> +.Nm
> +do no generate the link state change events used by
> +.Xr devd 8
> +to start
> +.Xr dhclinet 8 .
> +If you have problems with
> +.Xr dhclient 8
> +not starting and the device is always attached to the network it may
> +be possible to work around this by changing
> +.Dq Li DHCP
> +to
> +.Dq Li SYNCDHCP
> +in the
> +.Va ifconfig_ed0
> +entry in
> +.Pa /etc/rc.conf .
> 
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r197338 - svnadmin/conf

[Warner Losh]

Author: imp
Date: Sun Sep 20 05:04:23 2009
New Revision: 197338
URL: http://svn.freebsd.org/changeset/base/197338

Log:
  Add Neelkanth Natu.  He'll be doing MIPS things.  I'm his mentor.
  
  Approved by:  core@

Modified:
  svnadmin/conf/access
  svnadmin/conf/mentors

Modified: svnadmin/conf/access
==
--- svnadmin/conf/accessSun Sep 20 00:54:51 2009(r197337)
+++ svnadmin/conf/accessSun Sep 20 05:04:23 2009(r197338)
@@ -151,6 +151,7 @@ mtm
 murray
 mux
 n_hibmadevnull
+neel
 netchild
 nork
 np

Modified: svnadmin/conf/mentors
==
--- svnadmin/conf/mentors   Sun Sep 20 00:54:51 2009(r197337)
+++ svnadmin/conf/mentors   Sun Sep 20 05:04:23 2009(r197338)
@@ -17,6 +17,7 @@ fabient   jkoshy
 ivoras gnn
 jinmei gnn
 lstewart   gnn
+neel   imp
 nork   imp
 np gnn
 rdivacky   ed
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r197969 - head/sys/conf

[Warner Losh]

> On Oct 13, 2009, at 9:04 PM, M. Warner Losh wrote:
> > : > Does this mean that the memory cycles on the I/O bus isn't  
> > supported
> > : > for these architectures?
> > :
> > : Correct.
> >
> > Then it isn't an ISA bus.
> 
> Of course it isn't an ISA bus. It's all LPC. Leaving the specialized
> embedded market aside, there's no point discussing real ISA busses
> in the FreeBSD context. Noone cares and as long as it doesn't break
> anything noone is going to put in effort to fix the code.

LPC is a real ISA bus in this context, since it passes the memory range
decodes.

Your changes to break things.

It is a kludge.

I can't be more clear than this.  You keep ignoring me, and it is very
frustrating.

> > : There are no hooks to implement. If there is any FreeBSD supported
> > : board that actually needs to have the option ROMs scanned by orm(4),
> >
> > FreeBSD does support boards that need to have option ROMs scanned.
> 
> orm(4) doesn't do anything with it. Other than claim the memory
> region and indirectly enforce policy, there's nothing orm(4) does.
> Policy should be implemented in the platform code where the knowledge
> exists and it should not be done as a side-effect of a driver that
> encodes the knowledge of a single platform by way of hardcoding numbers
> that don't hold on other platforms.

Please listen.  orm(4) isn't the problem.  The problem is that the
powerpc and itanium isa modules allow memory ranges that shouldn't be
allowed.  That's the platform specific code that needs to be fixed.

> orm(4) causes machine checks and kernel panics on PowerPC and Itanium
> and none of the non-i386 hardware has any real history with ISA, so
> the sensible thing is to have orm(4) be specific to PC hardware where
> it has relevance. If orm(4) is actually *required* on non-PC hardware
> then one only has to add the appropriate line to file.${ARCH} and it's
> there.

To be pedantic: powerpc's buggy isa MD code is causing these
problems.  orm(4) is just a symptom, not the disease.

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r227589 - head/usr.bin/comm

[Warner Losh]

Author: imp
Date: Wed Nov 16 22:02:59 2011
New Revision: 227589
URL: http://svn.freebsd.org/changeset/base/227589

Log:
  Add helpful clarification text.  While not strictly necessary, these
  few words make this man page much easier to understand without
  re-reading prior parts of the man page.

Modified:
  head/usr.bin/comm/comm.1

Modified: head/usr.bin/comm/comm.1
==
--- head/usr.bin/comm/comm.1Wed Nov 16 21:51:17 2011(r227588)
+++ head/usr.bin/comm/comm.1Wed Nov 16 22:02:59 2011(r227589)
@@ -61,11 +61,13 @@ The filename ``-'' means the standard in
 The following options are available:
 .Bl -tag -width indent
 .It Fl 1
-Suppress printing of column 1.
+Suppress printing of column 1, lines only in 
+.Ar file1 .
 .It Fl 2
-Suppress printing of column 2.
+Suppress printing of column 2, lines only in
+.Ar file2 .
 .It Fl 3
-Suppress printing of column 3.
+Suppress printing of column 3, lines common to both.
 .It Fl i
 Case insensitive comparison of lines.
 .El
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216662 - head/share/mk

[Warner Losh]

On 12/22/2010 09:18, Bjoern A. Zeeb wrote:

On Wed, 22 Dec 2010, Nathan Whitehorn wrote:


Author: nwhitehorn
Date: Wed Dec 22 14:59:22 2010
New Revision: 216662
URL: http://svn.freebsd.org/changeset/base/216662

Log:
 Enable build of FDT components by default. dtc is a required build tool
 for all FDT-enabled kernels, and having it off by default means that
 building these kernels fails by default. This fixes FDT-related build
 failures in make universe on ARM and PowerPC.


Thanks a lot!  I wonder if it is arch specific conditional?  Is there
any value in having it on non-FDT kernels/architectures?

I am happily looking forward to a usable universe output again:-))

FDT enables building a tool that is sometimes used when building the kernel.

The problem is that it is a cross tool, and building things 
conditionally based on the architecture for cross tools is not well 
supported today.  The gross hack that attempted to do this was too hard 
to fix, so it is better to be always on.  The resulting bloat is tiny, 
it can be turned off if you want and it can be made conditional again 
once we have a better way to specify things like this conditionally.


Warner




 Reviewed by:imp

Modified:
 head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
== 


--- head/share/mk/bsd.own.mkWed Dec 22 14:49:18 2010(r216661)
+++ head/share/mk/bsd.own.mkWed Dec 22 14:59:22 2010(r216662)
@@ -326,6 +326,7 @@ _clang_no=CLANG
DICT \
DYNAMICROOT \
EXAMPLES \
+FDT \
FLOPPY \
FORTH \
FP_LIBC \
@@ -421,7 +422,6 @@ MK_${var}:=yes
BIND_XML \
BSD_GREP \
${_clang_no} \
-FDT \
GPIO \
HESIOD \
IDEA





___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216662 - head/share/mk

[Warner Losh]

On 12/22/2010 09:25, Nathan Whitehorn wrote:

On 12/22/10 10:18, Bjoern A. Zeeb wrote:

On Wed, 22 Dec 2010, Nathan Whitehorn wrote:


Author: nwhitehorn
Date: Wed Dec 22 14:59:22 2010
New Revision: 216662
URL: http://svn.freebsd.org/changeset/base/216662

Log:
 Enable build of FDT components by default. dtc is a required build 
tool

 for all FDT-enabled kernels, and having it off by default means that
 building these kernels fails by default. This fixes FDT-related build
 failures in make universe on ARM and PowerPC.


Thanks a lot!  I wonder if it is arch specific conditional?  Is there
any value in having it on non-FDT kernels/architectures?


There's no good way to make it arch-specific, according to Warner. If 
we grow such support, it could be made that way, but I don't think the 
300 K is enough to worry about. Also (hopefully), the list of 
architectures requiring it will continue to grow in the future.



I am happily looking forward to a usable universe output again:-))

Aside from some MIPS kernels requiring 64-bit toolchains not yet 
connected to the build, all make universe failures are now 100% 
genuine problems. Have fun, all :)


I was going to do a universe run after all the latest changes and try to 
fix that part of things, since those are rather important mips platforms 
to have connected and working :)


Warner

-Nathan





___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216681 - head/sys/arm/xscale/ixp425

[Warner Losh]

Author: imp
Date: Thu Dec 23 19:28:50 2010
New Revision: 216681
URL: http://svn.freebsd.org/changeset/base/216681

Log:
  IXP4XX_GPIO_{,UN}LOCK() don't take args.  Remove the sc here to make
  this compile again.

Modified:
  head/sys/arm/xscale/ixp425/avila_gpio.c

Modified: head/sys/arm/xscale/ixp425/avila_gpio.c
==
--- head/sys/arm/xscale/ixp425/avila_gpio.c Thu Dec 23 18:50:14 2010
(r216680)
+++ head/sys/arm/xscale/ixp425/avila_gpio.c Thu Dec 23 19:28:50 2010
(r216681)
@@ -148,7 +148,7 @@ avila_gpio_pin_configure(struct avila_gp
 * Manage input/output
 */
if (flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
-   IXP4XX_GPIO_LOCK(sc);
+   IXP4XX_GPIO_LOCK();
pin->gp_flags &= ~(GPIO_PIN_INPUT|GPIO_PIN_OUTPUT);
if (flags & GPIO_PIN_OUTPUT) {
pin->gp_flags |= GPIO_PIN_OUTPUT;
@@ -158,7 +158,7 @@ avila_gpio_pin_configure(struct avila_gp
pin->gp_flags |= GPIO_PIN_INPUT;
GPIO_SET_BITS(sc, IXP425_GPIO_GPOER, mask);
}
-   IXP4XX_GPIO_UNLOCK(sc);
+   IXP4XX_GPIO_UNLOCK();
}
 }
 
@@ -190,11 +190,11 @@ avila_gpio_pin_getflags(device_t dev, ui
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & (1 << pin)))
return (EINVAL);
 
-   IXP4XX_GPIO_LOCK(sc);
+   IXP4XX_GPIO_LOCK();
/* refresh since we do not own all the pins */
sc->sc_pins[pin].gp_flags = avila_gpio_pin_flags(sc, pin);
*flags = sc->sc_pins[pin].gp_flags;
-   IXP4XX_GPIO_UNLOCK(sc);
+   IXP4XX_GPIO_UNLOCK();
 
return (0);
 }
@@ -242,12 +242,12 @@ avila_gpio_pin_set(device_t dev, uint32_
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask))
return (EINVAL);
 
-   IXP4XX_GPIO_LOCK(sc);
+   IXP4XX_GPIO_LOCK();
if (value)
GPIO_SET_BITS(sc, IXP425_GPIO_GPOUTR, mask);
else
GPIO_CLEAR_BITS(sc, IXP425_GPIO_GPOUTR, mask);
-   IXP4XX_GPIO_UNLOCK(sc);
+   IXP4XX_GPIO_UNLOCK();
 
return (0);
 }
@@ -260,9 +260,9 @@ avila_gpio_pin_get(device_t dev, uint32_
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & (1 << pin)))
return (EINVAL);
 
-   IXP4XX_GPIO_LOCK(sc);
+   IXP4XX_GPIO_LOCK();
*val = (GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR) & (1 << pin)) ? 1 : 0;
-   IXP4XX_GPIO_UNLOCK(sc);
+   IXP4XX_GPIO_UNLOCK();
 
return (0);
 }
@@ -277,13 +277,13 @@ avila_gpio_pin_toggle(device_t dev, uint
if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask))
return (EINVAL);
 
-   IXP4XX_GPIO_LOCK(sc);
+   IXP4XX_GPIO_LOCK();
res = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPINR) & mask;
if (res)
GPIO_CLEAR_BITS(sc, IXP425_GPIO_GPOUTR, mask);
else
GPIO_SET_BITS(sc, IXP425_GPIO_GPOUTR, mask);
-   IXP4XX_GPIO_UNLOCK(sc);
+   IXP4XX_GPIO_UNLOCK();
 
return (0);
 }
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r216685 - head

[Warner Losh]

Author: imp
Date: Fri Dec 24 04:55:56 2010
New Revision: 216685
URL: http://svn.freebsd.org/changeset/base/216685

Log:
  Redirect stderr from config to /dev/null.  config -m is printing lots
  of annoying warnings when dealing with arm.  The arm config files need
  to be fixed, but this restricts the output to a more useful place.

Modified:
  head/Makefile

Modified: head/Makefile
==
--- head/Makefile   Fri Dec 24 04:52:53 2010(r216684)
+++ head/Makefile   Fri Dec 24 04:55:56 2010(r216685)
@@ -350,8 +350,8 @@ KERNCONFS!= cd ${.CURDIR}/sys/${TARGET}/
 universe_kernconfs:
 .for kernel in ${KERNCONFS}
 TARGET_ARCH_${kernel}!=cd ${.CURDIR}/sys/${TARGET}/conf && \
-   config -m ${.CURDIR}/sys/${TARGET}/conf/${kernel} | \
-   cut -f 2
+   config -m ${.CURDIR}/sys/${TARGET}/conf/${kernel} 2> /dev/null | \
+   cut -f 2
 universe_kernconfs: universe_kernconf_${TARGET}_${kernel}
 universe_kernconf_${TARGET}_${kernel}:
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216685 - head

[Warner Losh]

On 12/26/2010 13:23, Bjoern A. Zeeb wrote:

On Fri, 24 Dec 2010, Warner Losh wrote:


Author: imp
Date: Fri Dec 24 04:55:56 2010
New Revision: 216685
URL: http://svn.freebsd.org/changeset/base/216685

Log:
 Redirect stderr from config to /dev/null.  config -m is printing lots
 of annoying warnings when dealing with arm.  The arm config files need
 to be fixed, but this restricts the output to a more useful place.


I'll assume these are the warning about duplicate devices and options.
Would we get the same warnings again when actually running config on
the kernel config files and will they then go to the logs?
You'll get them again, and they will go to the appropriate 
_.$MACHINE.$KERNEL log file.  They should be fixed, of course, but they 
shouldn't be in this output...


Also, the warnings turned out to not be from the arm kernels at all...

Warner



Modified:
 head/Makefile

Modified: head/Makefile
== 


--- head/MakefileFri Dec 24 04:52:53 2010(r216684)
+++ head/MakefileFri Dec 24 04:55:56 2010(r216685)
@@ -350,8 +350,8 @@ KERNCONFS!=cd ${.CURDIR}/sys/${TARGET}/
universe_kernconfs:
.for kernel in ${KERNCONFS}
TARGET_ARCH_${kernel}!=cd ${.CURDIR}/sys/${TARGET}/conf && \
-config -m ${.CURDIR}/sys/${TARGET}/conf/${kernel} | \
-cut -f 2
+config -m ${.CURDIR}/sys/${TARGET}/conf/${kernel} 2> /dev/null | \
+cut -f 2
universe_kernconfs: universe_kernconf_${TARGET}_${kernel}
universe_kernconf_${TARGET}_${kernel}:
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \





___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216746 - head/sys/conf

[Warner Losh]

On 12/27/2010 19:02, Colin Percival wrote:

On 12/27/10 17:59, Steve Kargl wrote:

On Mon, Dec 27, 2010 at 11:52:40PM +, Colin Percival wrote:

   Make it possible to specify WITHOUT_MODULES in a kernel config file.

Can you explain how this differs from
makeoptions NO_MODULES
which has been able to do for years?

NO_MODULES means what it says: No modules.

WITHOUT_MODULES="foo bar baz" means "go ahead and build modules except for foo,
bar, and baz".
Most of the other uses of the WITHOUT_xxx in the tree means omit feature 
xxx entirely...  I usually hate to nit-pick names, but in this case I 
think "OMIT_MODULES" would be a better name and less confusing for the 
other uses of WITHOUT_FOO in the tree...


Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r216746 - head/sys/conf

[Warner Losh]

On 12/27/2010 19:09, Steve Kargl wrote:

On Mon, Dec 27, 2010 at 06:02:57PM -0800, Colin Percival wrote:

On 12/27/10 17:59, Steve Kargl wrote:

On Mon, Dec 27, 2010 at 11:52:40PM +, Colin Percival wrote:

   Make it possible to specify WITHOUT_MODULES in a kernel config file.

Can you explain how this differs from
makeoptions NO_MODULES
which has been able to do for years?

NO_MODULES means what it says: No modules.

WITHOUT_MODULES="foo bar baz" means "go ahead and build modules except for foo,
bar, and baz".


Thanks.  The distincion wasn't clear from the commit log.
I read it as "Build a kernel WITHOUT building MODULES",
which is what NO_MODULES does.


which is why I'd like to have its name changed: it is confusing this way...

Warner
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"