diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/Makefile.inc1 ./Makefile.inc1 --- /dune/imp/svn/head/Makefile.inc1 2010-04-14 12:55:42.000000000 -0600 +++ ./Makefile.inc1 2010-04-14 14:48:05.000000000 -0600 @@ -29,10 +29,7 @@ # obj depend all install clean cleandepend cleanobj .include - -.if ${MACHINE_ARCH} == "mips" -MK_RESCUE=no # not yet -.endif +.include # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to @@ -121,16 +118,16 @@ # 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 sparc64 sparc64/sun4v +KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 mipsel/mips mipseb/mips powerpc sparc64 sparc64/sun4v .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -167,7 +164,7 @@ .if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING) OBJTREE= ${MAKEOBJDIRPREFIX} .else -OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} +OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp # /usr/games added for fortune which depend on strfile @@ -1097,10 +1094,10 @@ # all shared libraries for ELF. # _startup_libs= gnu/lib/csu -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) -_startup_libs+= lib/csu/${MACHINE_ARCH}-elf +.if exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf) +_startup_libs+= lib/csu/${MACHINE_CPUARCH}-elf .else -_startup_libs+= lib/csu/${MACHINE_ARCH} +_startup_libs+= lib/csu/${MACHINE_CPUARCH} .endif _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libc diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/Makefile.mips ./Makefile.mips --- /dune/imp/svn/head/Makefile.mips 1969-12-31 17:00:00.000000000 -0700 +++ ./Makefile.mips 2010-04-12 10:46:04.000000000 -0600 @@ -0,0 +1,2 @@ +# $FreeBSD$ +MK_RESCUE=no diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/README-BRANCH ./README-BRANCH --- /dune/imp/svn/head/README-BRANCH 1969-12-31 17:00:00.000000000 -0700 +++ ./README-BRANCH 2010-04-12 10:46:04.000000000 -0600 @@ -0,0 +1,29 @@ +TARGET_BIG_ENDIAN must die + +Changes in MACHINE_ARCH: + +mips (big endian) mipseb +mips (little endian) mipsel +arm (little endian) arm For historical reasons +arm (big endian) armeb + +What we call today MACHINE_ARCH is really MACHINE_CPUARCH. This is +called MACHINE_CPU on NetBSD, but FreeBSD already uses MACHINE_CPU for +other purposes. In general $MACHINE_ARCH -> $MACHINE_CPUARCH in most +places in the tree. MACHINE_CPUARCH is defined in bsd.own.mk, since +it is dependent on the bsd tree, actually. All the translation from +MACHINE_ARCH to MACHINE_CPUARCH assumes that all members of that +family are supported by one set of files on FreeBSD. So mips files +have support for both big and little endian. But MACHINE_ARCH +determines the default binaries that are generated. + +We'll likely need to have a MACHINE_ABI at some point. Both MIPS and +ARM have multiple ABIs, and we'll need something to be the default, +and different CPUs within a family might have different defaults. +Etc. Plus there's t he need for multilib. However, issues like this +are beyond the scope of this branch. + +In addition, this branch starts to move away from having if this +machine compile this, if that machine compile that lists in the Makefiles, +but moves them to a Makefile.$ARCH where $ARCH is $MACHINE_CPUARCH, +$MACHINE_ARCH or $MACHINE, tried in that order. diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/bin/Makefile ./bin/Makefile --- /dune/imp/svn/head/bin/Makefile 2010-02-18 09:00:33.000000000 -0700 +++ ./bin/Makefile 2010-04-12 10:40:09.000000000 -0600 @@ -8,7 +8,6 @@ chio \ chmod \ cp \ - ${_csh} \ date \ dd \ df \ @@ -29,10 +28,8 @@ ps \ pwait \ pwd \ - ${_rcp} \ realpath \ rm \ - ${_rmail} \ rmdir \ setfacl \ sh \ @@ -43,15 +40,19 @@ uuidgen .if ${MK_RCMDS} != "no" -_rcp= rcp +SUBDIR+= rcp .endif .if ${MK_SENDMAIL} != "no" -_rmail= rmail +SUBDIR+= rmail .endif .if ${MK_TCSH} != "no" -_csh= csh +SUBDIR+= csh .endif +.include + +SUBDIR:= ${SUBDIR:O} + .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/cddl/lib/libdtrace/Makefile ./cddl/lib/libdtrace/Makefile --- /dune/imp/svn/head/cddl/lib/libdtrace/Makefile 2010-03-02 12:39:04.000000000 -0700 +++ ./cddl/lib/libdtrace/Makefile 2010-04-12 10:38:45.000000000 -0600 @@ -60,9 +60,9 @@ #CFLAGS+= -DYYDEBUG -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -.elif ${MACHINE_ARCH} == "sparc64" +.elif ${MACHINE_CPUARCH} == "sparc64" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc .else # temporary hack diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/cddl/lib/libzpool/Makefile ./cddl/lib/libzpool/Makefile --- /dune/imp/svn/head/cddl/lib/libzpool/Makefile 2010-03-02 12:39:04.000000000 -0700 +++ ./cddl/lib/libzpool/Makefile 2010-04-12 10:38:45.000000000 -0600 @@ -11,8 +11,8 @@ # LIST_SRCS .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "ia64" +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_CPUARCH} ATOMIC_SRCS= opensolaris_atomic.S .else .PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern @@ -51,7 +51,7 @@ CFLAGS+= -DWANTS_MUTEX_OWNED CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys -CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include +CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include DPADD= ${LIBPTHREAD} ${LIBZ} LDADD= -lpthread -lz diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/contrib/smbfs/Makefile ./contrib/smbfs/Makefile --- /dune/imp/svn/head/contrib/smbfs/Makefile 2010-02-18 08:57:08.000000000 -0700 +++ ./contrib/smbfs/Makefile 2010-04-12 10:36:27.000000000 -0600 @@ -9,7 +9,7 @@ # deinstall-src undo corresponding install-* target # clean cleanup source tree -.if ${MACHINE_ARCH} != "i386" +.if ${MACHINE_CPUARCH} != "i386" . error "only IA32 machines supported" .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/etc/Makefile ./etc/Makefile --- /dune/imp/svn/head/etc/Makefile 2010-03-19 17:53:44.000000000 -0600 +++ ./etc/Makefile 2010-04-12 17:05:12.000000000 -0600 @@ -23,7 +23,7 @@ .if exists(${.CURDIR}/etc.${MACHINE}/ttys) BIN1+= etc.${MACHINE}/ttys .else -BIN1+= etc.${MACHINE_ARCH}/ttys +BIN1+= etc.${MACHINE_CPUARCH}/ttys .endif OPENBSMDIR= ${.CURDIR}/../contrib/openbsm diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/lib/csu/Makefile ./gnu/lib/csu/Makefile --- /dune/imp/svn/head/gnu/lib/csu/Makefile 2010-02-18 08:48:59.000000000 -0700 +++ ./gnu/lib/csu/Makefile 2010-04-12 10:26:21.000000000 -0600 @@ -23,18 +23,18 @@ CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} MKDEP= -DCRT_BEGIN -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack CFLAGS+= -include osreldate.h .undef SRCS # hack for 'make depend' .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" TGTOBJS= crtsavres.o SRCS+= crtsavres.asm .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" TGTOBJS= crtfastmath.o SRCS+= crtfastmath.c .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/lib/libgcc/Makefile ./gnu/lib/libgcc/Makefile --- /dune/imp/svn/head/gnu/lib/libgcc/Makefile 2010-02-18 08:48:58.000000000 -0700 +++ ./gnu/lib/libgcc/Makefile 2010-04-12 10:26:20.000000000 -0600 @@ -26,7 +26,7 @@ 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 #--------------------------------------------------------------------------- # @@ -99,7 +99,7 @@ # 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 @@ -115,11 +115,11 @@ # _fixsfsi _fixunssfsi _floatdidf _floatdisf .endif -.if ${TARGET_ARCH} == "mips" +.if ${TARGET_CPUARCH} == "mips" LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c .endif -.if ${TARGET_ARCH} == "ia64" +.if ${TARGET_CPUARCH} == "ia64" # from config/ia64/t-ia64 LIB1ASMSRC = lib1funcs.asm LIB1ASMFUNCS = __divxf3 __divdf3 __divsf3 \ @@ -130,13 +130,13 @@ 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} == "sparc64" +.if ${TARGET_CPUARCH} == "sparc64" # from config/sparc/t-elf LIB1ASMSRC = lb1spc.asm LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 @@ -183,8 +183,8 @@ # # 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 diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/lib/libgomp/Makefile ./gnu/lib/libgomp/Makefile --- /dune/imp/svn/head/gnu/lib/libgomp/Makefile 2010-02-18 08:48:59.000000000 -0700 +++ ./gnu/lib/libgomp/Makefile 2010-04-12 10:26:21.000000000 -0600 @@ -23,8 +23,9 @@ VERSION_MAP= ${SRCDIR}/libgomp.map # Target-specific OpenMP configuration -.if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == i386 || \ - ${MACHINE_ARCH} == mips || ${MACHINE_ARCH} == powerpc +.if ${MACHINE_CPUARCH} == arm || ${MACHINE_CPUARCH} == i386 || \ + ${MACHINE_ARCH} == mipsel || ${MACHINE_ARCH} == mipseb || \ + ${MACHINE_ARCH} == powerpc OMP_LOCK_ALIGN = 4 OMP_LOCK_KIND= 4 OMP_LOCK_SIZE= 4 diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/lib/libstdc++/Makefile ./gnu/lib/libstdc++/Makefile --- /dune/imp/svn/head/gnu/lib/libstdc++/Makefile 2010-02-18 08:48:59.000000000 -0700 +++ ./gnu/lib/libstdc++/Makefile 2010-04-12 10:26:21.000000000 -0600 @@ -13,7 +13,7 @@ SHLIB_MAJOR= 6 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "arm" CFLAGS+= -D_GLIBCXX_SJLJ_EXCEPTIONS=1 .endif CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include @@ -66,14 +66,14 @@ SRCS+= cp-demangle.c # MD headers location -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" MARCHDIR= sparc -.elif ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU} != 'i386' +.elif ${MACHINE_CPUARCH} == "i386" && ${MACHINE_CPU} != 'i386' MARCHDIR= i486 -.elif ${MACHINE_ARCH} == "amd64" +.elif ${MACHINE_CPUARCH} == "amd64" MARCHDIR= i486 .else -MARCHDIR= ${MACHINE_ARCH} +MARCHDIR= ${MACHINE_CPUARCH} .endif .if exists(${SRCDIR}/config/cpu/${MARCHDIR}/atomicity.h) @@ -82,7 +82,7 @@ ATOMICITY_H= ${SRCDIR}/config/cpu/generic/atomicity_mutex/atomicity.h .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" .if exists(${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h) ATOMICITY_H= ${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/binutils/Makefile.inc0 ./gnu/usr.bin/binutils/Makefile.inc0 --- /dune/imp/svn/head/gnu/usr.bin/binutils/Makefile.inc0 2010-02-18 08:48:53.000000000 -0700 +++ ./gnu/usr.bin/binutils/Makefile.inc0 2010-04-12 10:26:11.000000000 -0600 @@ -6,13 +6,17 @@ VERSION= "2.15 [FreeBSD] 2004-05-23" -TARGET_ARCH?= ${MACHINE_ARCH} -.if ${TARGET_ARCH} == "amd64" -BINUTILS_ARCH=x86_64 +.if defined(TARGET_ARCH) +TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} .else -BINUTILS_ARCH=${TARGET_ARCH} +TARGET_CPUARCH=${MACHINE_CPUARCH} .endif +TARGET_ARCH?= ${MACHINE_ARCH} +BINUTILS_ARCH=${TARGET_ARCH:C/amd64/x86_64/} TARGET_TUPLE?= ${BINUTILS_ARCH}-obrien-freebsd +.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH} == "mipseb" +TARGET_BIG_ENDIAN=t +.endif # RELTOP is the relative path to this point in the source or object # tree, from any subdirectory of same. It gets extra "../" prefixes @@ -22,27 +26,27 @@ RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "i386" || \ - ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "mips" +.if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "i386" || \ + ${TARGET_CPUARCH} == "powerpc" || ${TARGET_CPUARCH} == "mips" CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 .else CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 .endif CFLAGS+= -I. -.if exists(${.CURDIR}/${TARGET_ARCH}) -CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} +.if exists(${.CURDIR}/${TARGET_CPUARCH}) +CFLAGS+= -I${.CURDIR}/${TARGET_CPUARCH} .endif CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd CFLAGS+= -I${.OBJDIR}/${RELTOP}/libbfd CFLAGS+= -I${SRCDIR}/include -.if exists(${.CURDIR}/${TARGET_ARCH}) -.PATH: ${.CURDIR}/${TARGET_ARCH} +.if exists(${.CURDIR}/${TARGET_CPUARCH}) +.PATH: ${.CURDIR}/${TARGET_CPUARCH} .endif -ARCHS= ${TARGET_ARCH} +ARCHS= ${TARGET_CPUARCH} .for _arch in ${CROSS_ARCH} .if (${ARCHS:R:M${_arch:R}} == "") diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/binutils/as/Makefile ./gnu/usr.bin/binutils/as/Makefile --- /dune/imp/svn/head/gnu/usr.bin/binutils/as/Makefile 2010-02-18 08:48:52.000000000 -0700 +++ ./gnu/usr.bin/binutils/as/Makefile 2010-04-12 10:26:11.000000000 -0600 @@ -20,7 +20,7 @@ # DEO: why not used? #SRCS+= itbl-ops.c -.if ${TARGET_ARCH} == "mips" +.if ${TARGET_CPUARCH} == "mips" SRCS+= itbl-ops.c itbl-parse.y itbl-lex.l .endif @@ -32,7 +32,7 @@ # change back to tc-sparc.c when new binutils is imported SRCS+= tc-sparc-fixed.c .else -SRCS+= tc-${TARGET_ARCH}.c +SRCS+= tc-${TARGET_CPUARCH}.c .endif .if ${TARGET_ARCH} == "sparc64" @@ -49,7 +49,7 @@ CFLAGS+= -DVERSION=\"${VERSION}\" CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_ARCH}-freebsd +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_CPUARCH}-freebsd NO_SHARED?= yes diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/binutils/gdb/Makefile ./gnu/usr.bin/binutils/gdb/Makefile --- /dune/imp/svn/head/gnu/usr.bin/binutils/gdb/Makefile 2010-02-18 08:48:52.000000000 -0700 +++ ./gnu/usr.bin/binutils/gdb/Makefile 2010-04-12 10:26:10.000000000 -0600 @@ -8,13 +8,7 @@ .PATH: ${SRCDIR}/opcodes ${SRCDIR}/binutils # For FSF GDB files, use their CPU (arch) name; for our files use ours. -.if ${TARGET_ARCH} == "sparc64" -GDB_CPU= sparc -.elif ${TARGET_ARCH} == "amd64" -GDB_CPU= i386 -.else -GDB_CPU= ${TARGET_ARCH} -.endif +GDB_CPU=${TARGET_CPUARCH:C/amd64/i386/:C/powerpc/rs6000/:C/sparc64/sparc/} NO_SHARED?=yes PROG= gdb @@ -55,7 +49,7 @@ CFLAGS+= -DCROSS_COMPILE=1 .endif CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${GDB_CPU}_arch -CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} +CFLAGS+= -I${.CURDIR}/${TARGET_CPUARCH} CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd CFLAGS+= -I${GDBDIR}/gdb -I${GDBDIR}/gdb/config CFLAGS+= -I$(.CURDIR) @@ -121,8 +115,8 @@ tm.h: echo '#include "${GDB_CPU}/tm-fbsd.h"' > ${.TARGET} -.if exists(${.CURDIR}/fbsd-kgdb-${TARGET_ARCH}.h) - echo '#include "fbsd-kgdb-${TARGET_ARCH}.h"' >> ${.TARGET} +.if exists(${.CURDIR}/fbsd-kgdb-${TARGET_CPUARCH}.h) + echo '#include "fbsd-kgdb-${TARGET_CPUARCH}.h"' >> ${.TARGET} .endif .for H in nm-fbsd xm-${GDB_CPU} @@ -131,7 +125,7 @@ .endfor kvm-fbsd-machine.h: - ln -sf ${.CURDIR}/kvm-fbsd-${TARGET_ARCH}.h ${.TARGET} + ln -sf ${.CURDIR}/kvm-fbsd-${TARGET_CPUARCH}.h ${.TARGET} GDB_VERSION= "5.2.1 (FreeBSD)" gdbversion.c: Makefile diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/binutils/ld/Makefile.arm ./gnu/usr.bin/binutils/ld/Makefile.arm --- /dune/imp/svn/head/gnu/usr.bin/binutils/ld/Makefile.arm 2010-02-18 08:48:52.000000000 -0700 +++ ./gnu/usr.bin/binutils/ld/Makefile.arm 2010-04-12 10:26:10.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/gnu/usr.bin/binutils/ld/Makefile.arm 162300 2006-09-14 07:44:05Z imp $ +# $FreeBSD: user/imp/tbemd/gnu/usr.bin/binutils/ld/Makefile.arm 203446 2010-02-03 21:29:06Z imp $ -.if defined(TARGET_BIG_ENDIAN) +.if ${TARGET_ARCH} == "armeb" NATIVE_EMULATION= armelfb_fbsd .else NATIVE_EMULATION= armelf_fbsd diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/binutils/ld/Makefile.mips ./gnu/usr.bin/binutils/ld/Makefile.mips --- /dune/imp/svn/head/gnu/usr.bin/binutils/ld/Makefile.mips 2010-03-01 23:52:12.000000000 -0700 +++ ./gnu/usr.bin/binutils/ld/Makefile.mips 2010-04-12 10:26:10.000000000 -0600 @@ -1,10 +1,8 @@ -# $FreeBSD: head/gnu/usr.bin/binutils/ld/Makefile.mips 204548 2010-03-02 05:43:04Z imp $ +# $FreeBSD: user/imp/tbemd/gnu/usr.bin/binutils/ld/Makefile.mips 204601 2010-03-02 20:20:53Z imp $ -#xxxIMPxxx: size? -#xxxIMPxxx: TARGET_BIG_ENDIAN is lame. We should use the netbsd convention -# of mipsel and mips. +# XXX still need to swizle in size _sz?=32 -.if defined(TARGET_BIG_ENDIAN) +.if ${TARGET_ARCH} == "mipseb" NATIVE_EMULATION=elf${_sz}btsmip_fbsd .else NATIVE_EMULATION=elf${_sz}ltsmip_fbsd diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/binutils/libbfd/Makefile.arm ./gnu/usr.bin/binutils/libbfd/Makefile.arm --- /dune/imp/svn/head/gnu/usr.bin/binutils/libbfd/Makefile.arm 2010-02-18 08:48:51.000000000 -0700 +++ ./gnu/usr.bin/binutils/libbfd/Makefile.arm 2010-04-12 10:26:09.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/gnu/usr.bin/binutils/libbfd/Makefile.arm 162304 2006-09-14 08:21:20Z imp $ +# $FreeBSD: user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile.arm 203446 2010-02-03 21:29:06Z imp $ -.if defined(TARGET_BIG_ENDIAN) +.if ${TARGET_ARCH} == "armeb" DEFAULT_VECTOR= bfd_elf32_bigarm_vec .else DEFAULT_VECTOR= bfd_elf32_littlearm_vec @@ -14,7 +14,7 @@ elflink.c VECS+= ${DEFAULT_VECTOR} -.if defined(TARGET_BIG_ENDIAN) +.if ${TARGET_ARCH} == "armeb" VECS+= bfd_elf32_littlearm_vec .else VECS+= bfd_elf32_bigarm_vec diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/binutils/libbfd/Makefile.mips ./gnu/usr.bin/binutils/libbfd/Makefile.mips --- /dune/imp/svn/head/gnu/usr.bin/binutils/libbfd/Makefile.mips 2010-02-18 08:48:51.000000000 -0700 +++ ./gnu/usr.bin/binutils/libbfd/Makefile.mips 2010-04-12 10:26:09.000000000 -0600 @@ -1,7 +1,10 @@ -# $FreeBSD: head/gnu/usr.bin/binutils/libbfd/Makefile.mips 185924 2008-12-11 08:20:34Z imp $ +# $FreeBSD: user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile.mips 203446 2010-02-03 21:29:06Z imp $ -#xxxIMPxxx: endian and size +.if ${TARGET_ARCH} == "mipsel" +DEFAULT_VECTOR= bfd_elf32_tradlittlemips_vec +.else DEFAULT_VECTOR= bfd_elf32_tradbigmips_vec +.endif SRCS+= coff-mips.c \ cpu-mips.c \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/cc/Makefile.inc ./gnu/usr.bin/cc/Makefile.inc --- /dune/imp/svn/head/gnu/usr.bin/cc/Makefile.inc 2010-03-05 14:22:09.000000000 -0700 +++ ./gnu/usr.bin/cc/Makefile.inc 2010-04-12 16:32:11.000000000 -0600 @@ -30,7 +30,10 @@ CFLAGS+= -DCROSS_COMPILE .endif -.if ${TARGET_ARCH} == "mips" && !defined(TARGET_BIG_ENDIAN) +.if ${TARGET_ARCH} == "armeb" +CFLAGS += -DTARGET_ENDIAN_DEFAULT=MASK_BIG_END +.endif +.if ${TARGET_ARCH} == "mipsel" CFLAGS += -DTARGET_ENDIAN_DEFAULT=0 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/cc/Makefile.tgt ./gnu/usr.bin/cc/Makefile.tgt --- /dune/imp/svn/head/gnu/usr.bin/cc/Makefile.tgt 2010-02-18 08:48:49.000000000 -0700 +++ ./gnu/usr.bin/cc/Makefile.tgt 2010-04-12 10:26:07.000000000 -0600 @@ -1,16 +1,15 @@ -# $FreeBSD: head/gnu/usr.bin/cc/Makefile.tgt 201849 2010-01-08 23:02:17Z imp $ +# $FreeBSD: user/imp/tbemd/gnu/usr.bin/cc/Makefile.tgt 203446 2010-02-03 21:29:06Z imp $ -TARGET_ARCH?= ${MACHINE_ARCH} +# These assignments duplicate much of the functionality of +# MACHINE_CPUARCH, but there's no easy way to export make functions... -.if ${TARGET_ARCH} == "amd64" -GCC_CPU= i386 -.elif ${TARGET_ARCH} == "powerpc" -GCC_CPU= rs6000 -.elif ${TARGET_ARCH} == "sparc64" -GCC_CPU= sparc +.if defined(TARGET_ARCH) +TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} .else -GCC_CPU= ${TARGET_ARCH} +TARGET_CPUARCH=${MACHINE_CPUARCH} .endif +TARGET_ARCH?= ${MACHINE_ARCH} +GCC_CPU=${TARGET_CPUARCH:C/amd64/i386/:C/powerpc/rs6000/:C/sparc64/sparc/} .if ${TARGET_ARCH} == "ia64" TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD @@ -18,3 +17,6 @@ .if ${TARGET_ARCH} == "sparc64" TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc .endif +.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH} == "mipseb" +TARGET_BIG_ENDIAN=t +.endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/cc/cc_int/Makefile ./gnu/usr.bin/cc/cc_int/Makefile --- /dune/imp/svn/head/gnu/usr.bin/cc/cc_int/Makefile 2010-02-18 08:48:48.000000000 -0700 +++ ./gnu/usr.bin/cc/cc_int/Makefile 2010-04-12 10:26:06.000000000 -0600 @@ -75,10 +75,6 @@ # Target specific, C specific object file C_TARGET_OBJS= -.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) -CFLAGS += -DTARGET_ENDIAN_DEFAULT=MASK_BIG_END -.endif - # Language-specific object files for C and Objective C. C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \ c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/cc/cc_tools/Makefile ./gnu/usr.bin/cc/cc_tools/Makefile --- /dune/imp/svn/head/gnu/usr.bin/cc/cc_tools/Makefile 2010-02-18 08:48:49.000000000 -0700 +++ ./gnu/usr.bin/cc/cc_tools/Makefile 2010-04-12 10:26:07.000000000 -0600 @@ -22,13 +22,13 @@ # The list of headers to go into tm.h # TARGET_INC+= options.h -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_CPUARCH} == "amd64" TARGET_INC+= i386/biarch64.h .endif -.if ${TARGET_ARCH} != "arm" +.if ${TARGET_CPUARCH} != "arm" TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h .endif -.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" +.if ${TARGET_CPUARCH} == "i386" || ${TARGET_CPUARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/unix.h TARGET_INC+= ${GCC_CPU}/att.h .endif @@ -38,25 +38,25 @@ TARGET_INC+= freebsd-native.h TARGET_INC+= freebsd-spec.h TARGET_INC+= freebsd.h -.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" +.if ${TARGET_CPUARCH} != "i386" && ${TARGET_CPUARCH} != "amd64" . if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h) TARGET_INC+= ${GCC_CPU}/sysv4.h . endif .endif -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_CPUARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h .endif -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "mips" +.if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "mips" TARGET_INC+= ${GCC_CPU}/elf.h .endif -.if ${TARGET_ARCH} == "arm" +.if ${TARGET_CPUARCH} == "arm" TARGET_INC+= ${GCC_CPU}/aout.h .endif TARGET_INC+= ${GCC_CPU}/freebsd.h -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_CPUARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/freebsd64.h .endif -.if ${TARGET_ARCH} == "arm" +.if ${TARGET_CPUARCH} == "arm" TARGET_INC+= ${GCC_CPU}/arm.h .endif TARGET_INC+= defaults.h @@ -171,11 +171,11 @@ OPT_FILES+= ${.CURDIR}/${GCC_CPU}-freebsd.opt .endif -.if ${TARGET_ARCH} == "powerpc" +.if ${TARGET_CPUARCH} == "powerpc" OPT_FILES+= ${GCCDIR}/config/${GCC_CPU}/sysv4.opt .endif -.if ${TARGET_ARCH} == "sparc64" +.if ${TARGET_CPUARCH} == "sparc64" OPT_FILES+= ${GCCDIR}/config/${GCC_CPU}/long-double-switch.opt .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/gdb/Makefile ./gnu/usr.bin/gdb/Makefile --- /dune/imp/svn/head/gnu/usr.bin/gdb/Makefile 2010-04-12 17:35:36.000000000 -0600 +++ ./gnu/usr.bin/gdb/Makefile 2010-04-12 17:41:04.000000000 -0600 @@ -2,8 +2,7 @@ SUBDIR= doc libgdb gdb gdbtui kgdb -TARGET_ARCH?= ${MACHINE_ARCH} -.if exists(${.CURDIR}/gdbserver/reg-${TARGET_ARCH}.c) +.if exists(${.CURDIR}/gdbserver/reg-${MACHINE_CPUARCH}.c) SUBDIR+=gdbserver .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/gdb/Makefile.inc ./gnu/usr.bin/gdb/Makefile.inc --- /dune/imp/svn/head/gnu/usr.bin/gdb/Makefile.inc 2010-03-29 10:08:19.000000000 -0600 +++ ./gnu/usr.bin/gdb/Makefile.inc 2010-04-12 17:05:12.000000000 -0600 @@ -16,8 +16,16 @@ OBJ_BU= ${OBJ_ROOT}/binutils OBJ_GDB= ${OBJ_ROOT}/gdb -TARGET_ARCH?= ${MACHINE_ARCH} -TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_ARCH} +# These assignments duplicate much of the functionality of +# 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/} +.else +TARGET_CPUARCH=${MACHINE_CPUARCH} +.endif +TARGET_ARCH?= ${MACHINE_ARCH} +TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_CPUARCH} .if ${TARGET_ARCH} != ${MACHINE_ARCH} GDB_CROSS_DEBUGGER= @@ -31,7 +39,7 @@ CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1 CFLAGS+= -I. CFLAGS+= -I${TARGET_SUBDIR} -CFLAGS+= -I${BMAKE_BU}/libbfd -I${BMAKE_BU}/libbfd/${TARGET_ARCH} +CFLAGS+= -I${BMAKE_BU}/libbfd -I${BMAKE_BU}/libbfd/${TARGET_CPUARCH} CFLAGS+= -I${CNTRB_GDB}/gdb CFLAGS+= -I${CNTRB_GDB}/gdb/config CFLAGS+= -I${CNTRB_GDB}/include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/gdb/gdbserver/Makefile ./gnu/usr.bin/gdb/gdbserver/Makefile --- /dune/imp/svn/head/gnu/usr.bin/gdb/gdbserver/Makefile 2010-04-14 14:30:56.000000000 -0600 +++ ./gnu/usr.bin/gdb/gdbserver/Makefile 2010-04-14 14:48:05.000000000 -0600 @@ -14,11 +14,10 @@ server.c signals.c target.c utils.c SRCS+= fbsd-low.c -SRCS+= fbsd-${MACHINE_ARCH}-low.c reg-${MACHINE_ARCH}.c -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +SRCS+= fbsd-${MACHINE_CPUARCH}-low.c reg-${MACHINE_CPUARCH}.c +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SRCS+= i387-fp.c .endif - #CFLAGS+= -I${.CURDIR}/../arch/${MACHINE_ARCH} CFLAGS+= -I${GDBDIR}/gdb/gdbserver CFLAGS+= -I${GDBDIR}/gdb/regformats diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/gdb/kgdb/Makefile ./gnu/usr.bin/gdb/kgdb/Makefile --- /dune/imp/svn/head/gnu/usr.bin/gdb/kgdb/Makefile 2010-02-18 08:48:53.000000000 -0700 +++ ./gnu/usr.bin/gdb/kgdb/Makefile 2010-04-12 10:26:12.000000000 -0600 @@ -1,7 +1,7 @@ -# $FreeBSD: head/gnu/usr.bin/gdb/kgdb/Makefile 175645 2008-01-24 19:11:13Z jhb $ +# $FreeBSD: user/imp/tbemd/gnu/usr.bin/gdb/kgdb/Makefile 203464 2010-02-04 00:51:13Z imp $ PROG= kgdb${GDB_SUFFIX} -SRCS= main.c kld.c kthr.c trgt.c trgt_${TARGET_ARCH}.c +SRCS= main.c kld.c kthr.c trgt.c trgt_${TARGET_CPUARCH}.c WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/gdb/libgdb/Makefile ./gnu/usr.bin/gdb/libgdb/Makefile --- /dune/imp/svn/head/gnu/usr.bin/gdb/libgdb/Makefile 2010-02-18 08:48:53.000000000 -0700 +++ ./gnu/usr.bin/gdb/libgdb/Makefile 2010-04-12 10:26:12.000000000 -0600 @@ -1,6 +1,14 @@ -# $FreeBSD: head/gnu/usr.bin/gdb/libgdb/Makefile 157626 2006-04-10 09:00:19Z ru $ +# $FreeBSD: user/imp/tbemd/gnu/usr.bin/gdb/libgdb/Makefile 203446 2010-02-03 21:29:06Z imp $ -TARGET_ARCH?= ${MACHINE_ARCH} +# These assignments duplicate much of the functionality of +# 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/} +.else +TARGET_CPUARCH=${MACHINE_CPUARCH} +.endif +TARGET_ARCH?= ${MACHINE_ARCH} LIB= gdb INTERNALLIB= diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/gnu/usr.bin/gdb/svn-commit.tmp~ ./gnu/usr.bin/gdb/svn-commit.tmp~ --- /dune/imp/svn/head/gnu/usr.bin/gdb/svn-commit.tmp~ 2010-04-14 14:28:43.998000000 -0600 +++ ./gnu/usr.bin/gdb/svn-commit.tmp~ 1969-12-31 17:00:00.000000000 -0700 @@ -1,27 +0,0 @@ - - -PR: -Submitted by: -Reviewed by: -Approved by: -Obtained from: -MFC after: -Security: ---This line, and those below, will be ignored-- -> Description of fields to fill in above: 76 columns --| -> PR: If a GNATS PR is affected by the change. -> Submitted by: If someone else sent in the change. -> Reviewed by: If someone else reviewed your modification. -> Approved by: If you needed approval for this commit. -> Obtained from: If the change is from a third party. -> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. -> Security: Vulnerability reference (one per line) or description. -> Empty fields above will be automatically removed. - -A + gdbserver/reg-amd64.c -D gdbserver/reg-x86-64.c -A + gdbserver/fbsd-powerpc-low.c -A + gdbserver/reg-powerpc.c -M gdbserver/Makefile -D gdbserver/fbsd-ppc-low.c -D gdbserver/reg-ppc.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/include/Makefile ./include/Makefile --- /dune/imp/svn/head/include/Makefile 2010-03-18 23:41:08.000000000 -0600 +++ ./include/Makefile 2010-04-12 17:05:12.000000000 -0600 @@ -115,8 +115,8 @@ INCSLINKS+= sys/$i ${INCLUDEDIR}/$i .endfor -.if ${MACHINE} != ${MACHINE_ARCH} -_MARCH=${MACHINE_ARCH} +.if ${MACHINE} != ${MACHINE_CPUARCH} +_MARCH=${MACHINE_CPUARCH} .endif .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/Makefile ./lib/Makefile --- /dune/imp/svn/head/lib/Makefile 2010-03-12 20:06:39.000000000 -0700 +++ ./lib/Makefile 2010-04-12 17:05:59.000000000 -0600 @@ -108,10 +108,10 @@ libz \ ${_bind} -.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) -_csu=csu/${MACHINE_ARCH}-elf -.elif exists(${.CURDIR}/csu/${MACHINE_ARCH}/Makefile) -_csu=csu/${MACHINE_ARCH} +.if exists(${.CURDIR}/csu/${MACHINE_CPUARCH}-elf) +_csu=csu/${MACHINE_CPUARCH}-elf +.elif exists(${.CURDIR}/csu/${MACHINE_CPUARCH}/Makefile) +_csu=csu/${MACHINE_CPUARCH} .else _csu=csu .endif @@ -160,7 +160,7 @@ _libypclnt= libypclnt .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" .if ${MK_NCP} != "no" _libncp= libncp .endif @@ -168,12 +168,12 @@ _libvgl= libvgl .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" _libefi= libefi _libsmb= libsmb .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" .if ${MK_NCP} != "no" _libncp= libncp .endif @@ -181,11 +181,11 @@ _libvgl= libvgl .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" _libsmb= libsmb .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" _libsmb= libsmb .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/bind/config.mk ./lib/bind/config.mk --- /dune/imp/svn/head/lib/bind/config.mk 2010-02-18 09:00:18.000000000 -0700 +++ ./lib/bind/config.mk 2010-04-12 10:39:55.000000000 -0600 @@ -1,6 +1,7 @@ -# $FreeBSD: head/lib/bind/config.mk 193280 2009-06-01 21:58:59Z dougb $ +# $FreeBSD: user/imp/tbemd/lib/bind/config.mk 203446 2010-02-03 21:29:06Z imp $ .include +.include # BIND version number .if defined(BIND_DIR) && exists(${BIND_DIR}/version) @@ -45,7 +46,7 @@ CFLAGS+= -DUSE_MD5 # Endianness -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" +.if ${TARGET_ENDIANNESS} == 4321 CFLAGS+= -DWORDS_BIGENDIAN .endif @@ -64,10 +65,10 @@ .endif # Use the right version of the atomic.h file from lib/isc -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" ISC_ATOMIC_ARCH= x86_32 .else -ISC_ATOMIC_ARCH= ${MACHINE_ARCH} +ISC_ATOMIC_ARCH= ${MACHINE_CPUARCH} .endif # Optional features diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc/Makefile ./lib/libc/Makefile --- /dune/imp/svn/head/lib/libc/Makefile 2010-02-18 08:59:56.000000000 -0700 +++ ./lib/libc/Makefile 2010-04-12 10:39:32.000000000 -0600 @@ -15,7 +15,7 @@ SHLIB_MAJOR= 7 WARNS?= 2 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include -CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} +CFLAGS+=-I${.CURDIR}/${MACHINE_CPUARCH} CFLAGS+=-DNLS CLEANFILES+=tags INSTALL_PIC_ARCHIVE= @@ -36,7 +36,7 @@ MIASM= NOASM= -.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.include "${.CURDIR}/${MACHINE_CPUARCH}/Makefile.inc" .include "${.CURDIR}/db/Makefile.inc" .include "${.CURDIR}/compat-43/Makefile.inc" .include "${.CURDIR}/gdtoa/Makefile.inc" @@ -49,9 +49,9 @@ .include "${.CURDIR}/net/Makefile.inc" .include "${.CURDIR}/nls/Makefile.inc" .include "${.CURDIR}/posix1e/Makefile.inc" -.if ${MACHINE_ARCH} != "amd64" && \ - ${MACHINE_ARCH} != "ia64" && \ - ${MACHINE_ARCH} != "sparc64" +.if ${MACHINE_CPUARCH} != "amd64" && \ + ${MACHINE_CPUARCH} != "ia64" && \ + ${MACHINE_CPUARCH} != "sparc64" .include "${.CURDIR}/quad/Makefile.inc" .endif .include "${.CURDIR}/regex/Makefile.inc" @@ -64,7 +64,7 @@ .include "${.CURDIR}/rpc/Makefile.inc" .include "${.CURDIR}/uuid/Makefile.inc" .include "${.CURDIR}/xdr/Makefile.inc" -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" +.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips" .include "${.CURDIR}/softfloat/Makefile.inc" .endif .if ${MK_NIS} != "no" @@ -109,16 +109,16 @@ KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c index.c mcount.c rindex.c \ strcat.c strcmp.c strcpy.c strlen.c strncpy.c -libkern: libkern.gen libkern.${MACHINE_ARCH} +libkern: libkern.gen libkern.${MACHINE_CPUARCH} libkern.gen: ${KQSRCS} ${KSRCS} cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern -libkern.${MACHINE_ARCH}:: ${KMSRCS} +libkern.${MACHINE_CPUARCH}:: ${KMSRCS} .if defined(KMSRCS) && !empty(KMSRCS) - cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_ARCH} + cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${MACHINE_CPUARCH} .endif - + .include # Disable warnings in contributed sources. diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc/compat-43/Makefile.inc ./lib/libc/compat-43/Makefile.inc --- /dune/imp/svn/head/lib/libc/compat-43/Makefile.inc 2010-02-18 08:59:51.000000000 -0700 +++ ./lib/libc/compat-43/Makefile.inc 2010-04-12 10:39:26.000000000 -0600 @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/2/93 -# $FreeBSD: head/lib/libc/compat-43/Makefile.inc 199827 2009-11-26 13:49:37Z kib $ +# $FreeBSD: user/imp/tbemd/lib/libc/compat-43/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ # compat-43 sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43 +.PATH: ${.CURDIR}/${MACHINE_CPUARCH}/compat-43 ${.CURDIR}/compat-43 SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ setrgid.c setruid.c sigcompat.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc/gen/Makefile.inc ./lib/libc/gen/Makefile.inc --- /dune/imp/svn/head/lib/libc/gen/Makefile.inc 2010-02-18 08:59:43.000000000 -0700 +++ ./lib/libc/gen/Makefile.inc 2010-04-12 10:39:18.000000000 -0600 @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: head/lib/libc/gen/Makefile.inc 202275 2010-01-14 05:37:43Z ed $ +# $FreeBSD: user/imp/tbemd/lib/libc/gen/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ # machine-independent gen sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen +.PATH: ${.CURDIR}/${MACHINE_CPUARCH}/gen ${.CURDIR}/gen SRCS+= __getosreldate.c __xuname.c \ _once_stub.c _pthread_stubs.c _rand48.c _spinlock_stub.c \ @@ -38,8 +38,8 @@ SYM_MAPS+=${.CURDIR}/gen/Symbol.map # machine-dependent gen sources -.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_CPUARCH}/gen/Makefile.inc) +.include "${.CURDIR}/${MACHINE_CPUARCH}/gen/Makefile.inc" .endif MAN+= alarm.3 arc4random.3 \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc/locale/Makefile.inc ./lib/libc/locale/Makefile.inc --- /dune/imp/svn/head/lib/libc/locale/Makefile.inc 2010-02-18 08:59:35.000000000 -0700 +++ ./lib/libc/locale/Makefile.inc 2010-04-12 10:39:09.000000000 -0600 @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: head/lib/libc/locale/Makefile.inc 175553 2008-01-21 23:48:12Z ache $ +# $FreeBSD: user/imp/tbemd/lib/libc/locale/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ # locale sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale +.PATH: ${.CURDIR}/${MACHINE_CPUARCH}/locale ${.CURDIR}/locale SRCS+= ascii.c big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c \ gb18030.c gb2312.c gbk.c isctype.c iswctype.c \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc/quad/Makefile.inc ./lib/libc/quad/Makefile.inc --- /dune/imp/svn/head/lib/libc/quad/Makefile.inc 2010-02-18 08:59:49.000000000 -0700 +++ ./lib/libc/quad/Makefile.inc 2010-04-12 10:39:23.000000000 -0600 @@ -1,10 +1,10 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: head/lib/libc/quad/Makefile.inc 171278 2007-07-06 13:42:24Z deischen $ +# $FreeBSD: user/imp/tbemd/lib/libc/quad/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ # Quad support, if needed -.PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad +.PATH: ${.CURDIR}/${MACHINE_CPUARCH}/quad ${.CURDIR}/quad -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc/softfloat/Makefile.inc ./lib/libc/softfloat/Makefile.inc --- /dune/imp/svn/head/lib/libc/softfloat/Makefile.inc 2010-02-18 08:59:36.000000000 -0700 +++ ./lib/libc/softfloat/Makefile.inc 2010-04-12 10:39:10.000000000 -0600 @@ -1,11 +1,11 @@ # $NetBSD: Makefile.inc,v 1.3 2003/05/06 08:58:20 rearnsha Exp $ -# $FreeBSD: head/lib/libc/softfloat/Makefile.inc 156613 2006-03-13 01:15:01Z deischen $ +# $FreeBSD: user/imp/tbemd/lib/libc/softfloat/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ SOFTFLOAT_BITS?=64 -.PATH: ${MACHINE_ARCH}/softfloat \ +.PATH: ${MACHINE_CPUARCH}/softfloat \ ${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat -CFLAGS+= -I${.CURDIR}/${MACHINE_ARCH}/softfloat -I${.CURDIR}/softfloat +CFLAGS+= -I${.CURDIR}/${MACHINE_CPUARCH}/softfloat -I${.CURDIR}/softfloat CFLAGS+= -DSOFTFLOAT_FOR_GCC SRCS+= softfloat.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc/stdlib/Makefile.inc ./lib/libc/stdlib/Makefile.inc --- /dune/imp/svn/head/lib/libc/stdlib/Makefile.inc 2010-02-18 08:59:24.000000000 -0700 +++ ./lib/libc/stdlib/Makefile.inc 2010-04-12 10:38:58.000000000 -0600 @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 -# $FreeBSD: head/lib/libc/stdlib/Makefile.inc 194703 2009-06-23 14:10:46Z ed $ +# $FreeBSD: user/imp/tbemd/lib/libc/stdlib/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ # machine-independent stdlib sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib +.PATH: ${.CURDIR}/${MACHINE_CPUARCH}/stdlib ${.CURDIR}/stdlib MISRCS+=_Exit.c a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c div.c exit.c getenv.c getopt.c getopt_long.c \ @@ -16,7 +16,7 @@ SYM_MAPS+= ${.CURDIR}/stdlib/Symbol.map # machine-dependent stdlib sources -.sinclude "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc" +.sinclude "${.CURDIR}/${MACHINE_CPUARCH}/stdlib/Makefile.inc" MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \ div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc/string/Makefile.inc ./lib/libc/string/Makefile.inc --- /dune/imp/svn/head/lib/libc/string/Makefile.inc 2010-02-18 08:59:51.000000000 -0700 +++ ./lib/libc/string/Makefile.inc 2010-04-12 10:39:26.000000000 -0600 @@ -1,7 +1,7 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: head/lib/libc/string/Makefile.inc 189361 2009-03-04 06:01:27Z das $ +# $FreeBSD: user/imp/tbemd/lib/libc/string/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string +.PATH: ${.CURDIR}/${MACHINE_CPUARCH}/string ${.CURDIR}/string CFLAGS+= -I${.CURDIR}/locale @@ -26,8 +26,8 @@ # machine-dependent string sources -.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_CPUARCH}/string/Makefile.inc) +.include "${.CURDIR}/${MACHINE_CPUARCH}/string/Makefile.inc" .endif MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc/sys/Makefile.inc ./lib/libc/sys/Makefile.inc --- /dune/imp/svn/head/lib/libc/sys/Makefile.inc 2010-02-18 08:59:56.000000000 -0700 +++ ./lib/libc/sys/Makefile.inc 2010-04-12 10:39:32.000000000 -0600 @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: head/lib/libc/sys/Makefile.inc 198538 2009-10-28 11:14:32Z kib $ +# $FreeBSD: user/imp/tbemd/lib/libc/sys/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ # sys sources -.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys +.PATH: ${.CURDIR}/${MACHINE_CPUARCH}/sys ${.CURDIR}/sys # Include the generated makefile containing the *complete* list # of syscall names in MIASM. @@ -13,8 +13,8 @@ # MDASM names override the default syscall names in MIASM. # NOASM will prevent the default syscall code from being generated. # -.if exists(${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_CPUARCH}/sys/Makefile.inc) +.include "${.CURDIR}/${MACHINE_CPUARCH}/sys/Makefile.inc" .endif # Sources common to both syscall interfaces: diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libc_r/sys/Makefile.inc ./lib/libc_r/sys/Makefile.inc --- /dune/imp/svn/head/lib/libc_r/sys/Makefile.inc 2010-02-18 09:00:05.000000000 -0700 +++ ./lib/libc_r/sys/Makefile.inc 2010-04-12 10:39:41.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/lib/libc_r/sys/Makefile.inc 50476 1999-08-28 00:22:10Z peter $ +# $FreeBSD: user/imp/tbemd/lib/libc_r/sys/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_CPUARCH} SRCS+= uthread_error.c _atomic_lock.S diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libdisk/Makefile ./lib/libdisk/Makefile --- /dune/imp/svn/head/lib/libdisk/Makefile 2010-02-18 08:59:57.000000000 -0700 +++ ./lib/libdisk/Makefile 2010-04-12 10:39:36.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/lib/libdisk/Makefile 163149 2006-10-09 05:12:54Z kmacy $ +# $FreeBSD: user/imp/tbemd/lib/libdisk/Makefile 203446 2010-02-03 21:29:06Z imp $ -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" _open_disk= open_ia64_disk.c .else _change = change.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libkse/Makefile ./lib/libkse/Makefile --- /dune/imp/svn/head/lib/libkse/Makefile 2010-02-18 09:00:17.000000000 -0700 +++ ./lib/libkse/Makefile 2010-04-12 10:39:54.000000000 -0600 @@ -15,10 +15,10 @@ CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include -CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include +CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include CFLAGS+=-I${.CURDIR}/sys CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf -CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} +CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH} CFLAGS+=-fno-builtin # Uncomment this if you want libkse to contain debug information for @@ -38,7 +38,7 @@ PRECIOUSLIB= -.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" .include "${.CURDIR}/support/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libkse/arch/amd64/Makefile.inc ./lib/libkse/arch/amd64/Makefile.inc --- /dune/imp/svn/head/lib/libkse/arch/amd64/Makefile.inc 2010-02-18 09:00:17.000000000 -0700 +++ ./lib/libkse/arch/amd64/Makefile.inc 2010-04-12 10:39:54.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libkse/arch/amd64/Makefile.inc 172491 2007-10-09 13:42:34Z obrien $ +# $FreeBSD: user/imp/tbemd/lib/libkse/arch/amd64/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= context.S enter_uts.S pthread_md.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libkse/arch/arm/Makefile.inc ./lib/libkse/arch/arm/Makefile.inc --- /dune/imp/svn/head/lib/libkse/arch/arm/Makefile.inc 2010-02-18 09:00:17.000000000 -0700 +++ ./lib/libkse/arch/arm/Makefile.inc 2010-04-12 10:39:54.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/lib/libkse/arch/arm/Makefile.inc 172491 2007-10-09 13:42:34Z obrien $ +# $FreeBSD: user/imp/tbemd/lib/libkse/arch/arm/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} CFLAGS+=-DSYSTEM_SCOPE_ONLY diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libkse/arch/i386/Makefile.inc ./lib/libkse/arch/i386/Makefile.inc --- /dune/imp/svn/head/lib/libkse/arch/i386/Makefile.inc 2010-02-18 09:00:17.000000000 -0700 +++ ./lib/libkse/arch/i386/Makefile.inc 2010-04-12 10:39:54.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libkse/arch/i386/Makefile.inc 172491 2007-10-09 13:42:34Z obrien $ +# $FreeBSD: user/imp/tbemd/lib/libkse/arch/i386/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= thr_enter_uts.S thr_getcontext.S pthread_md.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libkse/arch/ia64/Makefile.inc ./lib/libkse/arch/ia64/Makefile.inc --- /dune/imp/svn/head/lib/libkse/arch/ia64/Makefile.inc 2010-02-18 09:00:17.000000000 -0700 +++ ./lib/libkse/arch/ia64/Makefile.inc 2010-04-12 10:39:54.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libkse/arch/ia64/Makefile.inc 172491 2007-10-09 13:42:34Z obrien $ +# $FreeBSD: user/imp/tbemd/lib/libkse/arch/ia64/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= context.S enter_uts.S pthread_md.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libkse/arch/powerpc/Makefile.inc ./lib/libkse/arch/powerpc/Makefile.inc --- /dune/imp/svn/head/lib/libkse/arch/powerpc/Makefile.inc 2010-02-18 09:00:17.000000000 -0700 +++ ./lib/libkse/arch/powerpc/Makefile.inc 2010-04-12 10:39:54.000000000 -0600 @@ -3,6 +3,6 @@ # XXX temporary CFLAGS+=-DSYSTEM_SCOPE_ONLY -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= enter_uts.S context.S pthread_md.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libkse/arch/sparc64/Makefile.inc ./lib/libkse/arch/sparc64/Makefile.inc --- /dune/imp/svn/head/lib/libkse/arch/sparc64/Makefile.inc 2010-02-18 09:00:17.000000000 -0700 +++ ./lib/libkse/arch/sparc64/Makefile.inc 2010-04-12 10:39:54.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libkse/arch/sparc64/Makefile.inc 172491 2007-10-09 13:42:34Z obrien $ +# $FreeBSD: user/imp/tbemd/lib/libkse/arch/sparc64/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= pthread_md.c thr_getcontext.S diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libkse/support/Makefile.inc ./lib/libkse/support/Makefile.inc --- /dune/imp/svn/head/lib/libkse/support/Makefile.inc 2010-02-18 09:00:16.000000000 -0700 +++ ./lib/libkse/support/Makefile.inc 2010-04-12 10:39:54.000000000 -0600 @@ -1,9 +1,9 @@ -# $FreeBSD: head/lib/libkse/support/Makefile.inc 172491 2007-10-09 13:42:34Z obrien $ +# $FreeBSD: user/imp/tbemd/lib/libkse/support/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys +.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys -CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH} SYSCALLS= clock_gettime \ kse_create \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libkvm/Makefile ./lib/libkvm/Makefile --- /dune/imp/svn/head/lib/libkvm/Makefile 2010-03-01 23:52:16.000000000 -0700 +++ ./lib/libkvm/Makefile 2010-04-12 10:39:39.000000000 -0600 @@ -11,10 +11,11 @@ WARNS?= 0 -SRCS= kvm.c kvm_${MACHINE_ARCH}.c kvm_cptime.c kvm_file.c kvm_getloadavg.c \ +SRCS= kvm.c kvm_${MACHINE_CPUARCH}.c kvm_cptime.c kvm_file.c kvm_getloadavg.c \ kvm_getswapinfo.c kvm_pcpu.c kvm_proc.c kvm_vnet.c -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "arm" -SRCS+= kvm_minidump_${MACHINE_ARCH}.c +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ + ${MACHINE_CPUARCH} == "arm" +SRCS+= kvm_minidump_${MACHINE_CPUARCH}.c .endif INCS= kvm.h diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libpmc/Makefile ./lib/libpmc/Makefile --- /dune/imp/svn/head/lib/libpmc/Makefile 2010-04-02 16:00:31.000000000 -0600 +++ ./lib/libpmc/Makefile 2010-04-12 17:05:55.000000000 -0600 @@ -22,7 +22,7 @@ MAN+= pmclog.3 # PMC-dependent manual pages -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" MAN+= pmc.atom.3 MAN+= pmc.core.3 MAN+= pmc.core2.3 @@ -38,7 +38,7 @@ MAN+= pmc.westmere.3 MAN+= pmc.westmereuc.3 MAN+= pmc.tsc.3 -.elif ${MACHINE_ARCH} == "arm" && ${CPUTYPE} == "xscale" +.elif ${MACHINE_CPUARCH} == "arm" && ${CPUTYPE} == "xscale" MAN+= pmc.xscale.3 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libstand/Makefile ./lib/libstand/Makefile --- /dune/imp/svn/head/lib/libstand/Makefile 2010-02-18 09:00:06.000000000 -0700 +++ ./lib/libstand/Makefile 2010-04-12 10:39:43.000000000 -0600 @@ -20,23 +20,23 @@ CFLAGS+= -ffreestanding -Wformat CFLAGS+= -I${.CURDIR} -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -mpreferred-stack-boundary=2 CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" CFLAGS+= -mno-sse3 .endif .if ${MACHINE} == "pc98" CFLAGS+= -Os .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" CFLAGS+= -msoft-float -D_STANDALONE .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -m32 -I. .endif -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "arm" CFLAGS+= -msoft-float -D_STANDALONE .endif @@ -54,19 +54,19 @@ # string functions from libc .PATH: ${.CURDIR}/../libc/string -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" || \ - ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "powerpc" || \ + ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "arm" SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ memcpy.c memmove.c memset.c qdivrem.c rindex.c strcat.c strchr.c \ strcmp.c strcpy.c strcspn.c strlen.c strncat.c strncmp.c strncpy.c \ strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c .endif -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "arm" .PATH: ${.CURDIR}/../libc/arm/gen SRCS+= divsi3.S .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" .PATH: ${.CURDIR}/../libc/ia64/string SRCS+= bcmp.c bcopy.S bzero.S ffs.S index.c memccpy.c memchr.c memcmp.c \ memcpy.S memmove.S memset.c rindex.c strcat.c strchr.c \ @@ -78,7 +78,7 @@ SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" .PATH: ${.CURDIR}/../libc/quad SRCS+= ashldi3.c ashrdi3.c .PATH: ${.CURDIR}/../libc/powerpc/gen @@ -90,10 +90,10 @@ SRCS+= uuid_equal.c uuid_is_nil.c # _setjmp/_longjmp -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" .PATH: ${.CURDIR}/i386 .else -.PATH: ${.CURDIR}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/${MACHINE_CPUARCH} .endif SRCS+= _setjmp.S @@ -155,7 +155,7 @@ .include -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend ${OBJS}: machine cleandepend: cleanmachine cleanmachine: diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthr/Makefile ./lib/libthr/Makefile --- /dune/imp/svn/head/lib/libthr/Makefile 2010-02-18 09:00:01.000000000 -0700 +++ ./lib/libthr/Makefile 2010-04-12 10:39:38.000000000 -0600 @@ -19,10 +19,10 @@ CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include -CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include +CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include CFLAGS+=-I${.CURDIR}/sys CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf -CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} +CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH} CFLAGS+=-I${.CURDIR}/../libthread_db CFLAGS+=-Winline LDFLAGS+=-Wl,-znodelete @@ -38,7 +38,7 @@ PRECIOUSLIB= -.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthr/arch/amd64/Makefile.inc ./lib/libthr/arch/amd64/Makefile.inc --- /dune/imp/svn/head/lib/libthr/arch/amd64/Makefile.inc 2010-02-18 09:00:01.000000000 -0700 +++ ./lib/libthr/arch/amd64/Makefile.inc 2010-04-12 10:39:38.000000000 -0600 @@ -1,5 +1,5 @@ -#$FreeBSD: head/lib/libthr/arch/amd64/Makefile.inc 177853 2008-04-02 07:41:25Z davidxu $ +#$FreeBSD: user/imp/tbemd/lib/libthr/arch/amd64/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= pthread_md.c _umtx_op_err.S diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthr/arch/arm/Makefile.inc ./lib/libthr/arch/arm/Makefile.inc --- /dune/imp/svn/head/lib/libthr/arch/arm/Makefile.inc 2010-02-18 09:00:01.000000000 -0700 +++ ./lib/libthr/arch/arm/Makefile.inc 2010-04-12 10:39:38.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libthr/arch/arm/Makefile.inc 176226 2008-02-13 05:25:43Z obrien $ +# $FreeBSD: user/imp/tbemd/lib/libthr/arch/arm/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= pthread_md.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthr/arch/i386/Makefile.inc ./lib/libthr/arch/i386/Makefile.inc --- /dune/imp/svn/head/lib/libthr/arch/i386/Makefile.inc 2010-02-18 09:00:01.000000000 -0700 +++ ./lib/libthr/arch/i386/Makefile.inc 2010-04-12 10:39:38.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libthr/arch/i386/Makefile.inc 177853 2008-04-02 07:41:25Z davidxu $ +# $FreeBSD: user/imp/tbemd/lib/libthr/arch/i386/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= pthread_md.c _umtx_op_err.S diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthr/arch/ia64/Makefile.inc ./lib/libthr/arch/ia64/Makefile.inc --- /dune/imp/svn/head/lib/libthr/arch/ia64/Makefile.inc 2010-02-18 09:00:01.000000000 -0700 +++ ./lib/libthr/arch/ia64/Makefile.inc 2010-04-12 10:39:38.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libthr/arch/ia64/Makefile.inc 198450 2009-10-24 20:07:17Z marcel $ +# $FreeBSD: user/imp/tbemd/lib/libthr/arch/ia64/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= _umtx_op_err.S pthread_md.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthr/arch/mips/Makefile.inc ./lib/libthr/arch/mips/Makefile.inc --- /dune/imp/svn/head/lib/libthr/arch/mips/Makefile.inc 2010-02-18 09:00:01.000000000 -0700 +++ ./lib/libthr/arch/mips/Makefile.inc 2010-04-12 10:39:38.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libthr/arch/mips/Makefile.inc 178581 2008-04-26 12:17:57Z imp $ +# $FreeBSD: user/imp/tbemd/lib/libthr/arch/mips/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= pthread_md.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthr/arch/powerpc/Makefile.inc ./lib/libthr/arch/powerpc/Makefile.inc --- /dune/imp/svn/head/lib/libthr/arch/powerpc/Makefile.inc 2010-02-18 09:00:01.000000000 -0700 +++ ./lib/libthr/arch/powerpc/Makefile.inc 2010-04-12 10:39:38.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libthr/arch/powerpc/Makefile.inc 176226 2008-02-13 05:25:43Z obrien $ +# $FreeBSD: user/imp/tbemd/lib/libthr/arch/powerpc/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= pthread_md.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthr/arch/sparc64/Makefile.inc ./lib/libthr/arch/sparc64/Makefile.inc --- /dune/imp/svn/head/lib/libthr/arch/sparc64/Makefile.inc 2010-02-18 09:00:01.000000000 -0700 +++ ./lib/libthr/arch/sparc64/Makefile.inc 2010-04-12 10:39:38.000000000 -0600 @@ -1,5 +1,5 @@ -# $FreeBSD: head/lib/libthr/arch/sparc64/Makefile.inc 176226 2008-02-13 05:25:43Z obrien $ +# $FreeBSD: user/imp/tbemd/lib/libthr/arch/sparc64/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} SRCS+= pthread_md.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthr/support/Makefile.inc ./lib/libthr/support/Makefile.inc --- /dune/imp/svn/head/lib/libthr/support/Makefile.inc 2010-02-18 09:00:01.000000000 -0700 +++ ./lib/libthr/support/Makefile.inc 2010-04-12 10:39:38.000000000 -0600 @@ -1,9 +1,9 @@ -# $FreeBSD: head/lib/libthr/support/Makefile.inc 145436 2005-04-23 02:48:59Z davidxu $ +# $FreeBSD: user/imp/tbemd/lib/libthr/support/Makefile.inc 203446 2010-02-03 21:29:06Z imp $ .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys +.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys -CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH} SYSCALLS= thr_new diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libthread_db/Makefile ./lib/libthread_db/Makefile --- /dune/imp/svn/head/lib/libthread_db/Makefile 2010-02-18 08:59:59.000000000 -0700 +++ ./lib/libthread_db/Makefile 2010-04-12 10:39:36.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/lib/libthread_db/Makefile 201381 2010-01-02 09:58:07Z ed $ +# $FreeBSD: user/imp/tbemd/lib/libthread_db/Makefile 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH} LIB= thread_db SHLIB_MAJOR= 3 diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/libz/minigzip.c ./lib/libz/minigzip.c --- /dune/imp/svn/head/lib/libz/minigzip.c 2010-04-01 10:55:25.000000000 -0600 +++ ./lib/libz/minigzip.c 2010-04-12 16:36:42.000000000 -0600 @@ -13,6 +13,8 @@ * or in pipe mode. */ +#include +__FBSDID("$FreeBSD$"); /* @(#) $Id$ */ #include "zlib.h" diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/lib/msun/Makefile ./lib/msun/Makefile --- /dune/imp/svn/head/lib/msun/Makefile 2010-02-18 08:59:18.000000000 -0700 +++ ./lib/msun/Makefile 2010-04-12 10:38:52.000000000 -0600 @@ -12,10 +12,10 @@ # # -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" ARCH_SUBDIR= i387 .else -ARCH_SUBDIR= ${MACHINE_ARCH} +ARCH_SUBDIR= ${MACHINE_CPUARCH} .endif .include "${ARCH_SUBDIR}/Makefile.inc" @@ -74,7 +74,7 @@ # Location of fpmath.h and _fpmath.h LIBCDIR= ${.CURDIR}/../libc CFLAGS+= -I${.CURDIR}/src -I${LIBCDIR}/include \ - -I${LIBCDIR}/${MACHINE_ARCH} + -I${LIBCDIR}/${MACHINE_CPUARCH} SYM_MAPS+= ${.CURDIR}/Symbol.map VERSION_DEF= ${LIBCDIR}/Versions.def diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/libexec/rtld-elf/Makefile ./libexec/rtld-elf/Makefile --- /dune/imp/svn/head/libexec/rtld-elf/Makefile 2010-02-18 09:00:42.000000000 -0700 +++ ./libexec/rtld-elf/Makefile 2010-04-12 10:40:21.000000000 -0600 @@ -1,4 +1,4 @@ -# $FreeBSD: head/libexec/rtld-elf/Makefile 201380 2010-01-02 09:50:19Z ed $ +user: # $FreeBSD/imp/tbemd/libexec/rtld-elf/Makefile 201380 2010-01-02 09:50:19Z ed $ .include MK_SSP= no @@ -10,7 +10,7 @@ MAN= rtld.1 CSTD?= gnu99 CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -CFLAGS+= -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR} +CFLAGS+= -I${.CURDIR}/${MACHINE_CPUARCH} -I${.CURDIR} LDFLAGS+= -nostdlib -e .rtld_start WARNS?= 2 INSTALLFLAGS= -C -b @@ -25,7 +25,7 @@ DPADD= ${LIBC_PIC} LDADD= -lc_pic -lssp_nonshared -.if ${MACHINE_ARCH} != "ia64" +.if ${MACHINE_CPUARCH} != "ia64" .if ${MK_SYMVER} == "yes" LIBCDIR= ${.CURDIR}/../../lib/libc VERSION_DEF= ${LIBCDIR}/Versions.def @@ -35,14 +35,14 @@ ${PROG}: ${VERSION_MAP} -.if exists(${.CURDIR}/${MACHINE_ARCH}/Symbol.map) -SYMBOL_MAPS+= ${.CURDIR}/${MACHINE_ARCH}/Symbol.map +.if exists(${.CURDIR}/${MACHINE_CPUARCH}/Symbol.map) +SYMBOL_MAPS+= ${.CURDIR}/${MACHINE_CPUARCH}/Symbol.map .endif .endif .endif -.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) -.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_CPUARCH}/Makefile.inc) +.include "${.CURDIR}/${MACHINE_CPUARCH}/Makefile.inc" .endif # Since moving rtld-elf to /libexec, we need to create a symlink. @@ -52,7 +52,7 @@ -chflags noschg ${DESTDIR}/usr/libexec/${PROG} .endif -.PATH: ${.CURDIR}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/${MACHINE_CPUARCH} .include .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/libexec/rtld-elf/amd64/Makefile.inc ./libexec/rtld-elf/amd64/Makefile.inc --- /dune/imp/svn/head/libexec/rtld-elf/amd64/Makefile.inc 2010-02-18 09:00:42.000000000 -0700 +++ ./libexec/rtld-elf/amd64/Makefile.inc 2010-04-12 10:40:21.000000000 -0600 @@ -2,4 +2,4 @@ LDFLAGS+= -elf # Uncomment this to build the dynamic linker as an executable instead # of a shared library: -#LDSCRIPT= ${.CURDIR}/${MACHINE_ARCH}/elf_rtld.x +#LDSCRIPT= ${.CURDIR}/${MACHINE_CPUARCH}/elf_rtld.x diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/libexec/rtld-elf/i386/Makefile.inc ./libexec/rtld-elf/i386/Makefile.inc --- /dune/imp/svn/head/libexec/rtld-elf/i386/Makefile.inc 2010-02-18 09:00:41.000000000 -0700 +++ ./libexec/rtld-elf/i386/Makefile.inc 2010-04-12 10:40:21.000000000 -0600 @@ -2,4 +2,4 @@ LDFLAGS+= -elf # Uncomment this to build the dynamic linker as an executable instead # of a shared library: -#LDSCRIPT= ${.CURDIR}/${MACHINE_ARCH}/elf_rtld.x +#LDSCRIPT= ${.CURDIR}/${MACHINE_CPUARCH}/elf_rtld.x diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/rescue/rescue/Makefile ./rescue/rescue/Makefile --- /dune/imp/svn/head/rescue/rescue/Makefile 2010-02-18 08:48:48.000000000 -0700 +++ ./rescue/rescue/Makefile 2010-04-12 10:26:06.000000000 -0600 @@ -145,7 +145,7 @@ .endif CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk CRUNCH_ALIAS_bsdlabel= disklabel #.if ${MK_NCP} != "no" @@ -161,15 +161,15 @@ CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98 .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" CRUNCH_PROGS_sbin+= mca .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" CRUNCH_PROGS_sbin+= bsdlabel sunlabel .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CRUNCH_PROGS_sbin+= bsdlabel fdisk CRUNCH_ALIAS_bsdlabel= disklabel .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/Makefile ./sbin/Makefile --- /dune/imp/svn/head/sbin/Makefile 2010-03-01 23:52:12.000000000 -0700 +++ ./sbin/Makefile 2010-04-12 10:26:41.000000000 -0600 @@ -5,26 +5,21 @@ # XXX MISSING: icheck ncheck -SUBDIR= adjkerntz \ +SUBDIR=adjkerntz \ atacontrol \ - ${_atm} \ badsect \ - ${_bsdlabel} \ camcontrol \ ccdconfig \ clri \ comcontrol \ conscontrol \ ddb \ - ${_devd} \ devfs \ dhclient \ dmesg \ dump \ dumpfs \ dumpon \ - ${_fdisk} \ - ${_fdisk_pc98} \ ffsinfo \ fsck \ fsck_ffs \ @@ -40,15 +35,12 @@ hastd \ ifconfig \ init \ - ${_ipf} \ - ${_ipfw} \ iscontrol \ kldconfig \ kldload \ kldstat \ kldunload \ ldconfig \ - ${_mca} \ md5 \ mdconfig \ mdmfs \ @@ -62,96 +54,62 @@ mount_nullfs \ mount_udf \ mount_unionfs \ - ${_natd} \ newfs \ newfs_msdos \ nfsiod \ nos-tun \ - ${_pfctl} \ - ${_pflogd} \ ping \ - ${_ping6} \ - ${_quotacheck} \ rcorder \ reboot \ recoverdisk \ restore \ route \ - ${_routed} \ - ${_rtsol} \ savecore \ - ${_sconfig} \ setkey \ shutdown \ spppcontrol \ - ${_sunlabel} \ swapon \ sysctl \ tunefs \ umount \ .if ${MK_ATM} != "no" -_atm= atm +SUBDIR+= atm .endif .if ${MK_CXX} != "no" -_devd= devd +SUBDIR+= devd .endif .if ${MK_IPFILTER} != "no" -_ipf= ipf +SUBDIR+= ipf .endif .if ${MK_IPFW} != "no" -_ipfw= ipfw -_natd= natd +SUBDIR+= ipfw +SUBDIR+= natd .endif .if ${MK_PF} != "no" -_pfctl= pfctl -_pflogd= pflogd +SUBDIR+= pfctl +SUBDIR+= pflogd .endif .if ${MK_INET6} != "no" -_ping6= ping6 -_rtsol= rtsol -.endif - -.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "powerpc" -_bsdlabel= bsdlabel +SUBDIR+= ping6 +SUBDIR+= rtsol .endif .if ${MK_QUOTAS} != "no" -_quotacheck= quotacheck +SUBDIR+= quotacheck .endif .if ${MK_ROUTED} != "no" -_routed= routed -.endif - -.if ${MACHINE_ARCH} == "i386" -.if ${MACHINE} == "i386" -_fdisk= fdisk -.elif ${MACHINE} == "pc98" -_fdisk_pc98= fdisk_pc98 -.endif -_sconfig= sconfig +SUBDIR+= routed .endif -.if ${MACHINE_ARCH} == "amd64" -_fdisk= fdisk -.endif +.include -.if ${MACHINE_ARCH} == "arm" -_fdisk= fdisk -.endif - -.if ${MACHINE_ARCH} == "ia64" -_mca= mca -.endif - -.if ${MACHINE_ARCH} == "sparc64" -_sunlabel= sunlabel -.endif +SUBDIR:= ${SUBDIR:O} .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/Makefile.amd64 ./sbin/Makefile.amd64 --- /dune/imp/svn/head/sbin/Makefile.amd64 1969-12-31 17:00:00.000000000 -0700 +++ ./sbin/Makefile.amd64 2010-04-12 10:26:41.000000000 -0600 @@ -0,0 +1,4 @@ +# $FreeBSD$ + +SUBDIR += bsdlabel +SUBDIR += fdisk diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/Makefile.arm ./sbin/Makefile.arm --- /dune/imp/svn/head/sbin/Makefile.arm 1969-12-31 17:00:00.000000000 -0700 +++ ./sbin/Makefile.arm 2010-04-12 10:26:41.000000000 -0600 @@ -0,0 +1,4 @@ +# $FreeBSD$ + +SUBDIR += bsdlabel +SUBDIR += fdisk diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/Makefile.i386 ./sbin/Makefile.i386 --- /dune/imp/svn/head/sbin/Makefile.i386 1969-12-31 17:00:00.000000000 -0700 +++ ./sbin/Makefile.i386 2010-04-12 10:26:41.000000000 -0600 @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR += bsdlabel +SUBDIR += fdisk +SUBDIR += sconfig diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/Makefile.ia64 ./sbin/Makefile.ia64 --- /dune/imp/svn/head/sbin/Makefile.ia64 1969-12-31 17:00:00.000000000 -0700 +++ ./sbin/Makefile.ia64 2010-04-12 10:26:41.000000000 -0600 @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR += mca diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/Makefile.mips ./sbin/Makefile.mips --- /dune/imp/svn/head/sbin/Makefile.mips 1969-12-31 17:00:00.000000000 -0700 +++ ./sbin/Makefile.mips 2010-04-12 10:26:41.000000000 -0600 @@ -0,0 +1,4 @@ +# $FreeBSD$ + +SUBDIR += bsdlabel +SUBDIR += fdisk diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/Makefile.pc98 ./sbin/Makefile.pc98 --- /dune/imp/svn/head/sbin/Makefile.pc98 1969-12-31 17:00:00.000000000 -0700 +++ ./sbin/Makefile.pc98 2010-04-12 10:26:41.000000000 -0600 @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR += bsdlabel +SUBDIR += fdisk_pc98 +SUBDIR += sconfig diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/Makefile.sparc64 ./sbin/Makefile.sparc64 --- /dune/imp/svn/head/sbin/Makefile.sparc64 1969-12-31 17:00:00.000000000 -0700 +++ ./sbin/Makefile.sparc64 2010-04-12 10:26:41.000000000 -0600 @@ -0,0 +1,4 @@ +# $FreeBSD$ + +SUBDIR += bsdlabel +SUBDIR += sunlabel diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/atm/atmconfig/Makefile ./sbin/atm/atmconfig/Makefile --- /dune/imp/svn/head/sbin/atm/atmconfig/Makefile 2010-02-18 08:49:00.000000000 -0700 +++ ./sbin/atm/atmconfig/Makefile 2010-04-12 10:26:22.000000000 -0600 @@ -27,7 +27,8 @@ CLEANFILES+= oid.h .endif -.if ${MACHINE_ARCH} == "arm" +# XXX - this is verboten +.if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/bsdlabel/Makefile ./sbin/bsdlabel/Makefile --- /dune/imp/svn/head/sbin/bsdlabel/Makefile 2010-02-18 08:49:07.000000000 -0700 +++ ./sbin/bsdlabel/Makefile 2010-04-12 10:26:33.000000000 -0600 @@ -8,7 +8,7 @@ #MAN= bsdlabel.5 MAN+= bsdlabel.8 -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel MLINKS= bsdlabel.8 disklabel.8 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/camcontrol/Makefile ./sbin/camcontrol/Makefile --- /dune/imp/svn/head/sbin/camcontrol/Makefile 2010-02-18 08:49:13.000000000 -0700 +++ ./sbin/camcontrol/Makefile 2010-04-12 10:26:40.000000000 -0600 @@ -7,7 +7,8 @@ .else CFLAGS+= -DMINIMALISTIC .endif -.if ${MACHINE_ARCH} == "arm" +# This is verboten +.if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/gbde/Makefile ./sbin/gbde/Makefile --- /dune/imp/svn/head/sbin/gbde/Makefile 2010-02-18 08:49:06.000000000 -0700 +++ ./sbin/gbde/Makefile 2010-04-12 10:26:30.000000000 -0600 @@ -9,7 +9,10 @@ # rijndael-fst.c does evil casting things which results in warnings on # 64 bit machines, the test-vectors check out however, so it works right. -.if ${MACHINE_ARCH} != "i386" +#XXX All the world isn't amd64 or i386 +.if ${MACHINE_CPUARCH} == "i386" +WARNS?= 5 +.else WARNS?= 3 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/newfs_msdos/Makefile ./sbin/newfs_msdos/Makefile --- /dune/imp/svn/head/sbin/newfs_msdos/Makefile 2010-02-18 08:49:05.000000000 -0700 +++ ./sbin/newfs_msdos/Makefile 2010-04-12 10:26:27.000000000 -0600 @@ -3,7 +3,8 @@ PROG= newfs_msdos MAN= newfs_msdos.8 -.if ${MACHINE_ARCH} == "arm" +# XXX - this is verboten +.if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sbin/sunlabel/Makefile ./sbin/sunlabel/Makefile --- /dune/imp/svn/head/sbin/sunlabel/Makefile 2010-02-18 08:49:13.000000000 -0700 +++ ./sbin/sunlabel/Makefile 2010-04-12 10:26:40.000000000 -0600 @@ -6,7 +6,7 @@ SRCS= sunlabel.c geom_sunlabel_enc.c MAN= sunlabel.8 -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" LINKS= ${BINDIR}/sunlabel ${BINDIR}/disklabel MLINKS= sunlabel.8 disklabel.8 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/secure/lib/libcrypto/Makefile ./secure/lib/libcrypto/Makefile --- /dune/imp/svn/head/secure/lib/libcrypto/Makefile 2010-02-18 08:48:46.000000000 -0700 +++ ./secure/lib/libcrypto/Makefile 2010-04-12 10:26:04.000000000 -0600 @@ -49,7 +49,7 @@ # bf SRCS+= bf_cfb64.c bf_ecb.c bf_ofb64.c bf_skey.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" .if ${MACHINE_CPU:Mi686} SRCS+= bf-686.s .else @@ -73,9 +73,9 @@ bn_lib.c bn_mod.c bn_mont.c bn_mpi.c bn_mul.c bn_nist.c bn_opt.c \ bn_prime.c bn_print.c bn_rand.c bn_recp.c bn_shift.c bn_sqr.c \ bn_sqrt.c bn_word.c bn_x931p.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= bn-586.s co-586.s -.elif ${MACHINE_ARCH} == "amd64" +.elif ${MACHINE_CPUARCH} == "amd64" SRCS+= x86_64-gcc.c .else SRCS+= bn_asm.c @@ -89,7 +89,7 @@ # cast SRCS+= c_cfb64.c c_ecb.c c_ofb64.c c_skey.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= cast-586.s .else SRCS+= c_enc.c @@ -97,7 +97,7 @@ INCS+= cast.h # camellia -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SRCS+= camellia.c cmll_cbc.c cmll_cfb.c cmll_ctr.c cmll_ecb.c \ cmll_misc.c cmll_ofb.c INCS+= camellia.h @@ -117,7 +117,7 @@ enc_read.c enc_writ.c fcrypt.c ofb64ede.c ofb64enc.c \ ofb_enc.c pcbc_enc.c qud_cksm.c rand_key.c read2pwd.c \ rpc_enc.c set_key.c str2key.c xcbc_enc.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= des-586.s crypt586.s .else SRCS+= des_enc.c fcrypt_b.c @@ -172,7 +172,7 @@ m_mdc2.c m_null.c m_ripemd.c m_sha.c m_sha1.c names.c \ openbsd_hw.c p5_crpt.c p5_crpt2.c p_dec.c p_enc.c p_lib.c \ p_open.c p_seal.c p_sign.c p_verify.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SRCS+= e_camellia.c .endif INCS+= evp.h @@ -208,7 +208,7 @@ # md5 SRCS+= md5_dgst.c md5_one.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= md5-586.s .endif INCS+= md5.h @@ -255,7 +255,7 @@ # rc4 SRCS+= rc4_skey.c rc4_fblk.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= rc4-586.s .else SRCS+= rc4_enc.c @@ -264,7 +264,7 @@ # rc5 SRCS+= rc5_ecb.c rc5_skey.c rc5cfb64.c rc5ofb64.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= rc5-586.s .else SRCS+= rc5_enc.c @@ -284,7 +284,7 @@ # sha SRCS+= sha1_one.c sha1dgst.c sha_dgst.c sha_one.c sha256.c sha512.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= sha1-586.s .endif INCS+= sha.h @@ -351,10 +351,10 @@ ( echo "#ifndef MK1MF_BUILD"; \ echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \ echo " #define CFLAGS \"$(CC)\""; \ - echo " #define PLATFORM \"FreeBSD-${MACHINE_ARCH}\""; \ + echo " #define PLATFORM \"FreeBSD-${MACHINE_CPUARCH}\""; \ echo "#endif" ) > ${.TARGET} -opensslconf.h: opensslconf-${MACHINE_ARCH}.h +opensslconf.h: opensslconf-${MACHINE_CPUARCH}.h cp ${.ALLSRC} ${.TARGET} evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h @@ -383,11 +383,11 @@ .include -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" .PATH: ${.CURDIR}/i386 .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" _bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm .endif Files /dune/imp/svn/head/share/examples/kld/firmware/fwimage/firmware.img and ./share/examples/kld/firmware/fwimage/firmware.img differ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/share/man/man4/Makefile ./share/man/man4/Makefile --- /dune/imp/svn/head/share/man/man4/Makefile 2010-03-01 23:52:15.000000000 -0700 +++ ./share/man/man4/Makefile 2010-04-12 10:37:20.000000000 -0600 @@ -618,7 +618,7 @@ MLINKS+=xl.4 if_xl.4 MLINKS+=zyd.4 if_zyd.4 -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" _acpi_aiboost.4=acpi_aiboost.4 _acpi_asus.4= acpi_asus.4 _acpi_dock.4= acpi_dock.4 @@ -667,12 +667,12 @@ MLINKS+=lindev.4 full.4 .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" _atp.4= atp.4 .endif -.if exists(${.CURDIR}/man4.${MACHINE_ARCH}) -SUBDIR= man4.${MACHINE_ARCH} +.if exists(${.CURDIR}/man4.${MACHINE_CPUARCH}) +SUBDIR= man4.${MACHINE_CPUARCH} .endif .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/share/man/man5/Makefile ./share/man/man5/Makefile --- /dune/imp/svn/head/share/man/man5/Makefile 2010-02-18 08:58:02.000000000 -0700 +++ ./share/man/man5/Makefile 2010-04-12 10:37:21.000000000 -0600 @@ -83,7 +83,7 @@ MAN+= hesiod.conf.5 .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" _boot.config.5= boot.config.5 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/share/mk/bsd.arch.inc.mk ./share/mk/bsd.arch.inc.mk --- /dune/imp/svn/head/share/mk/bsd.arch.inc.mk 1969-12-31 17:00:00.000000000 -0700 +++ ./share/mk/bsd.arch.inc.mk 2010-04-12 10:37:06.000000000 -0600 @@ -0,0 +1,11 @@ +# +# Include the arch-specific Makefile.inc.$ARCH. We go from most specific +# to least specific, stopping after we get a hit. +# +.if exists(${.CURDIR}/Makefile.${MACHINE}) +.include "Makefile.${MACHINE}" +.elif exists(${.CURDIR}/Makefile.${MACHINE_ARCH}) +.include "Makefile.${MACHINE_ARCH}" +.elif exists(${.CURDIR}/Makefile.${MACHINE_CPUARCH}) +.include "Makefile.${MACHINE_CPUARCH}" +.endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/share/mk/bsd.cpu.mk ./share/mk/bsd.cpu.mk --- /dune/imp/svn/head/share/mk/bsd.cpu.mk 2010-03-02 00:42:14.000000000 -0700 +++ ./share/mk/bsd.cpu.mk 2010-04-12 10:37:06.000000000 -0600 @@ -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 -. elif ${MACHINE_ARCH} == "ia64" +. elif ${MACHINE_CPUARCH} == "ia64" MACHINE_CPU = itanium -. elif ${MACHINE_ARCH} == "powerpc" +. 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 @@ # 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 @@ . 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 @@ # 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 @@ . 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 @@ -114,14 +114,14 @@ . else _CPUCFLAGS = -mcpu=${CPUTYPE} . endif -. elif ${MACHINE_ARCH} == "powerpc" +. elif ${MACHINE_CPUARCH} == "powerpc" . if ${CPUTYPE} == "e500" MACHINE_CPU = booke _CPUCFLAGS = -Wa,-me500 -msoft-float . else _CPUCFLAGS = -mcpu=${CPUTYPE} -mno-powerpc64 . endif -. elif ${MACHINE_ARCH} == "mips" +. elif ${MACHINE_CPUARCH} == "mips" . if ${CPUTYPE} == "mips32" _CPUCFLAGS = -march=mips32 . elif ${CPUTYPE} == "mips32r2" @@ -141,7 +141,7 @@ # 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" || \ @@ -180,34 +180,28 @@ . 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) -CFLAGS += -mbig-endian -LDFLAGS += -mbig-endian -LD += -EB -.endif +##XXXimp: These are bogus +#.if ${MACHINE_CPUARCH} == "arm" && defined(TARGET_BIG_ENDIAN) +#CFLAGS += -mbig-endian +#LDFLAGS += -mbig-endian +#LD += -EB +#.endif -.if ${MACHINE_ARCH} == "mips" -. if defined(TARGET_BIG_ENDIAN) -CFLAGS += -EB -LD += -EB -. else -CFLAGS += -EL -LD += -EL -. endif +.if ${MACHINE_CPUARCH} == "mips" CFLAGS += -G0 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/share/mk/bsd.endian.mk ./share/mk/bsd.endian.mk --- /dune/imp/svn/head/share/mk/bsd.endian.mk 2010-02-18 08:57:48.000000000 -0700 +++ ./share/mk/bsd.endian.mk 2010-04-12 10:37:06.000000000 -0600 @@ -3,12 +3,12 @@ .if ${MACHINE_ARCH} == "amd64" || \ ${MACHINE_ARCH} == "i386" || \ ${MACHINE_ARCH} == "ia64" || \ - (${MACHINE_ARCH} == "arm" && !defined(TARGET_BIG_ENDIAN)) || \ - (${MACHINE_ARCH} == "mips" && !defined(TARGET_BIG_ENDIAN)) + ${MACHINE_ARCH} == "arm" || \ + ${MACHINE_ARCH} == "mipsel" TARGET_ENDIANNESS= 1234 .elif ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_ARCH} == "sparc64" || \ - ${MACHINE_ARCH} == "arm" || \ - ${MACHINE_ARCH} == "mips" + ${MACHINE_ARCH} == "armeb" || \ + ${MACHINE_ARCH} == "mipseb" TARGET_ENDIANNESS= 4321 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/share/mk/bsd.lib.mk ./share/mk/bsd.lib.mk --- /dune/imp/svn/head/share/mk/bsd.lib.mk 2010-04-02 16:00:31.000000000 -0600 +++ ./share/mk/bsd.lib.mk 2010-04-12 17:09:31.000000000 -0600 @@ -58,7 +58,7 @@ .SUFFIXES: .out .o .po .So .S .asm .s .c .cc .cpp .cxx .m .C .f .y .l .ln .if !defined(PICFLAG) -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" PICFLAG=-fPIC .else PICFLAG=-fpic diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/share/mk/bsd.sys.mk ./share/mk/bsd.sys.mk --- /dune/imp/svn/head/share/mk/bsd.sys.mk 2010-02-18 08:57:48.000000000 -0700 +++ ./share/mk/bsd.sys.mk 2010-04-12 10:37:06.000000000 -0600 @@ -79,8 +79,8 @@ CWARNFLAGS += -Wno-unknown-pragmas .endif -.if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64" && \ - ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" +.if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_CPUARCH} != "ia64" && \ + ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" # Don't use -Wstack-protector as it breaks world with -Werror. SSP_CFLAGS ?= -fstack-protector CFLAGS += ${SSP_CFLAGS} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/share/mk/sys.mk ./share/mk/sys.mk --- /dune/imp/svn/head/share/mk/sys.mk 2010-04-14 13:13:16.000000000 -0600 +++ ./share/mk/sys.mk 2010-04-12 17:09:31.000000000 -0600 @@ -4,6 +4,18 @@ unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true +.if !defined(%POSIX) +# +# MACHINE_CPUARCH defines a collection of MACHINE_ARCH. Machines with +# the same MACHINE_ARCH can run reach-other's binaries, so it +# necessarily has word size and endian swizzled in. However, support +# files for these machines often are shared amongst all combinations +# of size and/or endian. This is called MACHINE_CPU in NetBSD, but +# that's used for something different in FreeBSD. +# +MACHINE_CPUARCH=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/} +.endif + # If the special target .POSIX appears (without prerequisites or # commands) before the first noncomment line in the makefile, make shall # process the makefile as specified by the Posix 1003.2 specification. @@ -35,7 +47,7 @@ CFLAGS ?= -O .else CC ?= cc -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" +.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips" CFLAGS ?= -O -pipe .else CFLAGS ?= -O2 -pipe diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/amd64/conf/GENERIC ./sys/amd64/conf/GENERIC --- /dune/imp/svn/head/sys/amd64/conf/GENERIC 2010-04-14 14:58:56.000000000 -0600 +++ ./sys/amd64/conf/GENERIC 2010-04-14 14:59:28.000000000 -0600 @@ -22,7 +22,6 @@ ident GENERIC makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -makeoptions MODULES_OVERRIDE="" options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/arm/conf/DVB ./sys/arm/conf/DVB --- /dune/imp/svn/head/sys/arm/conf/DVB 2010-03-29 10:43:24.000000000 -0600 +++ ./sys/arm/conf/DVB 1969-12-31 17:00:00.000000000 -0700 @@ -1,120 +0,0 @@ -# Custom kernel for TSC/Symmetricom's 4370 time servers. These are based -# on the AT91RM9200 and have lots of custom do-das to make life interesting. -# -# For more information on this file, please read the handbook section on -# Kernel Configuration Files: -# -# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html -# -# The handbook is also available locally in /usr/share/doc/handbook -# if you've installed the doc distribution, otherwise always see the -# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the -# latest information. -# -# An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first -# in NOTES. -# -# From: -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.7 2006/06/17 23:34:59 imp Exp $ - -machine arm -ident TFLEX - -options AT91_TSC -include "../at91/std.kb920x" -#To statically compile in device wiring instead of /boot/device.hints -#hints "hints.at91rm9200" -hints "DVB.hints" - -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options DDB -options KDB -options BREAK_TO_DEBUGGER # DBG doesn't support break -options ALT_BREAK_TO_DEBUGGER # CR ~ ^B breaks to debugger with this -#options KDB_UNATTENDED # don't enter debugger on panic - -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -#options INET6 #IPv6 communications protocols -options FFS #Berkeley Fast Filesystem -options SOFTUPDATES #Enable FFS soft updates support -#options UFS_ACL #Support for access control lists -#options UFS_DIRHASH #Improve performance on big directories -#options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 4MB ram disk -#options ROOTDEVNAME=\"ufs:md0\" -options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" -options NFSCLIENT #Network Filesystem Client -#options NFSSERVER #Network Filesystem Server -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT -#options BOOTP_NFSROOT -#options BOOTP -#options MSDOSFS #MSDOS Filesystem -options CD9660 #ISO 9660 Filesystem -#options PROCFS #Process filesystem (requires PSEUDOFS) -options PSEUDOFS #Pseudo-filesystem framework -#options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI -#options KTRACE #ktrace(1) support -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options NO_SYSCTL_DESCR -options MUTEX_NOINLINE -options NO_SWAPPING -#options PPS_SYNC # ntp time sync with pps -#device genclock -device loop -device random -device ether -device pty -device uart -device ate -device mii -device lxtphy - -# USB support -#device ohci # OHCI PCI->USB interface -#device usb # USB Bus (required) -#device ucom -#device uftdi -#options USB_DEBUG -##device umass # Disks/Mass storage - Requires scbus and da -##device scbus # SCSI bus (required for SCSI) -##device da # Direct Access (disks) - -# Debugging for use in -current -#options INVARIANTS #Enable calls of extra sanity checking -#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed - -#device mem # Memory and kernel memory devices -device md -device at91_twi # TWI: Two Wire Interface -device at91_spi # SPI bridge support -device at91_ssc -#device at91_tc -# MMC/SD -device at91_mci -device mmc # mmc/sd bus -device mmcsd # mmc/sd flash cards -# iic -device iic -device iicbus -device icee # EEPROM on IIC bus -#device max663x # Temperature sensor -# SPI bus -device spibus -device at45d # at45db642 and maybe others -- our boot rom - -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -# Note that 'bpf' is required for DHCP. -device bpf # Berkeley packet filter - -# Enable support for the kernel PLL to use an external PPS signal, -#options PPS_SYNC diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/arm/conf/DVB.hints ./sys/arm/conf/DVB.hints --- /dune/imp/svn/head/sys/arm/conf/DVB.hints 2010-03-29 10:40:12.000000000 -0600 +++ ./sys/arm/conf/DVB.hints 1969-12-31 17:00:00.000000000 -0700 @@ -1,88 +0,0 @@ -# $FreeBSD$ -# $TSC: Release/dvb/kern/DVB.hints,v 1.1 2008/02/27 16:13:17 ilepore Exp $ -hint.at45d.0.at="spibus0" -hint.at45d.0.cs=0 -# ID Eeprom -hint.icee.0.at="iicbus0" -hint.icee.0.addr=0x80 -hint.icee.0.type=8 -hint.icee.0.size=2048 -hint.icee.0.rd_sz=16 -hint.icee.0.wr_sz=16 -# MAX6633: 0x90 -hint.max663x.0.at="iicbus0" -hint.max663x.0.addr=0x90 -# Config Eeprom -hint.icee.1.at="iicbus0" -hint.icee.1.addr=0xa6 -hint.icee.1.type=16 -hint.icee.1.size=32768 -hint.icee.1.rd_sz=16 -hint.icee.1.wr_sz=16 -# spf eeprom -hint.icee.2.at="iicbus0" -hint.icee.2.addr=0xa0 -hint.icee.2.type=8 -hint.icee.2.size=128 -hint.icee.2.rd_sz=16 -hint.icee.2.wr_sz=8 -# input card ltc4305: 0xb0 -# daughter card ltc4305: 0xb2 -# ps eeprom -hint.icee.3.at="iicbus0" -hint.icee.3.addr=0xc0 -hint.icee.3.type=8 -hint.icee.3.size=2048 -hint.icee.3.rd_sz=16 -hint.icee.3.wr_sz=16 -# daughter ID eeprom -hint.icee.4.at="iicbus0" -hint.icee.4.addr=0xd0 -hint.icee.4.type=8 -hint.icee.4.size=2048 -hint.icee.4.rd_sz=16 -hint.icee.4.wr_sz=16 -# RU/GPS board ID eeprom -hint.icee.5.at="iicbus0" -hint.icee.5.addr=0xe0 -hint.icee.5.type=8 -hint.icee.5.size=2048 -hint.icee.5.rd_sz=16 -hint.icee.5.wr_sz=16 -# Input Card ID eeprom -hint.icee.6.at="iicbus0" -hint.icee.6.addr=0xf0 -hint.icee.6.type=8 -hint.icee.6.size=2048 -hint.icee.6.rd_sz=16 -hint.icee.6.wr_sz=16 -# ID Eeprom on R3+ boards -hint.icee.7.at="iicbus0" -hint.icee.7.addr=0xa0 -hint.icee.7.type=16 -hint.icee.7.size=32768 -hint.icee.7.rd_sz=16 -hint.icee.7.wr_sz=16 -# ID Eeprom on R3+ boards after remapping -hint.icee.8.at="iicbus0" -hint.icee.8.addr=0xa0 -hint.icee.8.type=16 -hint.icee.8.size=32768 -hint.icee.8.rd_sz=16 -hint.icee.8.wr_sz=16 -#ID Eeprom on Dual GPS cards -hint.icee.9.at="iicbus0" -hint.icee.9.addr=0xa8 -hint.icee.9.type=16 -hint.icee.9.size=32768 -hint.icee.9.rd_sz=16 -hint.icee.9.wr_sz=16 -#ID Eeprom on Dual GPS cards -hint.icee.10.at="iicbus0" -hint.icee.10.addr=0xaa -hint.icee.10.type=16 -hint.icee.10.size=32768 -hint.icee.10.rd_sz=16 -hint.icee.10.wr_sz=16 - - diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/arm/conf/G2348 ./sys/arm/conf/G2348 --- /dune/imp/svn/head/sys/arm/conf/G2348 2010-04-01 11:46:07.000000000 -0600 +++ ./sys/arm/conf/G2348 1969-12-31 17:00:00.000000000 -0700 @@ -1,119 +0,0 @@ -# -# Gateworks Avila IXP425 XScale board -# kernel configuration file for FreeBSD/arm -# -# $FreeBSD: head/tools/tools/nanobsd/gateworks/G2348 195618 2009-07-11 15:02:45Z rpaulo $ - -machine arm -ident G2348 - -include "../xscale/ixp425/std.ixp425" -include "../xscale/ixp425/std.avila" -options XSCALE_CACHE_READ_WRITE_ALLOCATE -#options ARM_USE_SMALL_ALLOC -hints "AVILA.hints" -makeoptions MODULES_OVERRIDE="" - -# NB: patched by boot2 to reflect boot/root partition -options ROOTDEVNAME=\"ufs:ad0s1\" - -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -makeoptions CONF_CFLAGS=-mcpu=xscale - -options HZ=100 -#options DEVICE_POLLING - -# Debugging for use in -current -options KDB -options DDB #Enable the kernel debugger -#options INVARIANTS #Enable calls of extra sanity checking -#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -#options DIAGNOSTIC - -options SCHED_4BSD #4BSD scheduler -options PREEMPTION - -options INET #InterNETworking -#options INET6 #IPv6 communications protocols -options FFS #Berkeley Fast Filesystem -#options SOFTUPDATES #Enable FFS soft updates support -#options UFS_ACL #Support for access control lists -#options UFS_DIRHASH #Improve performance on big directories -options NFSCLIENT #Network Filesystem Client -options NFSLOCKD #Network Lock Manager -options KTRACE #ktrace(1) support -#options SYSVSHM #SYSV-style shared memory -#options SYSVMSG #SYSV-style message queues -#options SYSVSEM #SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -#options KBD_INSTALL_CDEV # install a CDEV entry in /dev -#options VERBOSE_SYSINIT - -#device saarm - -device pci -device uart - -# I2C support -device iicbus -device iicbb -device iic -device ixpiic -device ds1672 # DS1672 on ipxiic -device ad7418 # AD7418 on ipxiic - -device ixpwdog # watchdog timer -device avila_led - -device cfi # flash support -#options CFI_SUPPORT_STRATAFLASH - -device ata -device atadisk # ATA disk drives -device avila_ata # Gateworks CF/IDE support - -device npe # Network Processing Engine -device npe_fw -device firmware -device qmgr # Q Manager (required by npe) -device mii # NB: required by npe -device ether -device bpf - -device pty -device loop -device if_bridge - -device md -device random # Entropy device - -# Wireless NIC cards -device wlan # 802.11 support -options IEEE80211_DEBUG # enable debugging msgs -options IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's -options IEEE80211_SUPPORT_MESH -options IEEE80211_SUPPORT_TDMA -device wlan_wep # 802.11 WEP support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support - -device ath # Atheros pci/cardbus NIC's -device ath_rate_sample # SampleRate tx rate control for ath -options ATH_DEBUG # enable athdebug msgs -options ATH_DIAGAPI # enable api for athregs - -device ath_hal # Atheros HAL (includes binary component) -options AH_DEBUG -#options AH_ASSERT -options AH_SUPPORT_AR5416 - -device usb -#options USB_DEBUG -device ohci -device ehci - -device umass -device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/Makefile ./sys/boot/Makefile --- /dune/imp/svn/head/sys/boot/Makefile 2010-02-18 09:01:42.000000000 -0700 +++ ./sys/boot/Makefile 2010-04-12 10:41:19.000000000 -0600 @@ -8,21 +8,21 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "ia64" SUBDIR+= efi .endif # Build Open Firmware library. -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "sparc64" SUBDIR+= ofw .endif # Build U-Boot library. -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm" SUBDIR+= uboot .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE} == "i386" SUBDIR+= zfs .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/arm/ixp425/boot2/Makefile ./sys/boot/arm/ixp425/boot2/Makefile --- /dune/imp/svn/head/sys/boot/arm/ixp425/boot2/Makefile 2010-02-18 09:01:31.000000000 -0700 +++ ./sys/boot/arm/ixp425/boot2/Makefile 2010-04-12 10:41:07.000000000 -0600 @@ -20,7 +20,7 @@ KERNPHYSADDR=0x180000 KERNVIRTADDR=${KERNPHYSADDR} BOOT_STACK=0x200000-4 -M=${MACHINE_ARCH} +M=${MACHINE_CPUARCH} LDFLAGS=-e ${KERNPHYSADDR} -EB -T ldscript.${M} OBJS+= ${SRCS:N*.h:R:S/$/.o/g} S=${.CURDIR}/../../../.. diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/arm/uboot/Makefile ./sys/boot/arm/uboot/Makefile --- /dune/imp/svn/head/sys/boot/arm/uboot/Makefile 2010-02-18 09:01:31.000000000 -0700 +++ ./sys/boot/arm/uboot/Makefile 2010-04-12 10:41:07.000000000 -0600 @@ -64,7 +64,7 @@ CFLAGS+= -ffreestanding -LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.arm +LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.${MACHINE_ARCH} # Pull in common loader code .PATH: ${.CURDIR}/../../uboot/common diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/arm/uboot/ldscript.armbe ./sys/boot/arm/uboot/ldscript.armbe --- /dune/imp/svn/head/sys/boot/arm/uboot/ldscript.armbe 1969-12-31 17:00:00.000000000 -0700 +++ ./sys/boot/arm/uboot/ldscript.armbe 2010-04-12 10:41:07.000000000 -0600 @@ -0,0 +1,134 @@ +/* $FreeBSD: user/imp/tbemd/sys/boot/arm/uboot/ldscript.armbe -1 $ */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = 0x1000000 + SIZEOF_HEADERS; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .rela.text : + { *(.rela.text) *(.rela.gnu.linkonce.t*) } + .rela.data : + { *(.rela.data) *(.rela.gnu.linkonce.d*) } + .rela.rodata : + { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } + .rela.got : { *(.rela.got) } + .rela.got1 : { *(.rela.got1) } + .rela.got2 : { *(.rela.got2) } + .rela.ctors : { *(.rela.ctors) } + .rela.dtors : { *(.rela.dtors) } + .rela.init : { *(.rela.init) } + .rela.fini : { *(.rela.fini) } + .rela.bss : { *(.rela.bss) } + .rela.plt : { *(.rela.plt) } + .rela.sdata : { *(.rela.sdata) } + .rela.sbss : { *(.rela.sbss) } + .rela.sdata2 : { *(.rela.sdata2) } + .rela.sbss2 : { *(.rela.sbss2) } + .text : + { + *(.text) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t*) + } =0 + _etext = .; + PROVIDE (etext = .); + .init : { *(.init) } =0 + .fini : { *(.fini) } =0 + .rodata : { *(.rodata) *(.gnu.linkonce.r*) } + .rodata1 : { *(.rodata1) } + .sdata2 : { *(.sdata2) } + .sbss2 : { *(.sbss2) } + /* Adjust the address for the data segment to the next page up. */ + . = ((. + 0x1000) & ~(0x1000 - 1)); + .data : + { + *(.data) + *(.gnu.linkonce.d*) + CONSTRUCTORS + } + .data1 : { *(.data1) } + .got1 : { *(.got1) } + .dynamic : { *(.dynamic) } + /* Put .ctors and .dtors next to the .got2 section, so that the pointers + get relocated with -mrelocatable. Also put in the .fixup pointers. + The current compiler no longer needs this, but keep it around for 2.7.2 */ + PROVIDE (_GOT2_START_ = .); + .got2 : { *(.got2) } + PROVIDE (__CTOR_LIST__ = .); + .ctors : { *(.ctors) } + PROVIDE (__CTOR_END__ = .); + PROVIDE (__DTOR_LIST__ = .); + .dtors : { *(.dtors) } + PROVIDE (__DTOR_END__ = .); + PROVIDE (_FIXUP_START_ = .); + .fixup : { *(.fixup) } + PROVIDE (_FIXUP_END_ = .); + PROVIDE (_GOT2_END_ = .); + PROVIDE (_GOT_START_ = .); + .got : { *(.got) } + .got.plt : { *(.got.plt) } + PROVIDE (_GOT_END_ = .); + /* We want the small data sections together, so single-instruction offsets + can access them all, and initialized data all before uninitialized, so + we can shorten the on-disk segment size. */ + .sdata : { *(.sdata) } + _edata = .; + PROVIDE (edata = .); + .sbss : + { + PROVIDE (__sbss_start = .); + *(.sbss) + *(.scommon) + *(.dynsbss) + PROVIDE (__sbss_end = .); + } + .plt : { *(.plt) } + .bss : + { + PROVIDE (__bss_start = .); + *(.dynbss) + *(.bss) + *(COMMON) + } + _end = . ; + PROVIDE (end = .); + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + /* These must appear regardless of . */ +} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/arm/uboot/ldscript.armeb ./sys/boot/arm/uboot/ldscript.armeb --- /dune/imp/svn/head/sys/boot/arm/uboot/ldscript.armeb 1969-12-31 17:00:00.000000000 -0700 +++ ./sys/boot/arm/uboot/ldscript.armeb 2010-04-12 10:41:07.000000000 -0600 @@ -0,0 +1,134 @@ +/* $FreeBSD: user/imp/tbemd/sys/boot/arm/uboot/ldscript.armeb 203469 2010-02-04 03:07:48Z imp $ */ + +OUTPUT_FORMAT("elf32-bigarm", "elf32-bigarm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = 0x1000000 + SIZEOF_HEADERS; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .rela.text : + { *(.rela.text) *(.rela.gnu.linkonce.t*) } + .rela.data : + { *(.rela.data) *(.rela.gnu.linkonce.d*) } + .rela.rodata : + { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } + .rela.got : { *(.rela.got) } + .rela.got1 : { *(.rela.got1) } + .rela.got2 : { *(.rela.got2) } + .rela.ctors : { *(.rela.ctors) } + .rela.dtors : { *(.rela.dtors) } + .rela.init : { *(.rela.init) } + .rela.fini : { *(.rela.fini) } + .rela.bss : { *(.rela.bss) } + .rela.plt : { *(.rela.plt) } + .rela.sdata : { *(.rela.sdata) } + .rela.sbss : { *(.rela.sbss) } + .rela.sdata2 : { *(.rela.sdata2) } + .rela.sbss2 : { *(.rela.sbss2) } + .text : + { + *(.text) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t*) + } =0 + _etext = .; + PROVIDE (etext = .); + .init : { *(.init) } =0 + .fini : { *(.fini) } =0 + .rodata : { *(.rodata) *(.gnu.linkonce.r*) } + .rodata1 : { *(.rodata1) } + .sdata2 : { *(.sdata2) } + .sbss2 : { *(.sbss2) } + /* Adjust the address for the data segment to the next page up. */ + . = ((. + 0x1000) & ~(0x1000 - 1)); + .data : + { + *(.data) + *(.gnu.linkonce.d*) + CONSTRUCTORS + } + .data1 : { *(.data1) } + .got1 : { *(.got1) } + .dynamic : { *(.dynamic) } + /* Put .ctors and .dtors next to the .got2 section, so that the pointers + get relocated with -mrelocatable. Also put in the .fixup pointers. + The current compiler no longer needs this, but keep it around for 2.7.2 */ + PROVIDE (_GOT2_START_ = .); + .got2 : { *(.got2) } + PROVIDE (__CTOR_LIST__ = .); + .ctors : { *(.ctors) } + PROVIDE (__CTOR_END__ = .); + PROVIDE (__DTOR_LIST__ = .); + .dtors : { *(.dtors) } + PROVIDE (__DTOR_END__ = .); + PROVIDE (_FIXUP_START_ = .); + .fixup : { *(.fixup) } + PROVIDE (_FIXUP_END_ = .); + PROVIDE (_GOT2_END_ = .); + PROVIDE (_GOT_START_ = .); + .got : { *(.got) } + .got.plt : { *(.got.plt) } + PROVIDE (_GOT_END_ = .); + /* We want the small data sections together, so single-instruction offsets + can access them all, and initialized data all before uninitialized, so + we can shorten the on-disk segment size. */ + .sdata : { *(.sdata) } + _edata = .; + PROVIDE (edata = .); + .sbss : + { + PROVIDE (__sbss_start = .); + *(.sbss) + *(.scommon) + *(.dynsbss) + PROVIDE (__sbss_end = .); + } + .plt : { *(.plt) } + .bss : + { + PROVIDE (__bss_start = .); + *(.dynbss) + *(.bss) + *(COMMON) + } + _end = . ; + PROVIDE (end = .); + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + /* These must appear regardless of . */ +} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/common/Makefile.inc ./sys/boot/common/Makefile.inc --- /dune/imp/svn/head/sys/boot/common/Makefile.inc 2010-02-18 09:01:35.000000000 -0700 +++ ./sys/boot/common/Makefile.inc 2010-04-12 10:41:13.000000000 -0600 @@ -4,14 +4,14 @@ SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= module.c panic.c -.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64" SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c .elif ${MACHINE} == "pc98" SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c -.elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" +.elif ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm" SRCS+= load_elf32.c reloc_elf32.c -.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" +.elif ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "ia64" SRCS+= load_elf64.c reloc_elf64.c .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/efi/libefi/Makefile ./sys/boot/efi/libefi/Makefile --- /dune/imp/svn/head/sys/boot/efi/libefi/Makefile 2010-02-18 09:01:39.000000000 -0700 +++ ./sys/boot/efi/libefi/Makefile 2010-04-12 10:41:16.000000000 -0600 @@ -7,7 +7,7 @@ libefi.c time.c CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_CPUARCH:S/amd64/i386/} CFLAGS+= -I${.CURDIR}/../../../../lib/libstand # Pick up the bootstrap header for some interface items diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/ficl/Makefile ./sys/boot/ficl/Makefile --- /dune/imp/svn/head/sys/boot/ficl/Makefile 2010-02-18 09:01:42.000000000 -0700 +++ ./sys/boot/ficl/Makefile 2010-04-12 10:41:19.000000000 -0600 @@ -1,20 +1,20 @@ -# $FreeBSD: head/sys/boot/ficl/Makefile 183878 2008-10-14 10:11:14Z raj $ +# $FreeBSD: user/imp/tbemd/sys/boot/ficl/Makefile 203446 2010-02-03 21:29:06Z imp $ # -.PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} +.PATH: ${.CURDIR}/${MACHINE_CPUARCH:S/amd64/i386/} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ prefix.c search.c stack.c tools.c vm.c words.c SRCS= ${BASE_SRCS} sysdep.c softcore.c CLEANFILES= softcore.c testmain testmain.o CFLAGS+= -ffreestanding -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -mpreferred-stack-boundary=2 CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" CFLAGS+= -mno-sse3 .endif -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm" CFLAGS+= -msoft-float .endif .if ${MACHINE} == "pc98" @@ -41,18 +41,18 @@ # Optional OO extension softwords #SOFTWORDS+= oo.fr classes.fr -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -m32 -march=i386 -I. .endif -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} \ +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_CPUARCH:S/amd64/i386/} \ -I${.CURDIR}/../common softcore.c: ${SOFTWORDS} softcore.awk (cd ${.CURDIR}/softwords; cat ${SOFTWORDS} \ | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET} -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" ${SRCS:M*.c:R:S/$/.o/g}: machine beforedepend ${OBJS}: machine diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/i386/Makefile.inc ./sys/boot/i386/Makefile.inc --- /dune/imp/svn/head/sys/boot/i386/Makefile.inc 2010-02-18 09:01:38.000000000 -0700 +++ ./sys/boot/i386/Makefile.inc 2010-04-12 10:41:15.000000000 -0600 @@ -9,7 +9,7 @@ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 LDFLAGS+= -nostdlib -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -m32 -march=i386 LDFLAGS+= -m elf_i386_fbsd AFLAGS+= --32 diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/i386/boot2/Makefile ./sys/boot/i386/boot2/Makefile --- /dune/imp/svn/head/sys/boot/i386/boot2/Makefile 2010-02-18 09:01:37.000000000 -0700 +++ ./sys/boot/i386/boot2/Makefile 2010-04-12 10:41:14.000000000 -0600 @@ -94,7 +94,7 @@ ORG1=`printf "%d" ${ORG1}` \ REL1=`printf "%d" ${REL1}` > ${.TARGET} -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend boot2.s: machine CLEANFILES+= machine machine: diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/i386/gptboot/Makefile ./sys/boot/i386/gptboot/Makefile --- /dune/imp/svn/head/sys/boot/i386/gptboot/Makefile 2010-02-18 09:01:38.000000000 -0700 +++ ./sys/boot/i386/gptboot/Makefile 2010-04-12 10:41:15.000000000 -0600 @@ -67,7 +67,7 @@ gptboot.o: ${.CURDIR}/../../common/ufsread.c -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend gptboot.o: machine CLEANFILES+= machine machine: diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/i386/gptzfsboot/Makefile ./sys/boot/i386/gptzfsboot/Makefile --- /dune/imp/svn/head/sys/boot/i386/gptzfsboot/Makefile 2010-02-18 09:01:37.000000000 -0700 +++ ./sys/boot/i386/gptzfsboot/Makefile 2010-04-12 10:41:15.000000000 -0600 @@ -64,7 +64,7 @@ zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend zfsboot.o: machine CLEANFILES+= machine machine: diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/i386/libfirewire/Makefile ./sys/boot/i386/libfirewire/Makefile --- /dune/imp/svn/head/sys/boot/i386/libfirewire/Makefile 2010-02-18 09:01:37.000000000 -0700 +++ ./sys/boot/i386/libfirewire/Makefile 2010-04-12 10:41:15.000000000 -0600 @@ -16,7 +16,7 @@ CFLAGS+= -Wformat -Wall -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine @@ -24,7 +24,7 @@ .include -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend ${OBJS}: machine .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/i386/libi386/Makefile ./sys/boot/i386/libi386/Makefile --- /dune/imp/svn/head/sys/boot/i386/libi386/Makefile 2010-02-18 09:01:36.000000000 -0700 +++ ./sys/boot/i386/libi386/Makefile 2010-04-12 10:41:14.000000000 -0600 @@ -53,7 +53,7 @@ # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine @@ -61,6 +61,6 @@ .include -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend ${OBJS}: machine .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/i386/loader/Makefile ./sys/boot/i386/loader/Makefile --- /dune/imp/svn/head/sys/boot/i386/loader/Makefile 2010-02-18 09:01:38.000000000 -0700 +++ ./sys/boot/i386/loader/Makefile 2010-04-12 10:41:15.000000000 -0600 @@ -119,7 +119,7 @@ .include -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend ${OBJS}: machine CLEANFILES+= machine machine: diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/i386/zfsboot/Makefile ./sys/boot/i386/zfsboot/Makefile --- /dune/imp/svn/head/sys/boot/i386/zfsboot/Makefile 2010-02-18 09:01:37.000000000 -0700 +++ ./sys/boot/i386/zfsboot/Makefile 2010-04-12 10:41:14.000000000 -0600 @@ -98,7 +98,7 @@ ORG1=`printf "%d" ${ORG1}` \ REL1=`printf "%d" ${REL1}` > ${.TARGET} -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend zfsboot.s: machine CLEANFILES+= machine machine: diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/ia64/common/Makefile ./sys/boot/ia64/common/Makefile --- /dune/imp/svn/head/sys/boot/ia64/common/Makefile 2010-02-18 09:01:40.000000000 -0700 +++ ./sys/boot/ia64/common/Makefile 2010-04-12 10:41:16.000000000 -0600 @@ -9,7 +9,7 @@ SRCS= autoload.c bootinfo.c copy.c devicename.c exec.c CFLAGS+= -I${.CURDIR}/../../efi/include -CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= -I${.CURDIR}/../../../../lib/libstand @@ -17,7 +17,7 @@ BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} .endif .PATH: ${.CURDIR}/../../common diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/ia64/efi/Makefile ./sys/boot/ia64/efi/Makefile --- /dune/imp/svn/head/sys/boot/ia64/efi/Makefile 2010-02-18 09:01:39.000000000 -0700 +++ ./sys/boot/ia64/efi/Makefile 2010-04-12 10:41:16.000000000 -0600 @@ -9,21 +9,21 @@ INTERNALPROG= SRCS= conf.c efimd.c main.c pal.S start.S vers.c -.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/../common CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I${.CURDIR}/../../efi/include -CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= -I${.CURDIR}/../../../../lib/libstand -LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH} +LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_CPUARCH} LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic ${PROG}: ${LDSCRIPT} -NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH} +NEWVERSWHAT= "EFI boot" ${MACHINE_CPUARCH} vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} @@ -42,7 +42,7 @@ fi ${OBJCOPY} -j .data -j .dynamic -j .dynstr -j .dynsym -j .hash \ -j .rela.dyn -j .reloc -j .sdata -j .text \ - --target=efi-app-${MACHINE_ARCH} ${.ALLSRC} ${.TARGET} + --target=efi-app-${MACHINE_CPUARCH} ${.ALLSRC} ${.TARGET} CLEANFILES= vers.c loader.efi diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/ia64/ski/Makefile ./sys/boot/ia64/ski/Makefile --- /dune/imp/svn/head/sys/boot/ia64/ski/Makefile 2010-02-18 09:01:40.000000000 -0700 +++ ./sys/boot/ia64/ski/Makefile 2010-04-12 10:41:16.000000000 -0600 @@ -17,10 +17,10 @@ CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= -I${.CURDIR}/../../../../lib/libstand -LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH} +LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_CPUARCH} LDFLAGS= -Wl,-T${LDSCRIPT} -NEWVERSWHAT= "SKI boot" ${MACHINE_ARCH} +NEWVERSWHAT= "SKI boot" ${MACHINE_CPUARCH} vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/ofw/libofw/Makefile ./sys/boot/ofw/libofw/Makefile --- /dune/imp/svn/head/sys/boot/ofw/libofw/Makefile 2010-02-18 09:01:38.000000000 -0700 +++ ./sys/boot/ofw/libofw/Makefile 2010-04-12 10:41:15.000000000 -0600 @@ -13,7 +13,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. CFLAGS+= -ffreestanding -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" CFLAGS+= -msoft-float .endif @@ -23,7 +23,7 @@ .endif machine: - ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine + ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine CLEANFILES+= machine diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/uboot/lib/Makefile ./sys/boot/uboot/lib/Makefile --- /dune/imp/svn/head/sys/boot/uboot/lib/Makefile 2010-02-18 09:01:35.000000000 -0700 +++ ./sys/boot/uboot/lib/Makefile 2010-04-12 10:41:13.000000000 -0600 @@ -19,7 +19,7 @@ .endif machine: - ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine + ln -sf ${.CURDIR}/../../../${MACHINE_CPUARCH}/include machine CLEANFILES+= machine diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/boot/zfs/Makefile ./sys/boot/zfs/Makefile --- /dune/imp/svn/head/sys/boot/zfs/Makefile 2010-02-18 09:01:38.000000000 -0700 +++ ./sys/boot/zfs/Makefile 2010-04-12 10:41:15.000000000 -0600 @@ -10,23 +10,23 @@ CFLAGS+= -I${.CURDIR}/../../cddl/boot/zfs CFLAGS+= -ffreestanding -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -mpreferred-stack-boundary=2 CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2 .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" CFLAGS+= -mno-sse3 .endif -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm" CFLAGS+= -msoft-float .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -m32 -march=i386 .endif CFLAGS+= -Wformat -Wall -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../i386/include machine @@ -34,6 +34,6 @@ .include -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" beforedepend ${OBJS}: machine .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/conf/Makefile.mips ./sys/conf/Makefile.mips --- /dune/imp/svn/head/sys/conf/Makefile.mips 2010-02-18 09:01:04.000000000 -0700 +++ ./sys/conf/Makefile.mips 2010-04-12 10:40:42.000000000 -0600 @@ -32,9 +32,6 @@ SYSTEM_LD:= ${SYSTEM_LD:$S/conf/${LDSCRIPT_NAME}=${LDSCRIPT_NAME}} SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/${LDSCRIPT_NAME}=${LDSCRIPT_NAME}} -# XXX: Such sweeping assumptions... -MACHINE=mips -MACHINE_ARCH=mips KERNLOADADDR?=0x80001000 # This obscure value is defined by CFE for WR160N # To be changed later @@ -48,28 +45,6 @@ EXTRA_FLAGS=-fno-pic -mno-abicalls -G0 HACK_EXTRA_FLAGS=-shared -.if defined(TARGET_BIG_ENDIAN) -CFLAGS+=-EB -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 - # We add the -fno-pic flag to kernels because otherwise performance # is extremely poor, as well as -mno-abicalls to force no ABI usage. diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/conf/Makefile.pc98 ./sys/conf/Makefile.pc98 --- /dune/imp/svn/head/sys/conf/Makefile.pc98 2010-02-18 09:01:04.000000000 -0700 +++ ./sys/conf/Makefile.pc98 2010-04-12 10:40:42.000000000 -0600 @@ -30,8 +30,6 @@ .endif .include "$S/conf/kern.pre.mk" -MACHINE=pc98 - MKMODULESENV+= MACHINE=${MACHINE} %BEFORE_DEPEND diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/conf/kern.mk ./sys/conf/kern.mk --- /dune/imp/svn/head/sys/conf/kern.mk 2010-04-02 16:00:32.000000000 -0600 +++ ./sys/conf/kern.mk 2010-04-12 17:12:21.000000000 -0600 @@ -11,7 +11,7 @@ CWARNFLAGS= .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ + -Wmissing-prototypes -Wpointer-arith -Wcast-qual \ -Wundef -Wno-pointer-sign -fformat-extensions .endif # @@ -29,20 +29,20 @@ # operations inside the kernel itself. These operations are exclusively # reserved for user applications. # -.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc" +.if ${MACHINE_CPUARCH} == "i386" && ${CC} != "icc" CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 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 @@ -52,7 +52,7 @@ # 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 @@ -62,7 +62,7 @@ # 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 @@ -74,7 +74,7 @@ # 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" +.if ${MACHINE_CPUARCH} == "powerpc" CFLAGS+= -msoft-float -mno-altivec INLINE_LIMIT?= 15000 .endif @@ -82,7 +82,7 @@ # # 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 @@ -104,8 +104,8 @@ # # GCC SSP support. # -.if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_ARCH} != "ia64" && \ - ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" +.if ${MK_SSP} != "no" && ${CC} != "icc" && ${MACHINE_CPUARCH} != "ia64" && \ + ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" CFLAGS+= -fstack-protector .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/conf/kern.post.mk ./sys/conf/kern.post.mk --- /dune/imp/svn/head/sys/conf/kern.post.mk 2010-04-02 16:00:32.000000000 -0600 +++ ./sys/conf/kern.post.mk 2010-04-12 17:12:21.000000000 -0600 @@ -84,8 +84,8 @@ grep -v '# XXX' ${S}/../tools/debugscripts/dot.gdbinit | \ sed "s:MODPATH:${.OBJDIR}/modules:" > .gdbinit cp ${S}/../tools/debugscripts/gdbinit.kernel ${.CURDIR} -.if exists(${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH}) - cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH} \ +.if exists(${S}/../tools/debugscripts/gdbinit.${MACHINE_CPUARCH}) + cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_CPUARCH} \ ${.CURDIR}/gdbinit.machine .endif .endif @@ -166,8 +166,8 @@ mv .newdep .depend _ILINKS= machine -.if ${MACHINE} != ${MACHINE_ARCH} -_ILINKS+= ${MACHINE_ARCH} +.if ${MACHINE} != ${MACHINE_CPUARCH} +_ILINKS+= ${MACHINE_CPUARCH} .endif # Ensure that the link exists without depending on it when it exists. @@ -181,8 +181,8 @@ @case ${.TARGET} in \ machine) \ path=${S}/${MACHINE}/include ;; \ - ${MACHINE_ARCH}) \ - path=${S}/${MACHINE_ARCH}/include ;; \ + ${MACHINE_CPUARCH}) \ + path=${S}/${MACHINE_CPUARCH}/include ;; \ esac ; \ ${ECHO} ${.TARGET} "->" $$path ; \ ln -s $$path ${.TARGET} @@ -248,7 +248,7 @@ ${NORMAL_LINT} vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP} - MAKE=${MAKE} SYSDIR=$S sh $S/conf/newvers.sh ${KERN_IDENT} + MAKE=${MAKE} sh $S/conf/newvers.sh ${KERN_IDENT} vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src ${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/conf/kern.pre.mk ./sys/conf/kern.pre.mk --- /dune/imp/svn/head/sys/conf/kern.pre.mk 2010-04-05 04:59:20.000000000 -0600 +++ ./sys/conf/kern.pre.mk 2010-04-12 17:12:21.000000000 -0600 @@ -12,7 +12,7 @@ LDSCRIPT_NAME?= ldscript.$M LDSCRIPT?= $S/conf/${LDSCRIPT_NAME} -M= ${MACHINE_ARCH} +M= ${MACHINE_CPUARCH} AWK?= awk LINT?= lint @@ -29,7 +29,7 @@ . else _MINUS_O= -O2 . endif -. if ${MACHINE_ARCH} == "amd64" +. if ${MACHINE_CPUARCH} == "amd64" COPTFLAGS?=-O2 -frename-registers -pipe . else COPTFLAGS?=${_MINUS_O} -pipe diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/conf/kmod.mk ./sys/conf/kmod.mk --- /dune/imp/svn/head/sys/conf/kmod.mk 2010-04-02 16:00:32.000000000 -0600 +++ ./sys/conf/kmod.mk 2010-04-12 17:12:21.000000000 -0600 @@ -125,11 +125,11 @@ LDFLAGS+= -d -warn-common CFLAGS+= ${DEBUG_FLAGS} -.if ${MACHINE_ARCH} == amd64 +.if ${MACHINE_CPUARCH} == amd64 CFLAGS+= -fno-omit-frame-pointer .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" CFLAGS+= -mlongcall -fno-omit-frame-pointer .endif @@ -183,7 +183,7 @@ ${OBJCOPY} --only-keep-debug ${FULLPROG} ${.TARGET} .endif -.if ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != mips +.if ${MACHINE_CPUARCH} != amd64 && ${MACHINE_ARCH} != mips ${FULLPROG}: ${KMOD}.kld ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld .if !defined(DEBUG_FLAGS) @@ -196,7 +196,7 @@ CLEANFILES+= export_syms .endif -.if ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != mips +.if ${MACHINE_CPUARCH} != amd64 && ${MACHINE_CPUARCH} != mips ${KMOD}.kld: ${OBJS} .else ${FULLPROG}: ${OBJS} @@ -216,13 +216,13 @@ .endif .endif .if !defined(DEBUG_FLAGS) && \ - (${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == mips) + (${MACHINE_CPUARCH} == amd64 || ${MACHINE_CPUARCH} == mips) ${OBJCOPY} --strip-debug ${.TARGET} .endif _ILINKS=@ machine -.if ${MACHINE} != ${MACHINE_ARCH} -_ILINKS+=${MACHINE_ARCH} +.if ${MACHINE} != ${MACHINE_CPUARCH} +_ILINKS+=${MACHINE_CPUARCH} .endif all: objwarn ${PROG} @@ -249,8 +249,8 @@ ${_ILINKS}: @case ${.TARGET} in \ - ${MACHINE_ARCH}) \ - path=${SYSDIR}/${MACHINE_ARCH}/include ;; \ + ${MACHINE_CPUARCH}) \ + path=${SYSDIR}/${MACHINE_CPUARCH}/include ;; \ machine) \ path=${SYSDIR}/${MACHINE}/include ;; \ @) \ @@ -446,11 +446,11 @@ .endif sh @/kern/genassym.sh genassym.o > ${.TARGET} .if exists(@) -genassym.o: @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c +genassym.o: @/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c .endif genassym.o: @ machine ${SRCS:Mopt_*.h} ${CC} -c ${CFLAGS:N-fno-common} \ - @/${MACHINE_ARCH}/${MACHINE_ARCH}/genassym.c + @/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}/genassym.c .endif lint: ${SRCS} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/conf/ldscript.mips.octeon1.32 ./sys/conf/ldscript.mips.octeon1.32 --- /dune/imp/svn/head/sys/conf/ldscript.mips.octeon1.32 2010-03-05 22:40:21.000000000 -0700 +++ ./sys/conf/ldscript.mips.octeon1.32 2010-04-12 17:12:21.000000000 -0600 @@ -8,7 +8,7 @@ PROVIDE (_DYNAMIC = 0); SECTIONS { - . = KERNLOADADDR + SIZEOF_HEADERS; + . = KERNLOADADDR; .text . : { *(.text) diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/conf/newvers.sh ./sys/conf/newvers.sh --- /dune/imp/svn/head/sys/conf/newvers.sh 2010-03-13 19:43:20.000000000 -0700 +++ ./sys/conf/newvers.sh 2010-04-12 16:38:28.000000000 -0600 @@ -44,7 +44,7 @@ ${PARAMFILE}) else RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ - ${SYSDIR}/sys/param.h) + $(dirname $0)/../sys/param.h) fi @@ -84,45 +84,54 @@ fi touch version -v=`cat version` u=${USER:-root} h=${HOSTNAME:-`hostname`} t=`date` +v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date` i=`${MAKE:-make} -V KERN_IDENT` -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 +case "$d" in +*/sys/*) + SRCDIR=${d##*obj} + if [ -n "$MACHINE" ]; then + SRCDIR=${SRCDIR##/$MACHINE} fi -done + SRCDIR=${SRCDIR%%/sys/*} -if [ -n "$svnversion" ] ; then - svn=" r`cd ${SYSDIR} && $svnversion`" -fi + 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 "$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 + 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 svn=" r${svn}" - git="+${git}" + git="=${git}" else - git=" ${git}" + 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" fi fi - if $git_cmd --work-tree=${SYSDIR}/.. diff-index \ - --name-only HEAD | read dummy; then - git="${git}-dirty" - fi -fi + ;; +esac cat << EOF > vers.c $COPYRIGHT diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/contrib/ipfilter/netinet/svn-commit.tmp~ ./sys/contrib/ipfilter/netinet/svn-commit.tmp~ --- /dune/imp/svn/head/sys/contrib/ipfilter/netinet/svn-commit.tmp~ 2010-04-14 14:48:26.998000000 -0600 +++ ./sys/contrib/ipfilter/netinet/svn-commit.tmp~ 1969-12-31 17:00:00.000000000 -0700 @@ -1,21 +0,0 @@ - - -PR: -Submitted by: -Reviewed by: -Approved by: -Obtained from: -MFC after: -Security: ---This line, and those below, will be ignored-- -> Description of fields to fill in above: 76 columns --| -> PR: If a GNATS PR is affected by the change. -> Submitted by: If someone else sent in the change. -> Reviewed by: If someone else reviewed your modification. -> Approved by: If you needed approval for this commit. -> Obtained from: If the change is from a third party. -> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. -> Security: Vulnerability reference (one per line) or description. -> Empty fields above will be automatically removed. - -M ip_compat.h diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/kern/Makefile ./sys/kern/Makefile --- /dune/imp/svn/head/sys/kern/Makefile 2010-02-18 09:01:26.000000000 -0700 +++ ./sys/kern/Makefile 2010-04-12 10:41:03.000000000 -0600 @@ -28,7 +28,7 @@ # are placed in each source directory. We need to have links to tags files # from the generic directories that are relative to the machine type, even # via remote mounts; therefore we use symlinks to $SYSTAGS, which points at -# ${SYSDIR}/${MACHINE_ARCH}/tags. +# ${SYSDIR}/${MACHINE_CPUARCH}/tags. SYSTAGS=/var/db/sys_tags SYSDIR=/sys @@ -51,7 +51,7 @@ links:: rm -f ${SYSTAGS} - ln -s ${SYSDIR}/${MACHINE_ARCH}/tags ${SYSTAGS} + ln -s ${SYSDIR}/${MACHINE_CPUARCH}/tags ${SYSTAGS} -for i in ${DGEN}; do \ (cd ../$$i && { rm -f tags; ln -s ${SYSTAGS} tags; }) done -for i in ${ARCH}; do \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/kern/kern_sysctl.c ./sys/kern/kern_sysctl.c --- /dune/imp/svn/head/sys/kern/kern_sysctl.c 2010-02-18 09:01:26.000000000 -0700 +++ ./sys/kern/kern_sysctl.c 2010-04-12 10:41:03.000000000 -0600 @@ -827,7 +827,7 @@ sysctl_sysctl_name2oid(SYSCTL_HANDLER_ARGS) { char *p; - int error, oid[CTL_MAXNAME], len; + int error, oid[CTL_MAXNAME], len = 0; struct sysctl_oid *op = 0; SYSCTL_ASSERT_LOCKED(); diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/mips/conf/AR71XX.RS ./sys/mips/conf/AR71XX.RS --- /dune/imp/svn/head/sys/mips/conf/AR71XX.RS 2010-03-13 21:19:40.000000000 -0700 +++ ./sys/mips/conf/AR71XX.RS 1969-12-31 17:00:00.000000000 -0700 @@ -1,90 +0,0 @@ -# -# AR71XX -- Kernel configuration file for FreeBSD/mips for Atheros 71xx systems -# -# $FreeBSD: head/sys/mips/conf/AR71XX 203758 2010-02-10 16:30:04Z attilio $ -# - -ident AR71XX -cpu CPU_MIPS4KC -options ISA_MIPS32 -makeoptions TARGET_BIG_ENDIAN -makeoptions KERNLOADADDR=0x80050000 -options HZ=100 - -files "../atheros/files.ar71xx" -hints "AR71XX.RS.hints" - -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -makeoptions MODULES_OVERRIDE="" - -options DDB -options KDB - -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions - -# options NFS_LEGACYRPC -# Debugging for use in -current -# options DEADLKRES -# options INVARIANTS -# options INVARIANT_SUPPORT -# options WITNESS -# options WITNESS_SKIPSPIN -options FFS #Berkeley Fast Filesystem -options SOFTUPDATES #Enable FFS soft updates support -options UFS_ACL #Support for access control lists -options UFS_DIRHASH #Improve performance on big directories - - -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=arge0 -options BOOTP_COMPAT -options ROOTDEVNAME=\"nfs:192.168.10.1:/mnt/bsd\" - -device pci - -# Wireless NIC cards -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_MESH -options IEEE80211_SUPPORT_TDMA -device wlan # 802.11 support -device wlan_wep # 802.11 WEP support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support - -device ath # Atheros pci/cardbus NIC's -options ATH_DEBUG -device ath_hal -option AH_SUPPORT_AR5416 -device ath_rate_sample - -device mii -device arge - -device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -# options USB_DEBUG -device ohci -device ehci - -device spibus -device ar71xx_spi -device mx25l -# device geom_redboot - -device ar71xx_wdog - -device uart - -device loop -device ether -device md -device bpf -device random -device if_bridge diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/mips/conf/AR71XX.RS.hints ./sys/mips/conf/AR71XX.RS.hints --- /dune/imp/svn/head/sys/mips/conf/AR71XX.RS.hints 2010-03-13 21:18:54.000000000 -0700 +++ ./sys/mips/conf/AR71XX.RS.hints 1969-12-31 17:00:00.000000000 -0700 @@ -1,63 +0,0 @@ -# $FreeBSD: head/sys/mips/conf/AR71XX.hints 202839 2010-01-22 22:14:12Z gonzo $ -hint.apb.0.at="nexus0" -hint.apb.0.irq=4 - -# uart0 -hint.uart.0.at="apb0" -# see atheros/uart_cpu_ar71xx.c why +3 -hint.uart.0.maddr=0x18020003 -hint.uart.0.msize=0x18 -hint.uart.0.irq=3 - -#ohci -hint.ohci.0.at="apb0" -hint.ohci.0.maddr=0x1c000000 -hint.ohci.0.msize=0x01000000 -hint.ohci.0.irq=6 - -#ehci -hint.ehci.0.at="nexus0" -hint.ehci.0.maddr=0x1b000000 -hint.ehci.0.msize=0x01000000 -hint.ehci.0.irq=1 - -# pci -hint.pcib.0.at="nexus0" -hint.pcib.0.irq=0 - -hint.arge.0.at="nexus0" -hint.arge.0.maddr=0x19000000 -hint.arge.0.msize=0x1000 -hint.arge.0.irq=2 -# Uncomment this hint for RS (not PRO) -# PHY20 = 1 << 20 -hint.arge.0.phymask=0x100000 - -hint.arge.1.at="nexus0" -hint.arge.1.maddr=0x1a000000 -hint.arge.1.msize=0x1000 -hint.arge.1.irq=3 -# PHY1, PHY2, PHY3 -hint.arge.1.phymask=0x0e -# should be 100 for RS -hint.arge.1.media=100 -hint.arge.1.fduplex=1 -# Uncomment this hint for RS (not PRO) -hint.arge.1.phymask=0x70000 - -# SPI flash -hint.spi.0.at="nexus0" -hint.spi.0.maddr=0x1f000000 -hint.spi.0.msize=0x10 - -hint.mx25l.0.at="spibus0" -hint.mx25l.0.cs=0 - -# shares the same bus with mx25l. -# CE low for flash, CE high for RTC -# at the moment it's just stub until SPI bus is ready for such hacks -# hint.rtc.0.at="spibus0" -# hint.rtc.0.cs=0 - -# Watchdog -hint.ar71xx_wdog.0.at="nexus0" diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/mips/conf/ROUTERSTATION ./sys/mips/conf/ROUTERSTATION --- /dune/imp/svn/head/sys/mips/conf/ROUTERSTATION 2010-03-14 14:29:42.000000000 -0600 +++ ./sys/mips/conf/ROUTERSTATION 1969-12-31 17:00:00.000000000 -0700 @@ -1,15 +0,0 @@ -# $FreeBSD$ -# -# Config file for RouterStation (not the Pro) board from Ubiquity. -# - -include "std.ar71xx" -hints "ROUTERSTATION.hints" - -# Boot off NFS-root -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=arge0 -options BOOTP_COMPAT -options ROOTDEVNAME=\"nfs:192.168.10.1:/mnt/bsd\" diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/mips/conf/ROUTERSTATION.hints ./sys/mips/conf/ROUTERSTATION.hints --- /dune/imp/svn/head/sys/mips/conf/ROUTERSTATION.hints 2010-03-14 14:35:35.000000000 -0600 +++ ./sys/mips/conf/ROUTERSTATION.hints 1969-12-31 17:00:00.000000000 -0700 @@ -1,23 +0,0 @@ -# $FreeBSD$ - -# Ubiquiti ROUTER-STATION board hints file. All the stuff that's -# on-board should go here (as opposed to the SoC devices, which should -# be in ar71xx.std.hints). - -# ROUTER-STATION has arge at phy 20. -# PHY20 = 1 << 20 -hint.arge.0.phymask=0x100000 - -# arge1 has a switch that's 100BaseTX based. -hint.arge.1.media=100 -hint.arge.1.fduplex=1 -hint.arge.0.phymask=0x70000 - -hint.mx25l.0.at="spibus0" -hint.mx25l.0.cs=0 - -# shares the same bus with mx25l. -# CE low for flash, CE high for RTC -# at the moment it's just stub until SPI bus is ready for such hacks -# hint.rtc.0.at="spibus0" -# hint.rtc.0.cs=0 diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/mips/conf/RSPRO ./sys/mips/conf/RSPRO --- /dune/imp/svn/head/sys/mips/conf/RSPRO 2010-03-14 15:26:40.000000000 -0600 +++ ./sys/mips/conf/RSPRO 1969-12-31 17:00:00.000000000 -0700 @@ -1,15 +0,0 @@ -# $FreeBSD$ -# -# Config file for RouterStation (not the Pro) board from Ubiquity. -# - -include "std.ar71xx" -hints "RSPRO.hints" - -# Boot off NFS-root -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=arge0 -options BOOTP_COMPAT -options ROOTDEVNAME=\"nfs:192.168.10.1:/mnt/bsd\" diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/mips/conf/RSPRO.hints ./sys/mips/conf/RSPRO.hints --- /dune/imp/svn/head/sys/mips/conf/RSPRO.hints 2010-03-14 14:35:44.000000000 -0600 +++ ./sys/mips/conf/RSPRO.hints 1969-12-31 17:00:00.000000000 -0700 @@ -1,22 +0,0 @@ -# $FreeBSD$ - -# Ubiquiti ROUTER-STATION Pro board hints file. All the stuff that's -# on-board should go here (as opposed to the SoC devices, which should -# be in ar71xx.std.hints). - -# PHY4 = 1 << 4 -hint.arge.0.phymask=0x10 - -# PHY1, PHY2, PHY3 -hint.arge.1.phymask=0x0e -hint.arge.1.media=1000 -hint.arge.1.fduplex=1 - -hint.mx25l.0.at="spibus0" -hint.mx25l.0.cs=0 - -# shares the same bus with mx25l. -# CE low for flash, CE high for RTC -# at the moment it's just stub until SPI bus is ready for such hacks -# hint.rtc.0.at="spibus0" -# hint.rtc.0.cs=0 diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/mips/conf/ar71xx.std.hints ./sys/mips/conf/ar71xx.std.hints --- /dune/imp/svn/head/sys/mips/conf/ar71xx.std.hints 2010-03-14 14:33:52.000000000 -0600 +++ ./sys/mips/conf/ar71xx.std.hints 1969-12-31 17:00:00.000000000 -0700 @@ -1,44 +0,0 @@ -# $FreeBSD: head/sys/mips/conf/ar71xx.std.hints -1 $ -hint.apb.0.at="nexus0" -hint.apb.0.irq=4 - -# uart0 -hint.uart.0.at="apb0" -# see atheros/uart_cpu_ar71xx.c why +3 -hint.uart.0.maddr=0x18020003 -hint.uart.0.msize=0x18 -hint.uart.0.irq=3 - -#ohci -hint.ohci.0.at="apb0" -hint.ohci.0.maddr=0x1c000000 -hint.ohci.0.msize=0x01000000 -hint.ohci.0.irq=6 - -#ehci -hint.ehci.0.at="nexus0" -hint.ehci.0.maddr=0x1b000000 -hint.ehci.0.msize=0x01000000 -hint.ehci.0.irq=1 - -# pci -hint.pcib.0.at="nexus0" -hint.pcib.0.irq=0 - -hint.arge.0.at="nexus0" -hint.arge.0.maddr=0x19000000 -hint.arge.0.msize=0x1000 -hint.arge.0.irq=2 - -hint.arge.1.at="nexus0" -hint.arge.1.maddr=0x1a000000 -hint.arge.1.msize=0x1000 -hint.arge.1.irq=3 - -# SPI flash -hint.spi.0.at="nexus0" -hint.spi.0.maddr=0x1f000000 -hint.spi.0.msize=0x10 - -# Watchdog -hint.ar71xx_wdog.0.at="nexus0" diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/mips/conf/hints.std.ar71xx ./sys/mips/conf/hints.std.ar71xx --- /dune/imp/svn/head/sys/mips/conf/hints.std.ar71xx 2010-03-14 14:25:17.000000000 -0600 +++ ./sys/mips/conf/hints.std.ar71xx 1969-12-31 17:00:00.000000000 -0700 @@ -1,65 +0,0 @@ -# $FreeBSD: head/sys/mips/conf/hints.std.ar71xx -1 $ -hint.apb.0.at="nexus0" -hint.apb.0.irq=4 - -# uart0 -hint.uart.0.at="apb0" -# see atheros/uart_cpu_ar71xx.c why +3 -hint.uart.0.maddr=0x18020003 -hint.uart.0.msize=0x18 -hint.uart.0.irq=3 - -#ohci -hint.ohci.0.at="apb0" -hint.ohci.0.maddr=0x1c000000 -hint.ohci.0.msize=0x01000000 -hint.ohci.0.irq=6 - -#ehci -hint.ehci.0.at="nexus0" -hint.ehci.0.maddr=0x1b000000 -hint.ehci.0.msize=0x01000000 -hint.ehci.0.irq=1 - -# pci -hint.pcib.0.at="nexus0" -hint.pcib.0.irq=0 - -hint.arge.0.at="nexus0" -hint.arge.0.maddr=0x19000000 -hint.arge.0.msize=0x1000 -hint.arge.0.irq=2 -# PHY4 = 1 << 4 -hint.arge.0.phymask=0x10 -# Uncomment this hint for RS (not PRO) -# PHY20 = 1 << 20 -# hint.arge.0.phymask=0x100000 - -hint.arge.1.at="nexus0" -hint.arge.1.maddr=0x1a000000 -hint.arge.1.msize=0x1000 -hint.arge.1.irq=3 -# PHY1, PHY2, PHY3 -hint.arge.1.phymask=0x0e -# should be 100 for RS -hint.arge.1.media=1000 -hint.arge.1.fduplex=1 -# Uncomment this hint for RS (not PRO) -# hint.arge.0.phymask=70000 - -# SPI flash -hint.spi.0.at="nexus0" -hint.spi.0.maddr=0x1f000000 -hint.spi.0.msize=0x10 - -hint.mx25l.0.at="spibus0" -hint.mx25l.0.cs=0 - -# shares the same bus with mx25l. -# CE low for flash, CE high for RTC -# at the moment it's just stub until SPI bus is ready for such hacks -# hint.rtc.0.at="spibus0" -# hint.rtc.0.cs=0 - -# Watchdog -hint.ar71xx_wdog.0.at="nexus0" diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/mips/conf/std.ar71xx ./sys/mips/conf/std.ar71xx --- /dune/imp/svn/head/sys/mips/conf/std.ar71xx 2010-03-14 14:29:38.000000000 -0600 +++ ./sys/mips/conf/std.ar71xx 1969-12-31 17:00:00.000000000 -0700 @@ -1,85 +0,0 @@ -# -# AR71XX -- Kernel configuration file for FreeBSD/mips for Atheros 71xx systems -# -# $FreeBSD: head/sys/mips/conf/std.ar71xx -1 $ -# - -ident AR71XX -cpu CPU_MIPS4KC -options ISA_MIPS32 -makeoptions TARGET_BIG_ENDIAN -makeoptions KERNLOADADDR=0x80050000 -options HZ=1000 - -files "../atheros/files.ar71xx" -hints "ar71xx.std.hints" - -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -makeoptions MODULES_OVERRIDE="" - -options DDB -options KDB - -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions - -# options NFS_LEGACYRPC -# Debugging for use in -current -# options DEADLKRES -# options INVARIANTS -# options INVARIANT_SUPPORT -# options WITNESS -# options WITNESS_SKIPSPIN -options FFS #Berkeley Fast Filesystem -options SOFTUPDATES #Enable FFS soft updates support -options UFS_ACL #Support for access control lists -options UFS_DIRHASH #Improve performance on big directories - -device pci - -# Wireless NIC cards -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_MESH -options IEEE80211_SUPPORT_TDMA -device wlan # 802.11 support -device wlan_wep # 802.11 WEP support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support - -device ath # Atheros pci/cardbus NIC's -options ATH_DEBUG -device ath_hal -option AH_SUPPORT_AR5416 -device ath_rate_sample - -device mii -device arge - -device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -# options USB_DEBUG -device ohci -device ehci -device umass # Disks/Mass storage - Requires scbus and da -device da -device scbus - -device spibus -device ar71xx_spi -device mx25l -device geom_redboot - -device ar71xx_wdog - -device uart - -device loop -device ether -device md -device bpf -device random -device if_bridge diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/Makefile ./sys/modules/Makefile --- /dune/imp/svn/head/sys/modules/Makefile 2010-04-14 14:58:56.000000000 -0600 +++ ./sys/modules/Makefile 2010-04-14 14:59:28.000000000 -0600 @@ -314,8 +314,8 @@ ${_zfs} \ zlib \ -.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "arm" && \ - ${MACHINE_ARCH} != "mips" +.if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \ + ${MACHINE_CPUARCH} != "mips" _syscons= syscons _vpo= vpo .endif @@ -351,7 +351,7 @@ _pflog= pflog .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" # XXX some of these can move to the general case when de-i386'ed # XXX some of these can move now, but are untested on other architectures. _3dfx= 3dfx @@ -488,7 +488,7 @@ .endif .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" _aac= aac _acpi= acpi _agp= agp @@ -575,7 +575,7 @@ .endif .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" _aac= aac _aic= aic _an= an @@ -613,7 +613,7 @@ _xe= xe .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" _an= an _bm= bm _cpufreq= cpufreq @@ -622,7 +622,7 @@ _sound= sound .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" _auxio= auxio _em= em _epic= epic diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/aac/Makefile ./sys/modules/aac/Makefile --- /dune/imp/svn/head/sys/modules/aac/Makefile 2010-02-18 09:02:19.000000000 -0700 +++ ./sys/modules/aac/Makefile 2010-04-12 10:41:58.000000000 -0600 @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../dev/aac -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SUBDIR= aac_linux .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/acpi/acpi/Makefile ./sys/modules/acpi/acpi/Makefile --- /dune/imp/svn/head/sys/modules/acpi/acpi/Makefile 2010-03-10 13:25:05.000000000 -0700 +++ ./sys/modules/acpi/acpi/Makefile 2010-04-12 17:22:12.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/sys/modules/acpi/acpi/Makefile 204877 2010-03-08 19:40:31Z jkim $ +# $FreeBSD: user/imp/tbemd/sys/modules/acpi/acpi/Makefile 206529 2010-04-12 23:22:32Z imp $ -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" .error "ACPI can only be compiled into the kernel on the ia64 platform" .endif @@ -22,7 +22,7 @@ ${.CURDIR}/../../../pci \ ${.CURDIR}/../../../dev/acpica \ ${.CURDIR}/../../../dev/acpica/Osd \ - ${.CURDIR}/../../../${MACHINE_ARCH}/acpica + ${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica KMOD= acpi @@ -98,7 +98,7 @@ SRCS+= assym.s madt.c CLEANFILES+= acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= acpi_switch.S opt_global.h CLEANFILES+= acpi_wakedata.h ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} @@ -107,7 +107,7 @@ .endif acpi_wakecode.h: acpi_wakecode.S assym.s - ${MAKE} -f ${.CURDIR}/../../../${MACHINE_ARCH}/acpica/Makefile \ - MAKESRCPATH=${.CURDIR}/../../../${MACHINE_ARCH}/acpica + ${MAKE} -f ${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica/Makefile \ + MAKESRCPATH=${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/agp/Makefile ./sys/modules/agp/Makefile --- /dune/imp/svn/head/sys/modules/agp/Makefile 2010-02-18 09:02:15.000000000 -0700 +++ ./sys/modules/agp/Makefile 2010-04-12 10:41:54.000000000 -0600 @@ -4,14 +4,14 @@ KMOD= agp SRCS= agp.c agp_if.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= agp_i810.c agp_intel.c agp_via.c agp_sis.c agp_ali.c agp_amd.c \ agp_nvidia.c agp_ati.c .endif .if ${MACHINE} == "i386" SRCS+= agp_amd64.c .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= agp_amd64.c agp_i810.c agp_via.c .endif SRCS+= device_if.h bus_if.h agp_if.h pci_if.h diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/amr/Makefile ./sys/modules/amr/Makefile --- /dune/imp/svn/head/sys/modules/amr/Makefile 2010-02-18 09:02:18.000000000 -0700 +++ ./sys/modules/amr/Makefile 2010-04-12 10:41:57.000000000 -0600 @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../dev/amr SUBDIR= amr_cam -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SUBDIR+= amr_linux .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/asr/Makefile ./sys/modules/asr/Makefile --- /dune/imp/svn/head/sys/modules/asr/Makefile 2010-02-18 09:02:21.000000000 -0700 +++ ./sys/modules/asr/Makefile 2010-04-12 10:41:59.000000000 -0600 @@ -7,7 +7,7 @@ SRCS+= opt_scsi.h opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_asr.h .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/bge/Makefile ./sys/modules/bge/Makefile --- /dune/imp/svn/head/sys/modules/bge/Makefile 2010-02-18 09:02:16.000000000 -0700 +++ ./sys/modules/bge/Makefile 2010-04-12 10:41:55.000000000 -0600 @@ -5,7 +5,7 @@ KMOD= if_bge SRCS= if_bge.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h -.if ${MACHINE_ARCH} == sparc64 +.if ${MACHINE_CPUARCH} == sparc64 SRCS+= ofw_bus_if.h .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/cpufreq/Makefile ./sys/modules/cpufreq/Makefile --- /dune/imp/svn/head/sys/modules/cpufreq/Makefile 2010-03-01 23:52:09.000000000 -0700 +++ ./sys/modules/cpufreq/Makefile 2010-04-12 10:41:56.000000000 -0600 @@ -1,7 +1,7 @@ -# $FreeBSD: head/sys/modules/cpufreq/Makefile 204309 2010-02-25 14:13:39Z attilio $ +# $FreeBSD: user/imp/tbemd/sys/modules/cpufreq/Makefile 204601 2010-03-02 20:20:53Z imp $ .PATH: ${.CURDIR}/../../dev/cpufreq \ - ${.CURDIR}/../../${MACHINE_ARCH}/cpufreq + ${.CURDIR}/../../${MACHINE_CPUARCH}/cpufreq KMOD= cpufreq SRCS= ichss.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/cxgb/Makefile ./sys/modules/cxgb/Makefile --- /dune/imp/svn/head/sys/modules/cxgb/Makefile 2010-02-18 09:02:20.000000000 -0700 +++ ./sys/modules/cxgb/Makefile 2010-04-12 10:41:58.000000000 -0600 @@ -28,11 +28,11 @@ #_tom = tom .endif -.if ${MACHINE_ARCH} == "i386" && exists(${_toe_header}) +.if ${MACHINE_CPUARCH} == "i386" && exists(${_toe_header}) _iw_cxgb = iw_cxgb .endif -.if ${MACHINE_ARCH} == "amd64" && exists(${_toe_header}) +.if ${MACHINE_CPUARCH} == "amd64" && exists(${_toe_header}) _iw_cxgb = iw_cxgb .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/cyclic/Makefile ./sys/modules/cyclic/Makefile --- /dune/imp/svn/head/sys/modules/cyclic/Makefile 2010-02-18 09:02:13.000000000 -0700 +++ ./sys/modules/cyclic/Makefile 2010-04-12 10:41:53.000000000 -0600 @@ -4,13 +4,13 @@ KMOD= cyclic SRCS= cyclic.c - + SRCS+= vnode_if.h CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris \ -I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../.. \ - -I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_ARCH} + -I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_CPUARCH} CFLAGS+= -DDEBUG=1 diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/dtrace/Makefile ./sys/modules/dtrace/Makefile --- /dune/imp/svn/head/sys/modules/dtrace/Makefile 2010-02-18 09:02:15.000000000 -0700 +++ ./sys/modules/dtrace/Makefile 2010-04-12 10:41:54.000000000 -0600 @@ -14,9 +14,9 @@ sdt \ systrace -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SUBDIR+= fbt -.elif ${MACHINE_ARCH} == "i386" +.elif ${MACHINE_CPUARCH} == "i386" SUBDIR+= fbt .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/dtrace/Makefile.inc ./sys/modules/dtrace/Makefile.inc --- /dune/imp/svn/head/sys/modules/dtrace/Makefile.inc 2010-02-18 09:02:15.000000000 -0700 +++ ./sys/modules/dtrace/Makefile.inc 2010-04-12 10:41:54.000000000 -0600 @@ -5,7 +5,7 @@ load : -kldload cyclic -kldload dtrace -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" -kldload sdt -kldload lockstat -kldload fbt @@ -18,7 +18,7 @@ unload : -kldunload systrace -kldunload profile -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" -kldunload prototype -kldunload fbt -kldunload lockstat diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/dtrace/dtrace/Makefile ./sys/modules/dtrace/dtrace/Makefile --- /dune/imp/svn/head/sys/modules/dtrace/dtrace/Makefile 2010-02-18 09:02:14.000000000 -0700 +++ ./sys/modules/dtrace/dtrace/Makefile 2010-04-12 10:41:53.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/sys/modules/dtrace/dtrace/Makefile 188516 2009-02-12 14:44:15Z n_hibma $ +# $FreeBSD: user/imp/tbemd/sys/modules/dtrace/dtrace/Makefile 203446 2010-02-03 21:29:06Z imp $ -ARCHDIR= ${MACHINE_ARCH} +ARCHDIR= ${MACHINE_CPUARCH} .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common/dtrace .PATH: ${.CURDIR}/../../../cddl/kern @@ -12,7 +12,7 @@ dtrace_asm.S \ dtrace_subr.c -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SRCS+= dis_tables.c \ instr_size.c .endif @@ -25,7 +25,7 @@ # These are needed for assym.s SRCS+= opt_compat.h opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/dtrace/fasttrap/Makefile ./sys/modules/dtrace/fasttrap/Makefile --- /dune/imp/svn/head/sys/modules/dtrace/fasttrap/Makefile 2010-02-18 09:02:14.000000000 -0700 +++ ./sys/modules/dtrace/fasttrap/Makefile 2010-04-12 10:41:53.000000000 -0600 @@ -10,7 +10,7 @@ -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/hptmv/Makefile ./sys/modules/hptmv/Makefile --- /dune/imp/svn/head/sys/modules/hptmv/Makefile 2010-02-18 09:02:16.000000000 -0700 +++ ./sys/modules/hptmv/Makefile 2010-04-12 10:41:56.000000000 -0600 @@ -13,7 +13,7 @@ SRCS+= mv.c entry.c ioctl.c hptproc.c gui_lib.c OBJS+= hptmvraid.o -.if $(MACHINE_ARCH) == "amd64" +.if $(MACHINE_CPUARCH) == "amd64" HPTMV_RAID_O = amd64-elf.raid.o.uu .else HPTMV_RAID_O = i386-elf.raid.o.uu @@ -48,5 +48,5 @@ .endif CFLAGS = ${DEBUGOPT} - + .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/hptrr/Makefile ./sys/modules/hptrr/Makefile --- /dune/imp/svn/head/sys/modules/hptrr/Makefile 2010-02-18 09:02:19.000000000 -0700 +++ ./sys/modules/hptrr/Makefile 2010-04-12 10:41:58.000000000 -0600 @@ -9,6 +9,6 @@ OBJS = hptrr_lib.o hptrr_lib.o: - uudecode -p < ${HPTRR}/$(MACHINE_ARCH)-elf.hptrr_lib.o.uu > hptrr_lib.o + uudecode -p < ${HPTRR}/$(MACHINE_CPUARCH)-elf.hptrr_lib.o.uu > hptrr_lib.o .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/hwpmc/Makefile ./sys/modules/hwpmc/Makefile --- /dune/imp/svn/head/sys/modules/hwpmc/Makefile 2010-04-02 16:00:32.000000000 -0600 +++ ./sys/modules/hwpmc/Makefile 2010-04-12 17:17:55.000000000 -0600 @@ -8,31 +8,31 @@ SRCS= hwpmc_mod.c hwpmc_logging.c vnode_if.h -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_piv.c hwpmc_tsc.c SRCS+= hwpmc_x86.c hwpmc_uncore.c SRCS+= device_if.h bus_if.h .endif -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "arm" SRCS+= hwpmc_arm.c .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_piv.c hwpmc_ppro.c SRCS+= hwpmc_pentium.c hwpmc_tsc.c hwpmc_x86.c hwpmc_uncore.c SRCS+= device_if.h bus_if.h .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" SRCS+= hwpmc_ia64.c .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" SRCS+= hwpmc_powerpc.c .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" SRCS+= hwpmc_sparc64.c .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/i2c/controllers/pcf/Makefile ./sys/modules/i2c/controllers/pcf/Makefile --- /dune/imp/svn/head/sys/modules/i2c/controllers/pcf/Makefile 2010-02-18 09:02:19.000000000 -0700 +++ ./sys/modules/i2c/controllers/pcf/Makefile 2010-04-12 10:41:58.000000000 -0600 @@ -6,12 +6,12 @@ SRCS= ${envctrl} pcf.c ${pcf_ebus} ${pcf_isa} SRCS+= bus_if.h device_if.h iicbus_if.h ${isa_if} ${ofw_bus_if} -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" isa_if= isa_if.h pcf_isa= pcf_isa.c .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" envctrl= envctrl.c ofw_bus_if= ofw_bus_if.h pcf_ebus= pcf_ebus.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/io/Makefile ./sys/modules/io/Makefile --- /dune/imp/svn/head/sys/modules/io/Makefile 2010-02-18 09:02:21.000000000 -0700 +++ ./sys/modules/io/Makefile 2010-04-12 10:42:00.000000000 -0600 @@ -1,7 +1,7 @@ -# $FreeBSD: head/sys/modules/io/Makefile 139398 2004-12-29 08:44:30Z imp $ +# $FreeBSD: user/imp/tbemd/sys/modules/io/Makefile 203446 2010-02-03 21:29:06Z imp $ .PATH: ${.CURDIR}/../../dev/io -.PATH: ${.CURDIR}/../../${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} KMOD= io SRCS= iodev.c io.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/le/Makefile ./sys/modules/le/Makefile --- /dune/imp/svn/head/sys/modules/le/Makefile 2010-02-18 09:02:14.000000000 -0700 +++ ./sys/modules/le/Makefile 2010-04-12 10:41:53.000000000 -0600 @@ -7,7 +7,7 @@ SRCS+= ${if_le_ledma} if_le_pci.c lance.c ${lebuffer_sbus} SRCS+= bus_if.h device_if.h ${isa_if} ${ofw_bus_if} pci_if.h -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" .if ${MACHINE} == "pc98" if_le_cbus= if_le_cbus.c .else diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/linprocfs/Makefile ./sys/modules/linprocfs/Makefile --- /dune/imp/svn/head/sys/modules/linprocfs/Makefile 2010-02-18 09:02:14.000000000 -0700 +++ ./sys/modules/linprocfs/Makefile 2010-04-12 10:41:53.000000000 -0600 @@ -8,7 +8,7 @@ linprocfs.c \ opt_compat.h -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+=-DCOMPAT_LINUX32 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/linsysfs/Makefile ./sys/modules/linsysfs/Makefile --- /dune/imp/svn/head/sys/modules/linsysfs/Makefile 2010-02-18 09:02:20.000000000 -0700 +++ ./sys/modules/linsysfs/Makefile 2010-04-12 10:41:59.000000000 -0600 @@ -8,7 +8,7 @@ linsysfs.c \ opt_compat.h -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+=-DCOMPAT_LINUX32 .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/linux/Makefile ./sys/modules/linux/Makefile --- /dune/imp/svn/head/sys/modules/linux/Makefile 2010-03-12 17:50:25.000000000 -0700 +++ ./sys/modules/linux/Makefile 2010-04-12 17:17:55.000000000 -0600 @@ -1,11 +1,11 @@ -# $FreeBSD: head/sys/modules/linux/Makefile 205014 2010-03-11 14:49:06Z nwhitehorn $ +# $FreeBSD: user/imp/tbemd/sys/modules/linux/Makefile 206526 2010-04-12 23:18:16Z imp $ -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SFX= 32 CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 .endif -.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux${SFX} +.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX} KMOD= linux SRCS= linux${SFX}_dummy.c linux_emul.c linux_file.c \ @@ -18,13 +18,13 @@ # XXX: for assym.s SRCS+= opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h .endif OBJS= linux${SFX}_locore.o linux${SFX}_support.o -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= linux_ptrace.c imgact_linux.c opt_cpu.h .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/mem/Makefile ./sys/modules/mem/Makefile --- /dune/imp/svn/head/sys/modules/mem/Makefile 2010-02-18 09:02:18.000000000 -0700 +++ ./sys/modules/mem/Makefile 2010-04-12 10:41:57.000000000 -0600 @@ -2,17 +2,17 @@ .PATH: ${.CURDIR}/../../dev/mem .PATH: ${.CURDIR}/../../${MACHINE}/${MACHINE} -.PATH: ${.CURDIR}/../../${MACHINE_ARCH}/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} KMOD= mem SRCS= memdev.c mem.c -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SRCS+= memutil.c .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= i686_mem.c k6_mem.c .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= amd64_mem.c .endif SRCS+= bus_if.h device_if.h diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/mfi/Makefile ./sys/modules/mfi/Makefile --- /dune/imp/svn/head/sys/modules/mfi/Makefile 2010-02-18 09:02:18.000000000 -0700 +++ ./sys/modules/mfi/Makefile 2010-04-12 10:41:57.000000000 -0600 @@ -4,7 +4,7 @@ SUBDIR= mfip -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SUBDIR+= mfi_linux .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/ndis/Makefile ./sys/modules/ndis/Makefile --- /dune/imp/svn/head/sys/modules/ndis/Makefile 2010-02-18 09:02:18.000000000 -0700 +++ ./sys/modules/ndis/Makefile 2010-04-12 10:41:56.000000000 -0600 @@ -8,11 +8,11 @@ SRCS+= device_if.h bus_if.h pci_if.h vnode_if.h SRCS+= opt_bus.h opt_usb.h usb_if.h usbdevs.h -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= winx64_wrap.S .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= winx32_wrap.S .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/opensolaris/Makefile ./sys/modules/opensolaris/Makefile --- /dune/imp/svn/head/sys/modules/opensolaris/Makefile 2010-02-18 09:02:14.000000000 -0700 +++ ./sys/modules/opensolaris/Makefile 2010-04-12 10:41:53.000000000 -0600 @@ -8,8 +8,8 @@ opensolaris_kmem.c \ opensolaris_misc.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" -.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "ia64" || ${MACHINE_CPUARCH} == "sparc64" +.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_CPUARCH} SRCS+= opensolaris_atomic.S .else SRCS+= opensolaris_atomic.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/ppc/Makefile ./sys/modules/ppc/Makefile --- /dune/imp/svn/head/sys/modules/ppc/Makefile 2010-02-18 09:02:18.000000000 -0700 +++ ./sys/modules/ppc/Makefile 2010-04-12 10:41:57.000000000 -0600 @@ -6,18 +6,18 @@ opt_ppc.h opt_isa.h \ ppc.c ppc_pci.c ppc_puc.c -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= ppc_acpi.c ppc_isa.c .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" .if ${MACHINE} != "pc98" SRCS+= ppc_acpi.c .endif SRCS+= ppc_isa.c .endif -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" SRCS+= ppc_acpi.c .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/procfs/Makefile ./sys/modules/procfs/Makefile --- /dune/imp/svn/head/sys/modules/procfs/Makefile 2010-03-12 17:50:25.000000000 -0700 +++ ./sys/modules/procfs/Makefile 2010-04-12 17:17:55.000000000 -0600 @@ -34,7 +34,7 @@ echo "#define COMPAT_FREEBSD4 1" >> ${.TARGET} echo "#define COMPAT_FREEBSD5 1" >> ${.TARGET} echo "#define COMPAT_FREEBSD6 1" >> ${.TARGET} -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET} echo "#define COMPAT_LINUX32 1" >> ${.TARGET} .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/scc/Makefile ./sys/modules/scc/Makefile --- /dune/imp/svn/head/sys/modules/scc/Makefile 2010-02-18 09:02:15.000000000 -0700 +++ ./sys/modules/scc/Makefile 2010-04-12 10:41:54.000000000 -0600 @@ -5,7 +5,7 @@ .if ${MACHINE} == "sparc64" scc_bfe= scc_bfe_ebus.c scc_bfe_sbus.c .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" scc_bfe= scc_bfe_macio.c scc_bfe_quicc.c .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/smbfs/Makefile ./sys/modules/smbfs/Makefile --- /dune/imp/svn/head/sys/modules/smbfs/Makefile 2010-02-18 09:02:20.000000000 -0700 +++ ./sys/modules/smbfs/Makefile 2010-04-12 10:41:59.000000000 -0600 @@ -1,7 +1,7 @@ -# $FreeBSD: head/sys/modules/smbfs/Makefile 156326 2006-03-05 22:52:17Z yar $ +# $FreeBSD: user/imp/tbemd/sys/modules/smbfs/Makefile 203446 2010-02-03 21:29:06Z imp $ .PATH: ${.CURDIR}/../../crypto/des \ - ${.CURDIR}/../../crypto/des/arch/${MACHINE_ARCH} \ + ${.CURDIR}/../../crypto/des/arch/${MACHINE_CPUARCH} \ ${.CURDIR}/../../kern \ ${.CURDIR}/../../libkern \ ${.CURDIR}/../../netsmb \ @@ -21,7 +21,7 @@ # NETSMBCRYPTO SRCS+= des_ecb.c des_setkey.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= des_enc.S .else SRCS+= des_enc.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/sound/driver/Makefile ./sys/modules/sound/driver/Makefile --- /dune/imp/svn/head/sys/modules/sound/driver/Makefile 2010-02-18 09:02:14.000000000 -0700 +++ ./sys/modules/sound/driver/Makefile 2010-04-12 10:41:53.000000000 -0600 @@ -5,17 +5,17 @@ SUBDIR+= neomagic sb16 sb8 sbc solo spicds t4dwave via8233 SUBDIR+= via82c686 vibes driver uaudio -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" SUBDIR+= cmi mss .endif -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" .if ${MACHINE} == "sparc64" SUBDIR+= audiocs .endif .endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "powerpc" SUBDIR+= ai2s davbus .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/sound/sound/Makefile ./sys/modules/sound/sound/Makefile --- /dune/imp/svn/head/sys/modules/sound/sound/Makefile 2010-02-18 09:02:14.000000000 -0700 +++ ./sys/modules/sound/sound/Makefile 2010-04-12 10:41:53.000000000 -0600 @@ -44,7 +44,7 @@ EXPORT_SYMS= YES # XXX evaluate -.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "powerpc" # Create an empty opt_isa.h in order to keep kmod.mk from linking in an # existing one from KERNBUILDDIR which possibly has DEV_ISA defined so # sound.ko is always built without isadma support. diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/svr4/Makefile ./sys/modules/svr4/Makefile --- /dune/imp/svn/head/sys/modules/svr4/Makefile 2010-02-18 09:02:15.000000000 -0700 +++ ./sys/modules/svr4/Makefile 2010-04-12 10:41:55.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/sys/modules/svr4/Makefile 193744 2009-06-08 19:57:35Z bz $ +# $FreeBSD: user/imp/tbemd/sys/modules/svr4/Makefile 203446 2010-02-03 21:29:06Z imp $ -.PATH: ${.CURDIR}/../../${MACHINE_ARCH}/svr4 ${.CURDIR}/../../compat/svr4 +.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/svr4 ${.CURDIR}/../../compat/svr4 KMOD= svr4 SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h \ vnode_if.h imgact_svr4.c svr4_signal.c svr4_fcntl.c \ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/syscons/Makefile ./sys/modules/syscons/Makefile --- /dune/imp/svn/head/sys/modules/syscons/Makefile 2010-04-12 11:28:36.000000000 -0600 +++ ./sys/modules/syscons/Makefile 2010-04-12 17:17:55.000000000 -0600 @@ -14,11 +14,11 @@ ${_star} \ ${_warp} -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" _apm= apm .endif -.if ${MACHINE_ARCH} != "sparc64" +.if ${MACHINE_CPUARCH} != "sparc64" _beastie= beastie _daemon= daemon _dragon= dragon diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/uart/Makefile ./sys/modules/uart/Makefile --- /dune/imp/svn/head/sys/modules/uart/Makefile 2010-04-13 15:31:43.000000000 -0600 +++ ./sys/modules/uart/Makefile 2010-04-14 11:51:36.000000000 -0600 @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../dev/uart -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" uart_bus_ebus= uart_bus_ebus.c ofw_bus_if= ofw_bus_if.h .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/usb/Makefile ./sys/modules/usb/Makefile --- /dune/imp/svn/head/sys/modules/usb/Makefile 2010-02-18 09:02:17.000000000 -0700 +++ ./sys/modules/usb/Makefile 2010-04-12 10:41:56.000000000 -0600 @@ -35,16 +35,16 @@ SUBDIR += usfs umass urio SUBDIR += quirk template -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" _urtw= urtw .endif -.if ${MACHINE_ARCH} == "arm" +.if ${MACHINE_CPUARCH} == "arm" _at91dci= at91dci _atmegadci= atmegadci .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" _urtw= urtw .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/vx/Makefile ./sys/modules/vx/Makefile --- /dune/imp/svn/head/sys/modules/vx/Makefile 2010-02-18 09:02:20.000000000 -0700 +++ ./sys/modules/vx/Makefile 2010-04-12 10:41:58.000000000 -0600 @@ -4,7 +4,7 @@ KMOD= if_vx SRCS= if_vx.c if_vx_pci.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= if_vx_eisa.c .endif SRCS+= device_if.h bus_if.h pci_if.h eisa_if.h diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/modules/zfs/Makefile ./sys/modules/zfs/Makefile --- /dune/imp/svn/head/sys/modules/zfs/Makefile 2010-03-13 19:41:34.000000000 -0700 +++ ./sys/modules/zfs/Makefile 2010-04-12 17:17:55.000000000 -0600 @@ -27,8 +27,8 @@ SRCS+= opensolaris_vfs.c SRCS+= opensolaris_zone.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" -.PATH: ${SUNW}/common/atomic/${MACHINE_ARCH} +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "ia64" || ${MACHINE_CPUARCH} == "sparc64" +.PATH: ${SUNW}/common/atomic/${MACHINE_CPUARCH} SRCS+= opensolaris_atomic.S .else .PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/sys/vm/default_pager.c ./sys/vm/default_pager.c --- /dune/imp/svn/head/sys/vm/default_pager.c 2010-02-18 09:04:35.000000000 -0700 +++ ./sys/vm/default_pager.c 2010-04-12 10:44:26.000000000 -0600 @@ -80,7 +80,7 @@ vm_ooffset_t offset, struct ucred *cred) { vm_object_t object; - struct uidinfo *uip; + struct uidinfo *uip = NULL; if (handle != NULL) panic("default_pager_alloc: handle specified"); Files /dune/imp/svn/head/tools/tools/ath/athdebug/athdebug and ./tools/tools/ath/athdebug/athdebug differ Files /dune/imp/svn/head/tools/tools/ath/athdebug/athdebug.o and ./tools/tools/ath/athdebug/athdebug.o differ Files /dune/imp/svn/head/tools/tools/ath/athdecode/athdecode and ./tools/tools/ath/athdecode/athdecode differ Files /dune/imp/svn/head/tools/tools/ath/athdecode/dumpregs_5210.o and ./tools/tools/ath/athdecode/dumpregs_5210.o differ Files /dune/imp/svn/head/tools/tools/ath/athdecode/dumpregs_5211.o and ./tools/tools/ath/athdecode/dumpregs_5211.o differ Files /dune/imp/svn/head/tools/tools/ath/athdecode/dumpregs_5212.o and ./tools/tools/ath/athdecode/dumpregs_5212.o differ Files /dune/imp/svn/head/tools/tools/ath/athdecode/dumpregs_5416.o and ./tools/tools/ath/athdecode/dumpregs_5416.o differ Files /dune/imp/svn/head/tools/tools/ath/athdecode/main.o and ./tools/tools/ath/athdecode/main.o differ Files /dune/imp/svn/head/tools/tools/ath/athkey/athkey and ./tools/tools/ath/athkey/athkey differ Files /dune/imp/svn/head/tools/tools/ath/athkey/athkey.o and ./tools/tools/ath/athkey/athkey.o differ Files /dune/imp/svn/head/tools/tools/ath/athpoke/athpoke and ./tools/tools/ath/athpoke/athpoke differ Files /dune/imp/svn/head/tools/tools/ath/athpoke/athpoke.o and ./tools/tools/ath/athpoke/athpoke.o differ Files /dune/imp/svn/head/tools/tools/ath/athpoke/dumpregs_5210.o and ./tools/tools/ath/athpoke/dumpregs_5210.o differ Files /dune/imp/svn/head/tools/tools/ath/athpoke/dumpregs_5211.o and ./tools/tools/ath/athpoke/dumpregs_5211.o differ Files /dune/imp/svn/head/tools/tools/ath/athpoke/dumpregs_5212.o and ./tools/tools/ath/athpoke/dumpregs_5212.o differ Files /dune/imp/svn/head/tools/tools/ath/athpoke/dumpregs_5416.o and ./tools/tools/ath/athpoke/dumpregs_5416.o differ Files /dune/imp/svn/head/tools/tools/ath/athprom/athprom and ./tools/tools/ath/athprom/athprom differ Files /dune/imp/svn/head/tools/tools/ath/athprom/athprom.o and ./tools/tools/ath/athprom/athprom.o differ Files /dune/imp/svn/head/tools/tools/ath/athrd/ah_regdomain.o and ./tools/tools/ath/athrd/ah_regdomain.o differ Files /dune/imp/svn/head/tools/tools/ath/athrd/athrd and ./tools/tools/ath/athrd/athrd differ Files /dune/imp/svn/head/tools/tools/ath/athrd/athrd.o and ./tools/tools/ath/athrd/athrd.o differ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/tools/tools/ath/athrd/opt_ah.h ./tools/tools/ath/athrd/opt_ah.h --- /dune/imp/svn/head/tools/tools/ath/athrd/opt_ah.h 2010-04-01 11:48:50.000000000 -0600 +++ ./tools/tools/ath/athrd/opt_ah.h 1969-12-31 17:00:00.000000000 -0700 @@ -1,2 +0,0 @@ -#define AH_DEBUG 1 -#define AH_DEBUG_COUNTRY 1 Files /dune/imp/svn/head/tools/tools/ath/athregs/athregs and ./tools/tools/ath/athregs/athregs differ Files /dune/imp/svn/head/tools/tools/ath/athregs/dumpregs.o and ./tools/tools/ath/athregs/dumpregs.o differ Files /dune/imp/svn/head/tools/tools/ath/athregs/dumpregs_5210.o and ./tools/tools/ath/athregs/dumpregs_5210.o differ Files /dune/imp/svn/head/tools/tools/ath/athregs/dumpregs_5211.o and ./tools/tools/ath/athregs/dumpregs_5211.o differ Files /dune/imp/svn/head/tools/tools/ath/athregs/dumpregs_5212.o and ./tools/tools/ath/athregs/dumpregs_5212.o differ Files /dune/imp/svn/head/tools/tools/ath/athregs/dumpregs_5416.o and ./tools/tools/ath/athregs/dumpregs_5416.o differ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/tools/tools/ath/athstats/ah_osdep.h ./tools/tools/ath/athstats/ah_osdep.h --- /dune/imp/svn/head/tools/tools/ath/athstats/ah_osdep.h 2010-04-01 11:48:51.000000000 -0600 +++ ./tools/tools/ath/athstats/ah_osdep.h 1969-12-31 17:00:00.000000000 -0700 @@ -1,3 +0,0 @@ -typedef void *HAL_SOFTC; -typedef int HAL_BUS_TAG; -typedef void *HAL_BUS_HANDLE; Files /dune/imp/svn/head/tools/tools/ath/athstats/athstats and ./tools/tools/ath/athstats/athstats differ Files /dune/imp/svn/head/tools/tools/ath/athstats/athstats.o and ./tools/tools/ath/athstats/athstats.o differ Files /dune/imp/svn/head/tools/tools/ath/athstats/main.o and ./tools/tools/ath/athstats/main.o differ Files /dune/imp/svn/head/tools/tools/ath/athstats/statfoo.o and ./tools/tools/ath/athstats/statfoo.o differ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/tools/tools/nanobsd/gateworks/common ./tools/tools/nanobsd/gateworks/common --- /dune/imp/svn/head/tools/tools/nanobsd/gateworks/common 2010-04-01 11:10:41.000000000 -0600 +++ ./tools/tools/nanobsd/gateworks/common 2010-04-12 17:11:00.000000000 -0600 @@ -101,48 +101,39 @@ # NB: leave c++ enabled so devd can be built CONF_BUILD=" -WITHOUT_ACCT=true WITHOUT_ACPI=true -WITHOUT_APM=true WITHOUT_ATM=true WITHOUT_AUDIT=true WITHOUT_BIND_DNSSEC=true WITHOUT_BIND_ETC=true WITHOUT_BIND_LIBS_LWRES=true WITHOUT_BLUETOOTH=true -WITHOUT_BSNMP=true WITHOUT_CALENDAR=true WITHOUT_CDDL=true -WITHOUT_CTM=true WITHOUT_CVS=true WITHOUT_DICT=true WITHOUT_EXAMPLES=true -WITHOUT_FLOPPY=true WITHOUT_FORTRAN=true WITHOUT_GAMES=true WITHOUT_GCOV=true WITHOUT_GPIB=true -WITHOUT_GROFF=true WITHOUT_HTML=true +WITHOUT_I4B=true WITHOUT_INET6=true WITHOUT_INFO=true WITHOUT_IPFILTER=true WITHOUT_IPX=true WITHOUT_KERBEROS=true +WITHOUT_LIBKSE=true WITHOUT_LOCALES=true WITHOUT_LPR=true WITHOUT_MAN=true -WITHOUT_MAIL=true -WITHOUT_MAILWRAPPER=true WITHOUT_NETCAT=true WITHOUT_NIS=true WITHOUT_NLS=true WITHOUT_NS_CACHING=true WITHOUT_OBJC=true -WITHOUT_PMC=true -WITHOUT_PORTSNAP=true WITHOUT_PROFILE=true -WITHOUT_QUOTAS=true WITHOUT_RCMDS=true WITHOUT_RCS=true WITHOUT_RESCUE=true @@ -150,10 +141,7 @@ WITHOUT_SHAREDOCS=true WITHOUT_SSP=true WITHOUT_SYSCONS=true -WITHOUT_SYSINSTALL=true WITHOUT_TCSH=true -WITHOUT_TFTPD=true -WITHOUT_ZFS=true " CONF_INSTALL="$CONF_BUILD WITHOUT_TOOLCHAIN=true Files /dune/imp/svn/head/tools/tools/net80211/wlanstats/main.o and ./tools/tools/net80211/wlanstats/main.o differ Files /dune/imp/svn/head/tools/tools/net80211/wlanstats/statfoo.o and ./tools/tools/net80211/wlanstats/statfoo.o differ Files /dune/imp/svn/head/tools/tools/net80211/wlanstats/wlanstats and ./tools/tools/net80211/wlanstats/wlanstats differ Files /dune/imp/svn/head/tools/tools/net80211/wlanstats/wlanstats.o and ./tools/tools/net80211/wlanstats/wlanstats.o differ Files /dune/imp/svn/head/tools/tools/net80211/wlanwatch/wlanwatch and ./tools/tools/net80211/wlanwatch/wlanwatch differ Files /dune/imp/svn/head/tools/tools/net80211/wlanwatch/wlanwatch.o and ./tools/tools/net80211/wlanwatch/wlanwatch.o differ Files /dune/imp/svn/head/tools/tools/net80211/wlanwds/wlanwds and ./tools/tools/net80211/wlanwds/wlanwds differ Files /dune/imp/svn/head/tools/tools/net80211/wlanwds/wlanwds.o and ./tools/tools/net80211/wlanwds/wlanwds.o differ Files /dune/imp/svn/head/tools/tools/npe/npestats/main.o and ./tools/tools/npe/npestats/main.o differ Files /dune/imp/svn/head/tools/tools/npe/npestats/npestats and ./tools/tools/npe/npestats/npestats differ Files /dune/imp/svn/head/tools/tools/npe/npestats/npestats.o and ./tools/tools/npe/npestats/npestats.o differ Files /dune/imp/svn/head/tools/tools/npe/npestats/statfoo.o and ./tools/tools/npe/npestats/statfoo.o differ diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/Makefile ./usr.bin/Makefile --- /dune/imp/svn/head/usr.bin/Makefile 2010-03-01 23:52:11.000000000 -0700 +++ ./usr.bin/Makefile 2010-04-12 10:23:54.000000000 -0600 @@ -11,47 +11,28 @@ 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 \ cmp \ col \ - ${_colcrt} \ colldef \ colrm \ column \ comm \ - ${_compile_et} \ compress \ - ${_cpio} \ cpuset \ csplit \ - ${_csup} \ - ${_ctags} \ cut \ - ${_dc} \ - ${_dig} \ dirname \ du \ ee \ @@ -63,12 +44,10 @@ false \ fetch \ file \ - ${_file2c} \ find \ finger \ fmt \ fold \ - ${_from} \ fstat \ fsync \ ftp \ @@ -77,14 +56,10 @@ getconf \ getent \ getopt \ - ${_gprof} \ gzip \ head \ - ${_hesinfo} \ hexdump \ - ${_host} \ id \ - ${_indent} \ ipcrm \ ipcs \ join \ @@ -103,10 +78,8 @@ less \ lessecho \ lesskey \ - ${_lex} \ limits \ locale \ - ${_locate} \ lock \ lockf \ logger \ @@ -117,8 +90,6 @@ lorder \ lsvfs \ m4 \ - ${_mail} \ - ${_make} \ makewhatis \ mesg \ minigzip \ @@ -126,24 +97,16 @@ mkdep \ mkfifo \ mklocale \ - ${_mkstr} \ mktemp \ mkuzip \ - ${_msgs} \ mt \ - ${_nc} \ ncal \ - ${_ncplist} \ - ${_ncplogin} \ netstat \ newgrp \ - ${_newkey} \ nfsstat \ nice \ nl \ nohup \ - ${_nslookup} \ - ${_nsupdate} \ opieinfo \ opiekey \ opiepasswd \ @@ -156,26 +119,19 @@ 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 \ @@ -187,7 +143,6 @@ tar \ tcopy \ tee \ - ${_telnet} \ tftp \ time \ tip \ @@ -197,25 +152,19 @@ 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 \ @@ -231,167 +180,133 @@ wtmpcvt \ xargs \ xinstall \ - ${_xlint} \ - ${_xstr} \ - ${_yacc} \ - yes \ - ${_ypcat} \ - ${_ypmatch} \ - ${_ypwhich} - -.if ${MACHINE_ARCH} != "arm" -_truss= truss -.endif + yes # 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} != "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_CALENDAR} != "no" -_calendar= calendar +SUBDIR+= calendar .endif .if ${MK_HESIOD} != "no" -_hesinfo= hesinfo +SUBDIR+= hesinfo .endif .if ${MK_OPENSSL} != "no" -_bc= bc -_chkey= chkey -_dc= dc -_newkey= newkey +SUBDIR+= bc +SUBDIR+= chkey +SUBDIR+= dc +SUBDIR+= newkey .if ${MK_LIBTHR} != "no" -_csup= csup +SUBDIR+= csup .endif .endif .if ${MK_LOCATE} != "no" -_locate= locate +SUBDIR+= locate .endif # XXX msgs? .if ${MK_MAIL} != "no" -_biff= biff -_from= from -_mail= mail -_msgs= msgs +SUBDIR+= biff +SUBDIR+= from +SUBDIR+= mail +SUBDIR+= msgs .endif .if ${MK_MAKE} != "no" -_make= make +SUBDIR+= make .endif .if ${MK_NETCAT} != "no" -_nc= nc +SUBDIR+= nc .endif .if ${MK_NIS} != "no" -_ypcat= ypcat -_ypmatch= ypmatch -_ypwhich= ypwhich +SUBDIR+= ypcat +SUBDIR+= ypmatch +SUBDIR+= ypwhich .endif .if ${MK_QUOTAS} != "no" -_quota= quota +SUBDIR+= quota .endif .if ${MK_RCMDS} != "no" -_rlogin= rlogin -_rsh= rsh -_ruptime= ruptime -_rwho= rwho +SUBDIR+= rlogin +SUBDIR+= rsh +SUBDIR+= ruptime +SUBDIR+= rwho .endif .if ${MK_SENDMAIL} != "no" -_vacation= vacation +SUBDIR+= vacation .endif .if ${MK_TELNET} != "no" -_telnet= telnet +SUBDIR+= telnet .endif .if ${MK_TEXTPROC} != "no" -_checknr= checknr -_colcrt= colcrt -_ul= ul +SUBDIR+= checknr +SUBDIR+= colcrt +SUBDIR+= ul .endif .if ${MK_TOOLCHAIN} != "no" -_ar= ar -_c89= c89 -_c99= c99 -_compile_et= compile_et -_ctags= ctags -_file2c= file2c -_gprof= gprof -_indent= indent -_lex= lex -_mkstr= mkstr -_rpcgen= rpcgen -_unifdef= unifdef -_xlint= xlint -_xstr= xstr +SUBDIR+= ar +SUBDIR+= c89 +SUBDIR+= c99 +SUBDIR+= compile_et +SUBDIR+= ctags +SUBDIR+= file2c +SUBDIR+= gprof +SUBDIR+= indent +SUBDIR+= lex +SUBDIR+= mkstr +SUBDIR+= rpcgen +SUBDIR+= unifdef +SUBDIR+= xlint +SUBDIR+= xstr # XXX maybe under textproc? -_vgrind= vgrind -_yacc= yacc +SUBDIR+= vgrind +SUBDIR+= yacc .endif .if ${MK_USB} != "no" -_usbhidaction= usbhidaction -_usbhidctl= usbhidctl -.endif - -.if ${MACHINE_ARCH} == "i386" -.if ${MK_NCP} != "no" -_ncplist= ncplist -_ncplogin= ncplogin -.endif -_smbutil= smbutil -.endif - -.if ${MACHINE_ARCH} == "ia64" -_smbutil= smbutil -.endif - -.if ${MACHINE_ARCH} == "amd64" -.if ${MK_NCP} != "no" -_ncplist= ncplist -_ncplogin= ncplogin -.endif -_smbutil= smbutil +SUBDIR+= usbhidaction +SUBDIR+= usbhidctl .endif -.if ${MACHINE_ARCH} == "powerpc" -_smbutil= smbutil -.endif +.include -.if ${MACHINE_ARCH} == "sparc64" -_smbutil= smbutil -.endif +SUBDIR:= ${SUBDIR:O} .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/Makefile.amd64 ./usr.bin/Makefile.amd64 --- /dune/imp/svn/head/usr.bin/Makefile.amd64 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.bin/Makefile.amd64 2010-04-12 10:23:54.000000000 -0600 @@ -0,0 +1,7 @@ +# $FreeBSD$ + +.if ${MK_NCP} != "no" +SUBDIR+= ncplist +SUBDIR+= ncplogin +.endif +SUBDIR+= smbutil diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/Makefile.arm ./usr.bin/Makefile.arm --- /dune/imp/svn/head/usr.bin/Makefile.arm 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.bin/Makefile.arm 2010-04-12 10:23:54.000000000 -0600 @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR:= ${SUBDIR:Ntruss} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/Makefile.i386 ./usr.bin/Makefile.i386 --- /dune/imp/svn/head/usr.bin/Makefile.i386 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.bin/Makefile.i386 2010-04-12 10:23:54.000000000 -0600 @@ -0,0 +1,7 @@ +# $FreeBSD$ + +.if ${MK_NCP} != "no" +SUBDIR+= ncplist +SUBDIR+= ncplogin +.endif +SUBDIR+= smbutil diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/Makefile.ia64 ./usr.bin/Makefile.ia64 --- /dune/imp/svn/head/usr.bin/Makefile.ia64 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.bin/Makefile.ia64 2010-04-12 10:23:54.000000000 -0600 @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR+= smbutil diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/Makefile.powerpc ./usr.bin/Makefile.powerpc --- /dune/imp/svn/head/usr.bin/Makefile.powerpc 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.bin/Makefile.powerpc 2010-04-12 10:23:54.000000000 -0600 @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR+= smbutil diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/Makefile.sparc64 ./usr.bin/Makefile.sparc64 --- /dune/imp/svn/head/usr.bin/Makefile.sparc64 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.bin/Makefile.sparc64 2010-04-12 10:23:54.000000000 -0600 @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR+= smbutil diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/ldd/Makefile ./usr.bin/ldd/Makefile --- /dune/imp/svn/head/usr.bin/ldd/Makefile 2010-02-18 08:46:59.000000000 -0700 +++ ./usr.bin/ldd/Makefile 2010-04-12 10:23:40.000000000 -0600 @@ -2,7 +2,7 @@ PROG?= ldd SRCS= ldd.c -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= sods.c .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/truss/Makefile ./usr.bin/truss/Makefile --- /dune/imp/svn/head/usr.bin/truss/Makefile 2010-02-18 08:46:56.000000000 -0700 +++ ./usr.bin/truss/Makefile 2010-04-12 10:23:35.000000000 -0600 @@ -2,7 +2,7 @@ NO_WERROR= PROG= truss -SRCS= main.c setup.c syscalls.c syscalls.h ioctl.c ${MACHINE_ARCH}-fbsd.c +SRCS= main.c setup.c syscalls.c syscalls.h ioctl.c ${MACHINE_CPUARCH}-fbsd.c CFLAGS+= -I${.CURDIR} -I. CLEANFILES= syscalls.master syscalls.h ioctl.c @@ -19,7 +19,7 @@ ioctl.c: ${.CURDIR}/../kdump/mkioctls sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET} -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= i386-linux.c linux_syscalls.h CLEANFILES+=i386l-syscalls.master linux_syscalls.h @@ -31,7 +31,7 @@ ${.CURDIR}/i386linux.conf .endif -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= amd64-linux32.c linux32_syscalls.h CLEANFILES+=amd64l32-syscalls.master linux32_syscalls.h diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/xinstall/Makefile ./usr.bin/xinstall/Makefile --- /dune/imp/svn/head/usr.bin/xinstall/Makefile 2010-04-01 15:55:30.000000000 -0600 +++ ./usr.bin/xinstall/Makefile 2010-04-12 10:23:37.000000000 -0600 @@ -5,9 +5,4 @@ PROGNAME= install MAN= install.1 -.PATH: ${.CURDIR}/../../usr.sbin/mtree -CFLAGS+= -I${.CURDIR}/../../usr.sbin/mtree -LDADD+= -lmd -DPADD+= ${LIBMD} - .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/xinstall/PP ./usr.bin/xinstall/PP --- /dune/imp/svn/head/usr.bin/xinstall/PP 2010-04-01 15:55:29.000000000 -0600 +++ ./usr.bin/xinstall/PP 1969-12-31 17:00:00.000000000 -0700 @@ -1,441 +0,0 @@ -Index: xinstall.c -=================================================================== ---- xinstall.c (revision 205300) -+++ xinstall.c (working copy) -@@ -64,7 +64,17 @@ - #include - #include - #include -+#include - -+#include -+#if 0 -+#include -+#include -+#include -+#endif -+ -+#include "mtree.h" -+ - /* Bootstrap aid - this doesn't exist in most older releases */ - #ifndef MAP_FAILED - #define MAP_FAILED ((void *)-1) /* from */ -@@ -82,11 +92,29 @@ - gid_t gid; - uid_t uid; - int dobackup, docompare, dodir, dopreserve, dostrip, nommap, safecopy, verbose; -+char *group, *owner, *fflags, *tags; - mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; - const char *suffix = BACKUP_SUFFIX; -+const char *metafile = NULL; -+FILE *metafp; -+char *destdir; - -+enum { -+ DIGEST_NONE = 0, -+ DIGEST_MD5, -+#if 0 -+ DIGEST_RMD160, -+ DIGEST_SHA1, -+ DIGEST_SHA256, -+ DIGEST_SHA384, -+ DIGEST_SHA512, -+#endif -+} digesttype = DIGEST_NONE; -+char *digest; -+ -+ - static int compare(int, const char *, size_t, int, const char *, size_t); --static void copy(int, const char *, int, const char *, off_t); -+static char *copy(int, const char *, int, const char *, off_t); - static int create_newfile(const char *, int, struct stat *); - static int create_tempfile(const char *, char *, size_t); - static void install(const char *, const char *, u_long, u_int); -@@ -95,6 +123,8 @@ - static void strip(const char *); - static int trymmap(int); - static void usage(void); -+static void metadata_log(const char *, const char *, struct timeval *, -+ const char *, const char *, off_t); - - int - main(int argc, char *argv[]) -@@ -104,13 +134,15 @@ - u_long fset; - int ch, no_target; - u_int iflags; -- char *flags; -- const char *group, *owner, *to_name; -+ const char *to_name; - - iflags = 0; - group = owner = NULL; -- while ((ch = getopt(argc, argv, "B:bCcdf:g:Mm:o:pSsv")) != -1) -+ while ((ch = getopt(argc, argv, "a:B:bCcdf:g:Mm:o:pSsv")) != -1) - switch((char)ch) { -+ case 'a': -+ metafile = optarg; -+ break; - case 'B': - suffix = optarg; - /* FALLTHROUGH */ -@@ -127,14 +159,17 @@ - dodir = 1; - break; - case 'f': -- flags = optarg; -- if (strtofflags(&flags, &fset, NULL)) -- errx(EX_USAGE, "%s: invalid flag", flags); -+ fflags = optarg; -+ if (strtofflags(&fflags, &fset, NULL)) -+ errx(EX_USAGE, "%s: invalid flag", fflags); - iflags |= SETFLAGS; - break; - case 'g': - group = optarg; - break; -+ case 'h': -+ digest = optarg; -+ break; - case 'M': - nommap = 1; - break; -@@ -160,6 +195,9 @@ - case 'v': - verbose = 1; - break; -+ case 'T': -+ tags = optarg; -+ break; - case '?': - default: - usage(); -@@ -182,6 +220,30 @@ - if (argc == 0 || (argc == 1 && !dodir)) - usage(); - -+ if (digest) { -+ if (0) { -+ } else if (strcmp(digest, "none") == 0) { -+ digesttype = DIGEST_NONE; -+ } else if (strcmp(digest, "md5") == 0) { -+ digesttype = DIGEST_MD5; -+#if 0 -+ } else if (strcmp(digest, "rmd160") == 0) { -+ digesttype = DIGEST_RMD160; -+ } else if (strcmp(digest, "sha1") == 0) { -+ digesttype = DIGEST_SHA1; -+ } else if (strcmp(digest, "sha256") == 0) { -+ digesttype = DIGEST_SHA256; -+ } else if (strcmp(digest, "sha384") == 0) { -+ digesttype = DIGEST_SHA384; -+ } else if (strcmp(digest, "sha512") == 0) { -+ digesttype = DIGEST_SHA512; -+ } else { -+#endif -+ warnx("unknown digest `%s'", digest); -+ usage(); -+ } -+ } -+ - /* need to make a temp copy so we can compare stripped version */ - if (docompare && dostrip) - safecopy = 1; -@@ -203,6 +265,12 @@ - } else - uid = (uid_t)-1; - -+ if (metafile) { -+ if ((metafp = fopen(metafile, "a")) == NULL) -+ warn("open %s", metafile); -+ } else -+ digesttype = DIGEST_NONE; -+ - if (dodir) { - for (; *argv != NULL; ++argv) - install_dir(*argv); -@@ -277,11 +345,20 @@ - int devnull, files_match, from_fd, serrno, target; - int tempcopy, temp_fd, to_fd; - char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN]; -+ char *digestresult = NULL; -+ struct timeval tv[2]; -+ off_t size; - - files_match = 0; - from_fd = -1; - to_fd = -1; - -+ if (stat(from_name, &from_sb)) -+ err(1, "%s: stat", from_name); -+ size = from_sb.st_size; -+ TIMESPEC_TO_TIMEVAL(&tv[0], &from_sb.st_atimespec); -+ TIMESPEC_TO_TIMEVAL(&tv[1], &from_sb.st_mtimespec); -+ - /* If try to install NULL file to a directory, fails. */ - if (flags & DIRECTORY || strcmp(from_name, _PATH_DEVNULL)) { - if (stat(from_name, &from_sb)) -@@ -348,7 +425,7 @@ - from_name, to_name); - } - if (!devnull) -- copy(from_fd, from_name, to_fd, -+ digestresult = copy(from_fd, from_name, to_fd, - tempcopy ? tempfile : to_name, from_sb.st_size); - } - -@@ -514,6 +591,8 @@ - } - } - -+ metadata_log(to_name, "file", /* tv */NULL, NULL, digestresult, size); -+ free(digestresult); - (void)close(to_fd); - if (!devnull) - (void)close(from_fd); -@@ -650,7 +729,7 @@ - * copy -- - * copy from one file to another - */ --static void -+static char * - copy(int from_fd, const char *from_name, int to_fd, const char *to_name, - off_t size) - { -@@ -658,7 +737,43 @@ - int serrno; - char *p, buf[MAXBSIZE]; - int done_copy; -+ MD5_CTX ctxMD5; -+#if 0 -+ RMD160_CTX ctxRMD160; -+ SHA1_CTX ctxSHA1; -+ SHA256_CTX ctxSHA256; -+ SHA384_CTX ctxSHA384; -+ SHA512_CTX ctxSHA512; -+#endif - -+ switch (digesttype) { -+ case DIGEST_MD5: -+ MD5Init(&ctxMD5); -+ break; -+#if 0 -+ case DIGEST_RMD160: -+ RMD160Init(&ctxRMD160); -+ break; -+ case DIGEST_SHA1: -+ SHA1Init(&ctxSHA1); -+ break; -+ case DIGEST_SHA256: -+ SHA256_Init(&ctxSHA256); -+ break; -+ case DIGEST_SHA384: -+ SHA384_Init(&ctxSHA384); -+ break; -+ case DIGEST_SHA512: -+ SHA512_Init(&ctxSHA512); -+ break; -+#endif -+ case DIGEST_NONE: -+ if (to_fd < 0) -+ return NULL; /* no need to do anything */ -+ default: -+ break; -+ } -+ - /* Rewind file descriptors. */ - if (lseek(from_fd, (off_t)0, SEEK_SET) == (off_t)-1) - err(EX_OSERR, "lseek: %s", from_name); -@@ -680,6 +795,30 @@ - errno = nw > 0 ? EIO : serrno; - err(EX_OSERR, "%s", to_name); - } -+ switch (digesttype) { -+ case DIGEST_MD5: -+ MD5Update(&ctxMD5, p, size); -+ break; -+#if 0 -+ case DIGEST_RMD160: -+ RMD160Update(&ctxRMD160, p, size); -+ break; -+ case DIGEST_SHA1: -+ SHA1Update(&ctxSHA1, p, size); -+ break; -+ case DIGEST_SHA256: -+ SHA256_Update(&ctxSHA256, p, size); -+ break; -+ case DIGEST_SHA384: -+ SHA384_Update(&ctxSHA384, p, size); -+ break; -+ case DIGEST_SHA512: -+ SHA512_Update(&ctxSHA512, p, size); -+ break; -+#endif -+ default: -+ break; -+ } - done_copy = 1; - } - if (!done_copy) { -@@ -690,6 +829,30 @@ - errno = nw > 0 ? EIO : serrno; - err(EX_OSERR, "%s", to_name); - } -+ switch (digesttype) { -+ case DIGEST_MD5: -+ MD5Update(&ctxMD5, buf, nr); -+ break; -+#if 0 -+ case DIGEST_RMD160: -+ RMD160Update(&ctxRMD160, buf, nr); -+ break; -+ case DIGEST_SHA1: -+ SHA1Update(&ctxSHA1, buf, nr); -+ break; -+ case DIGEST_SHA256: -+ SHA256_Update(&ctxSHA256, buf, nr); -+ break; -+ case DIGEST_SHA384: -+ SHA384_Update(&ctxSHA384, buf, nr); -+ break; -+ case DIGEST_SHA512: -+ SHA512_Update(&ctxSHA512, buf, nr); -+ break; -+#endif -+ default: -+ break; -+ } - if (nr != 0) { - serrno = errno; - (void)unlink(to_name); -@@ -697,6 +860,24 @@ - err(EX_OSERR, "%s", from_name); - } - } -+ switch (digesttype) { -+ case DIGEST_MD5: -+ return MD5End(&ctxMD5, NULL); -+#if 0 -+ case DIGEST_RMD160: -+ return RMD160End(&ctxRMD160, NULL); -+ case DIGEST_SHA1: -+ return SHA1End(&ctxSHA1, NULL); -+ case DIGEST_SHA256: -+ return SHA256_End(&ctxSHA256, NULL); -+ case DIGEST_SHA384: -+ return SHA384_End(&ctxSHA384, NULL); -+ case DIGEST_SHA512: -+ return SHA512_End(&ctxSHA512, NULL); -+#endif -+ default: -+ return NULL; -+ } - } - - /* -@@ -804,3 +985,91 @@ - #endif - return (0); - } -+ -+/* -+ * metadata_log -- -+ * if metafp is not NULL, output mtree(8) full path name and settings to -+ * metafp, to allow permissions to be set correctly by other tools, -+ * or to allow integrity checks to be performed. -+ */ -+static void -+metadata_log(const char *path, const char *type, struct timeval *tv, -+ const char *slink, const char *digestresult, off_t size) -+{ -+#if 0 -+ static const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' }; -+#endif -+ const char *p; -+ char *buf; -+ size_t destlen; -+ struct flock metalog_lock; -+ -+ if (!metafp) -+ return; -+ buf = (char *)malloc(4 * strlen(path) + 1); /* buf for strsvis(3) */ -+ if (buf == NULL) { -+ warnx("%s", strerror(ENOMEM)); -+ return; -+ } -+ /* lock log file */ -+ metalog_lock.l_start = 0; -+ metalog_lock.l_len = 0; -+ metalog_lock.l_whence = SEEK_SET; -+ metalog_lock.l_type = F_WRLCK; -+ if (fcntl(fileno(metafp), F_SETLKW, &metalog_lock) == -1) { -+ warn("can't lock %s", metafile); -+ free(buf); -+ return; -+ } -+ -+ p = path; /* remove destdir */ -+ if (destdir) { -+ destlen = strlen(destdir); -+ if (strncmp(p, destdir, destlen) == 0 && -+ (p[destlen] == '/' || p[destlen] == '\0')) -+ p += destlen; -+ } -+ while (*p && *p == '/') /* remove leading /s */ -+ p++; -+#if 0 -+ /* Need to import this to do things totally right */ -+ strsvis(buf, p, VIS_CSTYLE, extra); /* encode name */ -+#else -+ strvis(buf, p, VIS_CSTYLE); /* encode name */ -+#endif -+ p = buf; -+ /* print details */ -+ fprintf(metafp, ".%s%s type=%s", *p ? "/" : "", p, type); -+ if (owner) -+ fprintf(metafp, " uname=%s", owner); -+ if (group) -+ fprintf(metafp, " gname=%s", group); -+ fprintf(metafp, " mode=%#o", mode); -+ if (slink) { -+#if 0 -+ strsvis(buf, slink, VIS_CSTYLE, extra); /* encode link */ -+#else -+ strvis(buf, slink, VIS_CSTYLE); /* encode link */ -+#endif -+ fprintf(metafp, " link=%s", buf); -+ } -+ if (*type == 'f') /* type=file */ -+ fprintf(metafp, " size=%lld", (long long)size); -+ if (tv != NULL && dopreserve) -+ fprintf(metafp, " time=%lld.%ld", -+ (long long)tv[1].tv_sec, (long)tv[1].tv_usec); -+ if (digestresult && digest) -+ fprintf(metafp, " %s=%s", digest, digestresult); -+ if (fflags) -+ fprintf(metafp, " flags=%s", fflags); -+ if (tags) -+ fprintf(metafp, " tags=%s", tags); -+ fputc('\n', metafp); -+ fflush(metafp); /* flush output */ -+ /* unlock log file */ -+ metalog_lock.l_type = F_UNLCK; -+ if (fcntl(fileno(metafp), F_SETLKW, &metalog_lock) == -1) { -+ warn("can't unlock %s", metafile); -+ } -+ free(buf); -+} -Index: Makefile -=================================================================== ---- Makefile (revision 205300) -+++ Makefile (working copy) -@@ -5,4 +5,9 @@ - PROGNAME= install - MAN= install.1 - -+.PATH: ${.CURDIR}/../../usr.sbin/mtree -+CFLAGS+= -I${.CURDIR}/../../usr.sbin/mtree -+LDADD+= -lmd -+DPADD+= ${LIBMD} -+ - .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/xinstall/xinstall.c ./usr.bin/xinstall/xinstall.c --- /dune/imp/svn/head/usr.bin/xinstall/xinstall.c 2010-04-01 15:55:30.000000000 -0600 +++ ./usr.bin/xinstall/xinstall.c 2010-04-12 10:23:37.000000000 -0600 @@ -64,16 +64,6 @@ #include #include #include -#include - -#include -#if 0 -#include -#include -#include -#endif - -#include "mtree.h" /* Bootstrap aid - this doesn't exist in most older releases */ #ifndef MAP_FAILED @@ -92,29 +82,11 @@ gid_t gid; uid_t uid; int dobackup, docompare, dodir, dopreserve, dostrip, nommap, safecopy, verbose; -char *group, *owner, *fflags, *tags; mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; const char *suffix = BACKUP_SUFFIX; -const char *metafile = NULL; -FILE *metafp; -char *destdir; - -enum { - DIGEST_NONE = 0, - DIGEST_MD5, -#if 0 - DIGEST_RMD160, - DIGEST_SHA1, - DIGEST_SHA256, - DIGEST_SHA384, - DIGEST_SHA512, -#endif -} digesttype = DIGEST_NONE; -char *digest; - static int compare(int, const char *, size_t, int, const char *, size_t); -static char *copy(int, const char *, int, const char *, off_t); +static void copy(int, const char *, int, const char *, off_t); static int create_newfile(const char *, int, struct stat *); static int create_tempfile(const char *, char *, size_t); static void install(const char *, const char *, u_long, u_int); @@ -123,8 +95,6 @@ static void strip(const char *); static int trymmap(int); static void usage(void); -static void metadata_log(const char *, const char *, struct timeval *, - const char *, const char *, off_t); int main(int argc, char *argv[]) @@ -134,15 +104,13 @@ u_long fset; int ch, no_target; u_int iflags; - const char *to_name; + char *flags; + const char *group, *owner, *to_name; iflags = 0; group = owner = NULL; - while ((ch = getopt(argc, argv, "a:B:bCcdf:g:Mm:o:pSsv")) != -1) + while ((ch = getopt(argc, argv, "B:bCcdf:g:Mm:o:pSsv")) != -1) switch((char)ch) { - case 'a': - metafile = optarg; - break; case 'B': suffix = optarg; /* FALLTHROUGH */ @@ -159,17 +127,14 @@ dodir = 1; break; case 'f': - fflags = optarg; - if (strtofflags(&fflags, &fset, NULL)) - errx(EX_USAGE, "%s: invalid flag", fflags); + flags = optarg; + if (strtofflags(&flags, &fset, NULL)) + errx(EX_USAGE, "%s: invalid flag", flags); iflags |= SETFLAGS; break; case 'g': group = optarg; break; - case 'h': - digest = optarg; - break; case 'M': nommap = 1; break; @@ -195,9 +160,6 @@ case 'v': verbose = 1; break; - case 'T': - tags = optarg; - break; case '?': default: usage(); @@ -220,30 +182,6 @@ if (argc == 0 || (argc == 1 && !dodir)) usage(); - if (digest) { - if (0) { - } else if (strcmp(digest, "none") == 0) { - digesttype = DIGEST_NONE; - } else if (strcmp(digest, "md5") == 0) { - digesttype = DIGEST_MD5; -#if 0 - } else if (strcmp(digest, "rmd160") == 0) { - digesttype = DIGEST_RMD160; - } else if (strcmp(digest, "sha1") == 0) { - digesttype = DIGEST_SHA1; - } else if (strcmp(digest, "sha256") == 0) { - digesttype = DIGEST_SHA256; - } else if (strcmp(digest, "sha384") == 0) { - digesttype = DIGEST_SHA384; - } else if (strcmp(digest, "sha512") == 0) { - digesttype = DIGEST_SHA512; - } else { -#endif - warnx("unknown digest `%s'", digest); - usage(); - } - } - /* need to make a temp copy so we can compare stripped version */ if (docompare && dostrip) safecopy = 1; @@ -265,12 +203,6 @@ } else uid = (uid_t)-1; - if (metafile) { - if ((metafp = fopen(metafile, "a")) == NULL) - warn("open %s", metafile); - } else - digesttype = DIGEST_NONE; - if (dodir) { for (; *argv != NULL; ++argv) install_dir(*argv); @@ -345,20 +277,11 @@ int devnull, files_match, from_fd, serrno, target; int tempcopy, temp_fd, to_fd; char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN]; - char *digestresult = NULL; - struct timeval tv[2]; - off_t size; files_match = 0; from_fd = -1; to_fd = -1; - if (stat(from_name, &from_sb)) - err(1, "%s: stat", from_name); - size = from_sb.st_size; - TIMESPEC_TO_TIMEVAL(&tv[0], &from_sb.st_atimespec); - TIMESPEC_TO_TIMEVAL(&tv[1], &from_sb.st_mtimespec); - /* If try to install NULL file to a directory, fails. */ if (flags & DIRECTORY || strcmp(from_name, _PATH_DEVNULL)) { if (stat(from_name, &from_sb)) @@ -425,7 +348,7 @@ from_name, to_name); } if (!devnull) - digestresult = copy(from_fd, from_name, to_fd, + copy(from_fd, from_name, to_fd, tempcopy ? tempfile : to_name, from_sb.st_size); } @@ -591,8 +514,6 @@ } } - metadata_log(to_name, "file", /* tv */NULL, NULL, digestresult, size); - free(digestresult); (void)close(to_fd); if (!devnull) (void)close(from_fd); @@ -729,7 +650,7 @@ * copy -- * copy from one file to another */ -static char * +static void copy(int from_fd, const char *from_name, int to_fd, const char *to_name, off_t size) { @@ -737,42 +658,6 @@ int serrno; char *p, buf[MAXBSIZE]; int done_copy; - MD5_CTX ctxMD5; -#if 0 - RMD160_CTX ctxRMD160; - SHA1_CTX ctxSHA1; - SHA256_CTX ctxSHA256; - SHA384_CTX ctxSHA384; - SHA512_CTX ctxSHA512; -#endif - - switch (digesttype) { - case DIGEST_MD5: - MD5Init(&ctxMD5); - break; -#if 0 - case DIGEST_RMD160: - RMD160Init(&ctxRMD160); - break; - case DIGEST_SHA1: - SHA1Init(&ctxSHA1); - break; - case DIGEST_SHA256: - SHA256_Init(&ctxSHA256); - break; - case DIGEST_SHA384: - SHA384_Init(&ctxSHA384); - break; - case DIGEST_SHA512: - SHA512_Init(&ctxSHA512); - break; -#endif - case DIGEST_NONE: - if (to_fd < 0) - return NULL; /* no need to do anything */ - default: - break; - } /* Rewind file descriptors. */ if (lseek(from_fd, (off_t)0, SEEK_SET) == (off_t)-1) @@ -795,30 +680,6 @@ errno = nw > 0 ? EIO : serrno; err(EX_OSERR, "%s", to_name); } - switch (digesttype) { - case DIGEST_MD5: - MD5Update(&ctxMD5, p, size); - break; -#if 0 - case DIGEST_RMD160: - RMD160Update(&ctxRMD160, p, size); - break; - case DIGEST_SHA1: - SHA1Update(&ctxSHA1, p, size); - break; - case DIGEST_SHA256: - SHA256_Update(&ctxSHA256, p, size); - break; - case DIGEST_SHA384: - SHA384_Update(&ctxSHA384, p, size); - break; - case DIGEST_SHA512: - SHA512_Update(&ctxSHA512, p, size); - break; -#endif - default: - break; - } done_copy = 1; } if (!done_copy) { @@ -829,30 +690,6 @@ errno = nw > 0 ? EIO : serrno; err(EX_OSERR, "%s", to_name); } - switch (digesttype) { - case DIGEST_MD5: - MD5Update(&ctxMD5, buf, nr); - break; -#if 0 - case DIGEST_RMD160: - RMD160Update(&ctxRMD160, buf, nr); - break; - case DIGEST_SHA1: - SHA1Update(&ctxSHA1, buf, nr); - break; - case DIGEST_SHA256: - SHA256_Update(&ctxSHA256, buf, nr); - break; - case DIGEST_SHA384: - SHA384_Update(&ctxSHA384, buf, nr); - break; - case DIGEST_SHA512: - SHA512_Update(&ctxSHA512, buf, nr); - break; -#endif - default: - break; - } if (nr != 0) { serrno = errno; (void)unlink(to_name); @@ -860,24 +697,6 @@ err(EX_OSERR, "%s", from_name); } } - switch (digesttype) { - case DIGEST_MD5: - return MD5End(&ctxMD5, NULL); -#if 0 - case DIGEST_RMD160: - return RMD160End(&ctxRMD160, NULL); - case DIGEST_SHA1: - return SHA1End(&ctxSHA1, NULL); - case DIGEST_SHA256: - return SHA256_End(&ctxSHA256, NULL); - case DIGEST_SHA384: - return SHA384_End(&ctxSHA384, NULL); - case DIGEST_SHA512: - return SHA512_End(&ctxSHA512, NULL); -#endif - default: - return NULL; - } } /* @@ -985,91 +804,3 @@ #endif return (0); } - -/* - * metadata_log -- - * if metafp is not NULL, output mtree(8) full path name and settings to - * metafp, to allow permissions to be set correctly by other tools, - * or to allow integrity checks to be performed. - */ -static void -metadata_log(const char *path, const char *type, struct timeval *tv, - const char *slink, const char *digestresult, off_t size) -{ -#if 0 - static const char extra[] = { ' ', '\t', '\n', '\\', '#', '\0' }; -#endif - const char *p; - char *buf; - size_t destlen; - struct flock metalog_lock; - - if (!metafp) - return; - buf = (char *)malloc(4 * strlen(path) + 1); /* buf for strsvis(3) */ - if (buf == NULL) { - warnx("%s", strerror(ENOMEM)); - return; - } - /* lock log file */ - metalog_lock.l_start = 0; - metalog_lock.l_len = 0; - metalog_lock.l_whence = SEEK_SET; - metalog_lock.l_type = F_WRLCK; - if (fcntl(fileno(metafp), F_SETLKW, &metalog_lock) == -1) { - warn("can't lock %s", metafile); - free(buf); - return; - } - - p = path; /* remove destdir */ - if (destdir) { - destlen = strlen(destdir); - if (strncmp(p, destdir, destlen) == 0 && - (p[destlen] == '/' || p[destlen] == '\0')) - p += destlen; - } - while (*p && *p == '/') /* remove leading /s */ - p++; -#if 0 - /* Need to import this to do things totally right */ - strsvis(buf, p, VIS_CSTYLE, extra); /* encode name */ -#else - strvis(buf, p, VIS_CSTYLE); /* encode name */ -#endif - p = buf; - /* print details */ - fprintf(metafp, ".%s%s type=%s", *p ? "/" : "", p, type); - if (owner) - fprintf(metafp, " uname=%s", owner); - if (group) - fprintf(metafp, " gname=%s", group); - fprintf(metafp, " mode=%#o", mode); - if (slink) { -#if 0 - strsvis(buf, slink, VIS_CSTYLE, extra); /* encode link */ -#else - strvis(buf, slink, VIS_CSTYLE); /* encode link */ -#endif - fprintf(metafp, " link=%s", buf); - } - if (*type == 'f') /* type=file */ - fprintf(metafp, " size=%lld", (long long)size); - if (tv != NULL && dopreserve) - fprintf(metafp, " time=%lld.%ld", - (long long)tv[1].tv_sec, (long)tv[1].tv_usec); - if (digestresult && digest) - fprintf(metafp, " %s=%s", digest, digestresult); - if (fflags) - fprintf(metafp, " flags=%s", fflags); - if (tags) - fprintf(metafp, " tags=%s", tags); - fputc('\n', metafp); - fflush(metafp); /* flush output */ - /* unlock log file */ - metalog_lock.l_type = F_UNLCK; - if (fcntl(fileno(metafp), F_SETLKW, &metalog_lock) == -1) { - warn("can't unlock %s", metafile); - } - free(buf); -} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.bin/xlint/Makefile.inc ./usr.bin/xlint/Makefile.inc --- /dune/imp/svn/head/usr.bin/xlint/Makefile.inc 2010-02-18 08:46:58.000000000 -0700 +++ ./usr.bin/xlint/Makefile.inc 2010-04-12 10:23:39.000000000 -0600 @@ -5,8 +5,16 @@ .PATH: ${.CURDIR}/../common +# These assignments duplicate much of the functionality of +# 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/} +.else +TARGET_CPUARCH=${MACHINE_CPUARCH} +.endif TARGET_ARCH?= ${MACHINE_ARCH} -CFLAGS+= -I${.CURDIR}/../arch/${TARGET_ARCH} +CFLAGS+= -I${.CURDIR}/../arch/${TARGET_CPUARCH} CFLAGS+= -I${.CURDIR}/../common OBJECT_FMT= ELF diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/Makefile ./usr.sbin/Makefile --- /dune/imp/svn/head/usr.sbin/Makefile 2010-04-05 04:54:28.000000000 -0600 +++ ./usr.sbin/Makefile 2010-04-12 17:11:00.000000000 -0600 @@ -3,27 +3,9 @@ .include -SUBDIR= ${_ac} \ - ${_accton} \ - ${_acpi} \ - adduser \ - ${_amd} \ - ${_ancontrol} \ - ${_apm} \ - ${_apmd} \ +SUBDIR= adduser \ arp \ - ${_asf} \ - ${_atm} \ - ${_audit} \ - ${_auditd} \ - ${_auditreduce} \ - ${_authpf} \ - ${_bluetooth} \ - ${_boot0cfg} \ - ${_boot98cfg} \ bootparamd \ - ${_bsnmpd} \ - ${_btxld} \ burncd \ cdcontrol \ chkgrp \ @@ -31,152 +13,70 @@ chroot \ ckdist \ clear_locks \ - ${_config} \ - ${_cpucontrol} \ crashinfo \ cron \ - ${_crunch} \ - ${_ctm} \ daemon \ dconschat \ devinfo \ digictl \ diskinfo \ - ${_dnssec-dsfromkey} \ - ${_dnssec-keyfromlabel} \ - ${_dnssec-keygen} \ - ${_dnssec-signzone} \ dumpcis \ - ${_editmap} \ - ${_edquota} \ - ${_eeprom} \ extattr \ extattrctl \ - ${_faithd} \ - ${_fdcontrol} \ - ${_fdformat} \ - ${_fdread} \ - ${_fdwrite} \ fifolog \ - ${_flowctl} \ - ${_freebsd-update} \ - ${_ftp-proxy} \ fwcontrol \ getfmac \ getpmac \ gstat \ - ${_gssd} \ i2c \ ifmcstat \ inetd \ iostat \ - ${_ip6addrctl} \ - ${_ipfwpcap} \ - ${_IPXrouted} \ - ${_jail} \ - ${_jexec} \ - ${_jls} \ - ${_kbdcontrol} \ - ${_kbdmap} \ - ${_keyserv} \ - ${_kgmon} \ - ${_kgzip} \ kldxref \ lastlogin \ - ${_lmcconfig} \ - ${_lpr} \ - ${_lptcontrol} \ - ${_mailstats} \ mailwrapper \ makefs \ - ${_makemap} \ manctl \ memcontrol \ mergemaster \ mfiutil \ mixer \ - ${_mld6query} \ mlxcontrol \ mountd \ - ${_mount_nwfs} \ mount_portalfs \ - ${_mount_smbfs} \ - ${_moused} \ - ${_mptable} \ mptutil \ mtest \ mtree \ - ${_named} \ - ${_named-checkconf} \ - ${_named-checkzone} \ - ${_named.reload} \ - ${_ndiscvt} \ - ${_ndp} \ newsyslog \ nfscbd \ nfsd \ nfsdumpstate \ nfsrevoke \ nfsuserd \ - ${_ngctl} \ - ${_nghook} \ nologin \ - ${_nscd} \ - ${_ntp} \ - ${_nvram} \ - ${_ofwdump} \ pciconf \ periodic \ - ${_pkg_install} \ - ${_pmcannotate} \ - ${_pmccontrol} \ - ${_pmcstat} \ - ${_pnpinfo} \ - ${_portsnap} \ powerd \ - ${_ppp} \ - ${_pppctl} \ - ${_praliases} \ - ${_praudit} \ procctl \ pstat \ pw \ pwd_mkdb \ quot \ - ${_quotaon} \ rarpd \ - ${_repquota} \ - ${_rip6query} \ rmt \ - ${_rndc} \ - ${_rndc-confgen} \ - ${_route6d} \ rpcbind \ rpc.lockd \ rpc.statd \ rpc.umntall \ - ${_rpc.yppasswdd} \ - ${_rpc.ypupdated} \ - ${_rpc.ypxfrd} \ - ${_rrenumd} \ - ${_rtadvd} \ rtprio \ - ${_rtsold} \ - ${_rwhod} \ - ${_sa} \ - ${_sade} \ - ${_sendmail} \ service \ services_mkdb \ setfib \ setfmac \ setpmac \ - ${_sicontrol} \ smbmsg \ snapinfo \ - ${_spkrtest} \ spray \ - ${_sysinstall} \ syslogd \ tcpdchk \ tcpdmatch \ @@ -184,335 +84,216 @@ tcpdump \ timed \ traceroute \ - ${_traceroute6} \ trpt \ tzsetup \ - ${_uathload} \ ugidfw \ - ${_uhsoctl} \ - ${_usbdevs} \ - ${_usbconfig} \ - ${_vidcontrol} \ vipw \ wake \ watch \ watchdogd \ - ${_wlandebug} \ - ${_wlconfig} \ - ${_wpa} \ - ${_ypbind} \ - ${_yp_mkdb} \ - ${_yppoll} \ - ${_yppush} \ - ${_ypserv} \ - ${_ypset} \ - zic \ - ${_zzz} + zic # NB: keep these sorted by MK_* knobs .if ${MK_ACCT} != "no" -_ac= ac -_accton= accton -_sa= sa +SUBDIR+= ac +SUBDIR+= accton +SUBDIR+= sa .endif .if ${MK_AMD} != "no" -_amd= amd +SUBDIR+= amd .endif .if ${MK_AUDIT} != "no" -_audit= audit -_auditd= auditd -_auditreduce= auditreduce -_praudit= praudit +SUBDIR+= audit +SUBDIR+= auditd +SUBDIR+= auditreduce +SUBDIR+= praudit .endif .if ${MK_AUTHPF} != "no" -_authpf= authpf +SUBDIR+= authpf .endif .if ${MK_BIND_DNSSEC} != "no" && ${MK_OPENSSL} != "no" -_dnssec-dsfromkey= dnssec-dsfromkey -_dnssec-keyfromlabel= dnssec-keyfromlabel -_dnssec-keygen= dnssec-keygen -_dnssec-signzone= dnssec-signzone +SUBDIR+= dnssec-dsfromkey +SUBDIR+= dnssec-keyfromlabel +SUBDIR+= dnssec-keygen +SUBDIR+= dnssec-signzone .endif .if ${MK_BIND_NAMED} != "no" -_named= named -_named-checkconf= named-checkconf -_named-checkzone= named-checkzone -_named.reload= named.reload -_rndc= rndc -_rndc-confgen= rndc-confgen +SUBDIR+= named +SUBDIR+= named-checkconf +SUBDIR+= named-checkzone +SUBDIR+= named.reload +SUBDIR+= rndc +SUBDIR+= rndc-confgen .endif .if ${MK_BLUETOOTH} != "no" -_bluetooth= bluetooth +SUBDIR+= bluetooth .endif .if ${MK_BSNMP} != "no" -_bsnmpd= bsnmpd +SUBDIR+= bsnmpd .endif .if ${MK_CTM} != "no" -_ctm= ctm +SUBDIR+= ctm .endif .if ${MK_FLOPPY} != "no" -_fdcontrol= fdcontrol -_fdformat= fdformat -_fdread= fdread -_fdwrite= fdwrite +SUBDIR+= fdcontrol +SUBDIR+= fdformat +SUBDIR+= fdread +SUBDIR+= fdwrite .endif .if ${MK_FREEBSD_UPDATE} != "no" -_freebsd-update= freebsd-update +SUBDIR+= freebsd-update .endif .if ${MK_GSSAPI} != no -_gssd= gssd +SUBDIR+= gssd .endif .if ${MK_INET6} != "no" -_faithd= faithd -_ip6addrctl= ip6addrctl -_mld6query= mld6query -_ndp= ndp -_rip6query= rip6query -_route6d= route6d -_rrenumd= rrenumd -_rtadvd= rtadvd -_rtsold= rtsold -_traceroute6= traceroute6 +SUBDIR+= faithd +SUBDIR+= ip6addrctl +SUBDIR+= mld6query +SUBDIR+= ndp +SUBDIR+= rip6query +SUBDIR+= route6d +SUBDIR+= rrenumd +SUBDIR+= rtadvd +SUBDIR+= rtsold +SUBDIR+= traceroute6 .endif .if ${MK_IPFW} != "no" -_ipfwpcap= ipfwpcap +SUBDIR+= ipfwpcap .endif .if ${MK_IPX} != "no" -_IPXrouted= IPXrouted +SUBDIR+= IPXrouted .endif .if ${MK_JAIL} != "no" -_jail= jail -_jexec= jexec -_jls= jls +SUBDIR+= jail +SUBDIR+= jexec +SUBDIR+= jls .endif # XXX MK_SYSCONS .if ${MK_LEGACY_CONSOLE} != "no" -_kbdcontrol= kbdcontrol -_kbdmap= kbdmap -_moused= moused -_vidcontrol= vidcontrol +SUBDIR+= kbdcontrol +SUBDIR+= kbdmap +SUBDIR+= moused +SUBDIR+= vidcontrol .endif .if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no" .if ${MK_PPP} != "no" -_pppctl= pppctl +SUBDIR+= pppctl .endif .if ${MK_NS_CACHING} != "no" -_nscd= nscd +SUBDIR+= nscd .endif .endif .if ${MK_LPR} != "no" -_lpr= lpr +SUBDIR+= lpr .endif .if ${MK_NETGRAPH} != "no" -_flowctl= flowctl -_lmcconfig= lmcconfig -_ngctl= ngctl -_nghook= nghook +SUBDIR+= flowctl +SUBDIR+= lmcconfig +SUBDIR+= ngctl +SUBDIR+= nghook .endif .if ${MK_NIS} != "no" -_rpc.yppasswdd= rpc.yppasswdd -_rpc.ypupdated= rpc.ypupdated -_rpc.ypxfrd= rpc.ypxfrd -_ypbind= ypbind -_yp_mkdb= yp_mkdb -_yppoll= yppoll -_yppush= yppush -_ypserv= ypserv -_ypset= ypset +SUBDIR+= rpc.yppasswdd +SUBDIR+= rpc.ypupdated +SUBDIR+= rpc.ypxfrd +SUBDIR+= ypbind +SUBDIR+= yp_mkdb +SUBDIR+= yppoll +SUBDIR+= yppush +SUBDIR+= ypserv +SUBDIR+= ypset .endif .if ${MK_NTP} != "no" -_ntp= ntp +SUBDIR+= ntp .endif .if ${MK_OPENSSL} != "no" -_keyserv= keyserv +SUBDIR+= keyserv .endif .if ${MK_PF} != "no" -_ftp-proxy= ftp-proxy +SUBDIR+= ftp-proxy .endif .if ${MK_PKGTOOLS} != "no" -_pkg_install= pkg_install +SUBDIR+= pkg_install .endif # XXX MK_TOOLCHAIN? .if ${MK_PMC} != "no" -_pmcannotate= pmcannotate -_pmccontrol= pmccontrol -_pmcstat= pmcstat +SUBDIR+= pmcannotate +SUBDIR+= pmccontrol +SUBDIR+= pmcstat .endif .if ${MK_PORTSNAP} != "no" -_portsnap= portsnap +SUBDIR+= portsnap .endif .if ${MK_PPP} != "no" -_ppp= ppp -#_pppctl handled below +SUBDIR+= ppp .endif .if ${MK_QUOTAS} != "no" -_edquota= edquota -_quotaon= quotaon -_repquota= repquota +SUBDIR+= edquota +SUBDIR+= quotaon +SUBDIR+= repquota .endif .if ${MK_RCMDS} != "no" -_rwhod= rwhod +SUBDIR+= rwhod .endif .if ${MK_SENDMAIL} != "no" -_editmap= editmap -_mailstats= mailstats -_makemap= makemap -_praliases= praliases -_sendmail= sendmail +SUBDIR+= editmap +SUBDIR+= mailstats +SUBDIR+= makemap +SUBDIR+= praliases +SUBDIR+= sendmail .endif -.if ${MK_SYSINSTALL} != "no" -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "sparc64" -_sade= sade -.endif -.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips" -_sysinstall= sysinstall -.endif -.endif +SUBDIR+= sysinstall .if ${MK_TOOLCHAIN} != "no" -_config= config -_crunch= crunch +SUBDIR+= config +SUBDIR+= crunch .endif .if ${MK_USB} != "no" -.if ${MACHINE_ARCH} != "ia64" -_uathload= uathload -.endif -_uhsoctl= uhsoctl -#_usbdevs= usbdevs -_usbconfig= usbconfig -.endif - -.if ${MK_WIRELESS} != "no" -_ancontrol= ancontrol -_wlandebug= wlandebug -_wpa= wpa +SUBDIR+= uhsoctl +SUBDIR+= usbconfig .endif -.if ${MACHINE_ARCH} == "arm" -_kgmon= kgmon -.endif - -.if ${MACHINE_ARCH} == "i386" -.if ${MK_APM} != "no" -_apm= apm -_apmd= apmd -.endif -_asf= asf -.if ${MK_TOOLCHAIN} != "no" -_btxld= btxld -.endif -_cpucontrol= cpucontrol -_kgmon= kgmon -_kgzip= kgzip -_lptcontrol= lptcontrol -.if ${MK_NCP} != "no" -_mount_nwfs= mount_nwfs -.endif -_mount_smbfs= mount_smbfs -_mptable= mptable -.if ${MK_NDIS} != "no" -_ndiscvt= ndiscvt -.endif -_pnpinfo= pnpinfo -_sicontrol= sicontrol -_spkrtest= spkrtest -_zzz= zzz -.if ${MACHINE} == "i386" -.if ${MK_ACPI} != "no" -_acpi= acpi -.endif -_boot0cfg= boot0cfg .if ${MK_WIRELESS} != "no" -_wlconfig= wlconfig -.endif -.elif ${MACHINE} == "pc98" -_boot98cfg= boot98cfg -.endif -.endif - -# kgzip: builds, but missing support files -# mptable: broken (not 64 bit clean) -# pnpinfo: crashes (not really useful anyway) -.if ${MACHINE_ARCH} == "amd64" -.if ${MK_ACPI} != "no" -_acpi= acpi -.endif -.if ${MK_APM} != "no" -_apm= apm -.endif -_asf= asf -_boot0cfg= boot0cfg -.if ${MK_TOOLCHAIN} != "no" -_btxld= btxld -.endif -_cpucontrol= cpucontrol -_kgmon= kgmon -_lptcontrol= lptcontrol -.if ${MK_NCP} != "no" -_mount_nwfs= mount_nwfs -.endif -_mount_smbfs= mount_smbfs -_mptable= mptable -.if ${MK_NDIS} != "no" -_ndiscvt= ndiscvt -.endif -_sicontrol= sicontrol -_spkrtest= spkrtest -_zzz= zzz +SUBDIR+= ancontrol +SUBDIR+= wlandebug +SUBDIR+= wpa .endif -.if ${MACHINE_ARCH} == "ia64" -.if ${MK_ACPI} != "no" -_acpi= acpi -.endif -_kgmon= kgmon -_mount_smbfs= mount_smbfs -_zzz= zzz -.endif +.include -.if ${MACHINE_ARCH} == "powerpc" -_mount_smbfs= mount_smbfs -_nvram= nvram -_ofwdump= ofwdump -.endif - -.if ${MACHINE_ARCH} == "sparc64" -_eeprom= eeprom -_mount_smbfs= mount_smbfs -_ofwdump= ofwdump -.endif +SUBDIR:= ${SUBDIR:O} .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/Makefile.amd64 ./usr.sbin/Makefile.amd64 --- /dune/imp/svn/head/usr.sbin/Makefile.amd64 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.sbin/Makefile.amd64 2010-04-12 10:38:20.000000000 -0600 @@ -0,0 +1,33 @@ +# $FreeBSD$ + +# kgzip: builds, but missing support files +# mptable: broken (not 64 bit clean) +# pnpinfo: crashes (not really useful anyway) +.if ${MK_ACPI} != "no" +SUBDIR+= acpi +.endif +.if ${MK_APM} != "no" +SUBDIR+= apm +.endif +SUBDIR+= asf +SUBDIR+= boot0cfg +.if ${MK_TOOLCHAIN} != "no" +SUBDIR+= btxld +.endif +SUBDIR+= cpucontrol +SUBDIR+= kgmon +SUBDIR+= lptcontrol +.if ${MK_NCP} != "no" +SUBDIR+= mount_nwfs +.endif +SUBDIR+= mount_smbfs +SUBDIR+= mptable +.if ${MK_NDIS} != "no" +SUBDIR+= ndiscvt +.endif +.if ${MK_SYSINSTALL} != "no" +SUBDIR+= sade +.endif +SUBDIR+= sicontrol +SUBDIR+= spkrtest +SUBDIR+= zzz diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/Makefile.arm ./usr.sbin/Makefile.arm --- /dune/imp/svn/head/usr.sbin/Makefile.arm 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.sbin/Makefile.arm 2010-04-12 10:38:20.000000000 -0600 @@ -0,0 +1,4 @@ +# $FreeBSD$ + +SUBDIR+= kgmon +SUBDIR:= ${SUBDIR:Nsysinstall} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/Makefile.i386 ./usr.sbin/Makefile.i386 --- /dune/imp/svn/head/usr.sbin/Makefile.i386 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.sbin/Makefile.i386 2010-04-12 10:38:20.000000000 -0600 @@ -0,0 +1,42 @@ +# $FreeBSD$ + +.if ${MK_APM} != "no" +SUBDIR+= apm +SUBDIR+= apmd +.endif +SUBDIR+= asf +.if ${MK_TOOLCHAIN} != "no" +SUBDIR+= btxld +.endif +SUBDIR+= cpucontrol +SUBDIR+= kgmon +SUBDIR+= kgzip +SUBDIR+= lptcontrol +.if ${MK_NCP} != "no" +SUBDIR+= mount_nwfs +.endif +SUBDIR+= mount_smbfs +SUBDIR+= mptable +.if ${MK_NDIS} != "no" +SUBDIR+= ndiscvt +.endif +SUBDIR+= pnpinfo +.if ${MK_SYSINSTALL} != "no" +SUBDIR+= sade +.endif +SUBDIR+= sicontrol +SUBDIR+= spkrtest +SUBDIR+= zzz + +# Differentiate between FreeBSD/i386 and FreeBSD/pc98 +.if ${MACHINE} == "i386" +.if ${MK_ACPI} != "no" +SUBDIR+= acpi +.endif +SUBDIR+= boot0cfg +.if ${MK_WIRELESS} != "no" +SUBDIR+= wlconfig +.endif +.elif ${MACHINE} == "pc98" +SUBDIR+= boot98cfg +.endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/Makefile.ia64 ./usr.sbin/Makefile.ia64 --- /dune/imp/svn/head/usr.sbin/Makefile.ia64 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.sbin/Makefile.ia64 2010-04-12 10:38:20.000000000 -0600 @@ -0,0 +1,9 @@ +# $FreeBSD$ + +.if ${MK_ACPI} != "no" +SUBDIR+= acpi +.endif +SUBDIR+= kgmon +SUBDIR+= mount_smbfs +SUBDIR:= ${SUBDIR:Nuathload} +SUBDIR+= zzz diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/Makefile.mips ./usr.sbin/Makefile.mips --- /dune/imp/svn/head/usr.sbin/Makefile.mips 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.sbin/Makefile.mips 2010-04-12 10:38:20.000000000 -0600 @@ -0,0 +1,3 @@ +# $FreeBSD$ + +SUBDIR:= ${SUBDIR:Nsysinstall} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/Makefile.powerpc ./usr.sbin/Makefile.powerpc --- /dune/imp/svn/head/usr.sbin/Makefile.powerpc 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.sbin/Makefile.powerpc 2010-04-12 10:38:20.000000000 -0600 @@ -0,0 +1,5 @@ +# $FreeBSD$ + +SUBDIR+= mount_smbfs +SUBDIR+= nvram +SUBDIR+= ofwdump diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/Makefile.sparc64 ./usr.sbin/Makefile.sparc64 --- /dune/imp/svn/head/usr.sbin/Makefile.sparc64 1969-12-31 17:00:00.000000000 -0700 +++ ./usr.sbin/Makefile.sparc64 2010-04-12 10:38:20.000000000 -0600 @@ -0,0 +1,8 @@ +# $FreeBSD$ + +SUBDIR+= eeprom +SUBDIR+= mount_smbfs +SUBDIR+= ofwdump +.if ${MK_SYSINSTALL} != "no" +SUBDIR+= sade +.endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/ac/Makefile ./usr.sbin/ac/Makefile --- /dune/imp/svn/head/usr.sbin/ac/Makefile 2010-02-18 08:58:47.000000000 -0700 +++ ./usr.sbin/ac/Makefile 2010-04-12 10:38:16.000000000 -0600 @@ -4,7 +4,7 @@ MAN= ac.8 # Temporary, while tracking down problem wrt 64-bit time_t's on sparc64 -.if ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_CPUARCH} == "sparc64" CFLAGS+=-DDEBUG .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/amd/Makefile.inc ./usr.sbin/amd/Makefile.inc --- /dune/imp/svn/head/usr.sbin/amd/Makefile.inc 2010-02-18 08:58:17.000000000 -0700 +++ ./usr.sbin/amd/Makefile.inc 2010-04-12 10:37:36.000000000 -0600 @@ -27,7 +27,7 @@ CFLAGS+= -DYES_HESIOD .endif -CFLAGS+= -DHOST_CPU=\"${MACHINE_ARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" +CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" .if exists(${.OBJDIR}/../libamu) LIBAMUDIR= ${.OBJDIR}/../libamu diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/apm/Makefile ./usr.sbin/apm/Makefile --- /dune/imp/svn/head/usr.sbin/apm/Makefile 2010-02-18 08:58:35.000000000 -0700 +++ ./usr.sbin/apm/Makefile 2010-04-12 10:37:57.000000000 -0600 @@ -3,6 +3,6 @@ PROG= apm MAN= apm.8 MLINKS= apm.8 apmconf.8 -MANSUBDIR= /${MACHINE_ARCH} +MANSUBDIR= /${MACHINE_CPUARCH} .include diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/crunch/crunchide/Makefile ./usr.sbin/crunch/crunchide/Makefile --- /dune/imp/svn/head/usr.sbin/crunch/crunchide/Makefile 2010-02-18 08:58:21.000000000 -0700 +++ ./usr.sbin/crunch/crunchide/Makefile 2010-04-12 10:37:40.000000000 -0600 @@ -3,6 +3,14 @@ PROG= crunchide SRCS= crunchide.c +# These assignments duplicate much of the functionality of +# 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/} +.else +TARGET_CPUARCH=${MACHINE_CPUARCH} +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == i386 && ${MACHINE_ARCH} == i386 @@ -10,8 +18,8 @@ SRCS+= exec_aout.c .endif -.if ${TARGET_ARCH} == ia64 || \ - ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH} == amd64 +.if ${TARGET_CPUARCH} == ia64 || \ + ${TARGET_CPUARCH} == sparc64 || ${TARGET_CPUARCH} == amd64 CFLAGS+=-DNLIST_ELF64 SRCS+= exec_elf64.c exec_elf64.o: exec_elf32.c diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/kldxref/Makefile ./usr.sbin/kldxref/Makefile --- /dune/imp/svn/head/usr.sbin/kldxref/Makefile 2010-02-18 08:58:46.000000000 -0700 +++ ./usr.sbin/kldxref/Makefile 2010-04-12 10:38:12.000000000 -0600 @@ -7,8 +7,8 @@ WARNS?= 2 CFLAGS+=-fno-strict-aliasing -.if exists(ef_${MACHINE_ARCH}.c) -SRCS+= ef_${MACHINE_ARCH}.c +.if exists(ef_${MACHINE_CPUARCH}.c) +SRCS+= ef_${MACHINE_CPUARCH}.c .else SRCS+= ef_nop.c .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/mtree/spec2.c ./usr.sbin/mtree/spec2.c --- /dune/imp/svn/head/usr.sbin/mtree/spec2.c 2010-04-01 18:49:57.000000000 -0600 +++ ./usr.sbin/mtree/spec2.c 1969-12-31 17:00:00.000000000 -0700 @@ -1,646 +0,0 @@ -/*- - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if 0 -#ifndef lint -static char sccsid[] = "@(#)spec.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ -#endif -#include -__FBSDID("$FreeBSD: head/usr.sbin/mtree/spec.c 187940 2009-01-31 05:17:28Z kientzle $"); - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "mtree.h" -#include "extern.h" - -int lineno; /* Current spec line number. */ - -static void addchild(NODE *, NODE *); -static void replacenode(NODE *, NODE *); -static void set(char *, NODE *); -static void unset(char *, NODE *); -static int nodecmp(const NODE *, const NODE *); - -#define REPLACEPTR(x,v) do { if ((x)) free((x)); (x) = (v); } while (0) - -#define mtree_Sflag 0 /* kludge */ - -static u_int -nodetoino(u_int type) -{ - - switch (type) { - case F_BLOCK: - return S_IFBLK; - case F_CHAR: - return S_IFCHR; - case F_DIR: - return S_IFDIR; - case F_FIFO: - return S_IFIFO; - case F_FILE: - return S_IFREG; - case F_LINK: - return S_IFLNK; -#ifdef S_IFSOCK - case F_SOCK: - return S_IFSOCK; -#endif - default: - printf("unknown type %d", type); - abort(); - } - /* NOTREACHED */ -} - -static const char * -nodetype(u_int type) -{ - - return (inotype(nodetoino(type))); -} - -static void -mtree_err(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vwarnx(fmt, ap); - va_end(ap); -#if 0 - if (mtree_lineno) - warnx("failed at line %lu of the specification", - (u_long) mtree_lineno); -#endif - exit(1); - /* NOTREACHED */ -} - -static void -replacenode(NODE *cur, NODE *new) -{ - -#define REPLACE(x) cur->x = new->x -#define REPLACESTR(x) REPLACEPTR(cur->x,new->x) - - if (cur->type != new->type) { -#if 0 - if (mtree_Mflag) { - /* - * merge entries with different types; we - * don't want children retained in this case. - */ - REPLACE(type); - free_nodes(cur->child); - cur->child = NULL; - } else { -#endif - mtree_err( - "existing entry for `%s', type `%s'" - " does not match type `%s'", - cur->name, nodetype(cur->type), - nodetype(new->type)); -#if 0 - } -#endif - } - - REPLACE(st_size); - REPLACE(st_mtimespec); - REPLACESTR(slink); - if (cur->slink != NULL) { - if ((cur->slink = strdup(new->slink)) == NULL) - mtree_err("memory allocation error"); - if (strunvis(cur->slink, new->slink) == -1) - mtree_err("strunvis failed on `%s'", new->slink); - free(new->slink); - } - REPLACE(st_uid); - REPLACE(st_gid); - REPLACE(st_mode); -// REPLACE(st_rdev); - REPLACE(st_flags); - REPLACE(st_nlink); - REPLACE(cksum); - REPLACESTR(md5digest); - REPLACESTR(rmd160digest); - REPLACESTR(sha1digest); - REPLACESTR(sha256digest); - REPLACESTR(sha384digest); - REPLACESTR(sha512digest); - REPLACESTR(tags); -// REPLACE(lineno); - REPLACE(flags); - free(new); -} - -/* - * addchild -- - * Add the centry node as a child of the pathparent node. If - * centry is a duplicate, call replacenode(). If centry is not - * a duplicate, insert it into the linked list referenced by - * pathparent->child. Keep the list sorted if Sflag is set. - */ -static void -addchild(NODE *pathparent, NODE *centry) -{ - NODE *samename; /* node with the same name as centry */ - NODE *replacepos; /* if non-NULL, centry should replace this node */ - NODE *insertpos; /* if non-NULL, centry should be inserted - * after this node */ - NODE *cur; /* for stepping through the list */ - NODE *last; /* the last node in the list */ - int cmp; - - samename = NULL; - replacepos = NULL; - insertpos = NULL; - last = NULL; - cur = pathparent->child; - if (cur == NULL) { - /* centry is pathparent's first and only child node so far */ - pathparent->child = centry; - return; - } - - /* - * pathparent already has at least one other child, so add the - * centry node to the list. - * - * We first scan through the list looking for an existing node - * with the same name (setting samename), and also looking - * for the correct position to replace or insert the new node - * (setting replacepos and/or insertpos). - */ - for (; cur != NULL; last = cur, cur = cur->next) { - if (strcmp(centry->name, cur->name) == 0) { - samename = cur; - } - if (mtree_Sflag) { - cmp = nodecmp(centry, cur); - if (cmp == 0) { - replacepos = cur; - } else if (cmp > 0) { - insertpos = cur; - } - } - } - if (! mtree_Sflag) { - if (samename != NULL) { - /* replace node with same name */ - replacepos = samename; - } else { - /* add new node at end of list */ - insertpos = last; - } - } - - if (samename != NULL) { - /* - * We found a node with the same name above. Call - * replacenode(), which will either exit with an error, - * or replace the information in the samename node and - * free the information in the centry node. - */ - replacenode(samename, centry); - if (samename == replacepos) { - /* The just-replaced node was in the correct position */ - return; - } - if (samename == insertpos || samename->prev == insertpos) { - /* - * We thought the new node should be just before - * or just after the replaced node, but that would - * be equivalent to just retaining the replaced node. - */ - return; - } - - /* - * The just-replaced node is in the wrong position in - * the list. This can happen if sort order depends on - * criteria other than the node name. - * - * Make centry point to the just-replaced node. Unlink - * the just-replaced node from the list, and allow it to - * be insterted in the correct position later. - */ - centry = samename; - if (centry->prev) - centry->prev->next = centry->next; - else { - /* centry->next is the new head of the list */ - pathparent->child = centry->next; - assert(centry->next != NULL); - } - if (centry->next) - centry->next->prev = centry->prev; - centry->prev = NULL; - centry->next = NULL; - } - - if (insertpos == NULL) { - /* insert centry at the beginning of the list */ - pathparent->child->prev = centry; - centry->next = pathparent->child; - centry->prev = NULL; - pathparent->child = centry; - } else { - /* insert centry into the list just after insertpos */ - centry->next = insertpos->next; - insertpos->next = centry; - centry->prev = insertpos; - if (centry->next) - centry->next->prev = centry; - } - return; -} - -NODE * -mtree_readspec(FILE *fi) -{ - NODE *centry, *last, *pathparent, *cur; - char *p, *e, *next; - NODE ginfo, *root; - int c_cur, c_next; - char buf[2048], *tname; - size_t tnamelen; - - centry = last = root = NULL; - tname = NULL; - tnamelen = 0; - bzero(&ginfo, sizeof(ginfo)); - c_cur = c_next = 0; - for (lineno = 1; fgets(buf, sizeof(buf), fi); - ++lineno, c_cur = c_next, c_next = 0) { - /* Skip empty lines. */ - if (buf[0] == '\n') - continue; - - /* Find end of line. */ - if ((p = index(buf, '\n')) == NULL) - errx(1, "line %d too long", lineno); - - /* See if next line is continuation line. */ - if (p[-1] == '\\') { - --p; - c_next = 1; - } - - /* Null-terminate the line. */ - *p = '\0'; - - /* Skip leading whitespace. */ - for (p = buf; *p && isspace(*p); ++p); - - /* If nothing but whitespace or comment char, continue. */ - if (!*p || *p == '#') - continue; - -#ifdef DEBUG - (void)fprintf(stderr, "line %d: {%s}\n", lineno, p); -#endif - if (c_cur) { - set(p, centry); - continue; - } - -#if 1 - /* Grab file name, "$", "set", or "unset". */ - next = buf; - while ((p = strsep(&next, " \t")) != NULL && *p == '\0') - continue; - if (p == NULL) - mtree_err("missing field"); -#else - /* Grab file name, "$", "set", or "unset". */ - if ((p = strtok(p, "\n\t ")) == NULL) - errx(1, "line %d: missing field", lineno); -#endif - - if (p[0] == '/') { - if (strcmp(p + 1, "set") == 0) - set(next, &ginfo); - else if (strcmp(p + 1, "unset") == 0) - unset(next, &ginfo); - else - mtree_err("invalid specification `%s'", p); - continue; - } - - if (strcmp(p, "..") == 0) { - /* Don't go up, if haven't gone down. */ - if (!root) - goto noparent; - if (last->type != F_DIR || last->flags & F_DONE) { - if (last == root) - goto noparent; - last = last->parent; - } - last->flags |= F_DONE; - continue; - -noparent: errx(1, "line %d: no parent node", lineno); - } - - /* XXX investigate the NetBSD strvis extentions */ - - pathparent = NULL; - printf("p is %s\n", p); - if (strchr(p, '/') != NULL) { - cur = root; - for (; (e = strchr(p, '/')) != NULL; p = e+1) { - if (p == e) - continue; /* handle // */ - *e = '\0'; - printf("p is now %s\n", p); - if (strcmp(p, ".") != 0) { - while (cur && - strcmp(cur->name, p) != 0) { - cur = cur->next; - } - } - if (cur == NULL || cur->type != F_DIR) { - mtree_err("%s: %s %s %s", tname, - "missing directory in specification", cur ? "ok" : "null", cur ? nodetype(cur->type) : "nope"); - } - *e = '/'; - pathparent = cur; - cur = cur->child; - } - if (*p == '\0') - mtree_err("%s: empty leaf element", tname); - } - - if ((centry = calloc(1, sizeof(NODE) + strlen(p))) == NULL) - errx(1, "calloc"); - *centry = ginfo; -#define MAGIC "?*[" - if (strpbrk(p, MAGIC)) - centry->flags |= F_MAGIC; - if (strunvis(centry->name, p) == -1) - errx(1, "filename %s is ill-encoded", p); - set(NULL, centry); - - if (root == NULL) { - /* - * empty tree - */ - if (strcmp(centry->name, ".") != 0 || - centry->type != F_DIR) - mtree_err( - "root node must be the directory `.' %s %s", centry->name, nodetype(centry->type)); - last = root = centry; - root->parent = root; - } else if (pathparent != NULL) { - /* - * full path entry; add or replace - */ - centry->parent = pathparent; - addchild(pathparent, centry); - last = centry; - } else if (strcmp(centry->name, ".") == 0) { - /* - * duplicate "." entry; always replace - */ - replacenode(root, centry); - } else if (last->type == F_DIR && !(last->flags & F_DONE)) { - /* - * new relative child in current dir; - * add or replace - */ - centry->parent = last; - addchild(last, centry); - last = centry; - } else { - /* - * new relative child in parent dir - * (after encountering ".." entry); - * add or replace - */ - centry->parent = last->parent; - addchild(last->parent, centry); - last = centry; - } - } - return (root); -} - -static void -set(char *t, NODE *ip) -{ - int type; - char *kw, *val = NULL; - struct group *gr; - struct passwd *pw; - mode_t *m; - int value; - char *ep; - - for (; (kw = strtok(t, "= \t\n")); t = NULL) { - ip->flags |= type = parsekey(kw, &value); - if (value && (val = strtok(NULL, " \t\n")) == NULL) - errx(1, "line %d: missing value", lineno); - switch(type) { - case F_CKSUM: - ip->cksum = strtoul(val, &ep, 10); - if (*ep) - errx(1, "line %d: invalid checksum %s", - lineno, val); - break; - case F_MD5: - ip->md5digest = strdup(val); - if(!ip->md5digest) - errx(1, "strdup"); - break; - case F_SHA1: - ip->sha1digest = strdup(val); - if(!ip->sha1digest) - errx(1, "strdup"); - break; - case F_SHA256: - ip->sha256digest = strdup(val); - if(!ip->sha256digest) - errx(1, "strdup"); - break; - case F_RMD160: - ip->rmd160digest = strdup(val); - if(!ip->rmd160digest) - errx(1, "strdup"); - break; - case F_FLAGS: - if (strcmp("none", val) == 0) - ip->st_flags = 0; - else if (strtofflags(&val, &ip->st_flags, NULL) != 0) - errx(1, "line %d: invalid flag %s",lineno, val); - break; - case F_GID: - ip->st_gid = strtoul(val, &ep, 10); - if (*ep) - errx(1, "line %d: invalid gid %s", lineno, val); - break; - case F_GNAME: - if ((gr = getgrnam(val)) == NULL) - errx(1, "line %d: unknown group %s", lineno, val); - ip->st_gid = gr->gr_gid; - break; - case F_IGN: - /* just set flag bit */ - break; - case F_MODE: - if ((m = setmode(val)) == NULL) - errx(1, "line %d: invalid file mode %s", - lineno, val); - ip->st_mode = getmode(m, 0); - free(m); - break; - case F_NLINK: - ip->st_nlink = strtoul(val, &ep, 10); - if (*ep) - errx(1, "line %d: invalid link count %s", - lineno, val); - break; - case F_OPT: - /* just set flag bit */ - break; - case F_SIZE: - ip->st_size = strtoq(val, &ep, 10); - if (*ep) - errx(1, "line %d: invalid size %s", - lineno, val); - break; - case F_SLINK: - ip->slink = malloc(strlen(val) + 1); - if (ip->slink == NULL) - errx(1, "malloc"); - if (strunvis(ip->slink, val) == -1) - errx(1, "symlink %s is ill-encoded", val); - break; - case F_TIME: - ip->st_mtimespec.tv_sec = strtoul(val, &ep, 10); - if (*ep == '.') { - /* Note: we require exactly nine - * digits after the decimal point. */ - val = ep + 1; - ip->st_mtimespec.tv_nsec - = strtoul(val, &ep, 10); - } else - ip->st_mtimespec.tv_nsec = 0; - if (*ep) - errx(1, "line %d: invalid time %s", - lineno, val); - break; - case F_TYPE: - switch(*val) { - case 'b': - if (!strcmp(val, "block")) - ip->type = F_BLOCK; - break; - case 'c': - if (!strcmp(val, "char")) - ip->type = F_CHAR; - break; - case 'd': - if (!strcmp(val, "dir")) - ip->type = F_DIR; - break; - case 'f': - if (!strcmp(val, "file")) - ip->type = F_FILE; - if (!strcmp(val, "fifo")) - ip->type = F_FIFO; - break; - case 'l': - if (!strcmp(val, "link")) - ip->type = F_LINK; - break; - case 's': - if (!strcmp(val, "socket")) - ip->type = F_SOCK; - break; - default: - errx(1, "line %d: unknown file type %s", - lineno, val); - } - break; - case F_UID: - ip->st_uid = strtoul(val, &ep, 10); - if (*ep) - errx(1, "line %d: invalid uid %s", lineno, val); - break; - case F_UNAME: - if ((pw = getpwnam(val)) == NULL) - errx(1, "line %d: unknown user %s", lineno, val); - ip->st_uid = pw->pw_uid; - break; - } - } -} - -static void -unset(char *t, NODE *ip) -{ - char *p; - - while ((p = strtok(t, "\n\t "))) - ip->flags &= ~parsekey(p, NULL); -} -/* - * nodecmp -- - * used as a comparison function by addchild() to control the order - * in which entries appear within a list of sibling nodes. We make - * directories sort after non-directories, but otherwise sort in - * strcmp() order. - * - * Keep this in sync with dcmp() in create.c. - */ -static int -nodecmp(const NODE *a, const NODE *b) -{ - - if ((a->type & F_DIR) != 0) { - if ((b->type & F_DIR) == 0) - return 1; - } else if ((b->type & F_DIR) != 0) - return -1; - return strcmp(a->name, b->name); -} diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/sade/Makefile ./usr.sbin/sade/Makefile --- /dune/imp/svn/head/usr.sbin/sade/Makefile 2010-02-18 08:58:35.000000000 -0700 +++ ./usr.sbin/sade/Makefile 2010-04-12 10:37:57.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/usr.sbin/sade/Makefile 178737 2008-05-03 02:42:57Z delphij $ +# $FreeBSD: user/imp/tbemd/usr.sbin/sade/Makefile 203446 2010-02-03 21:29:06Z imp $ -.if ${MACHINE_ARCH} != "ia64" +.if ${MACHINE_CPUARCH} != "ia64" _wizard= wizard.c .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/sysinstall/Makefile ./usr.sbin/sysinstall/Makefile --- /dune/imp/svn/head/usr.sbin/sysinstall/Makefile 2010-02-18 08:58:40.000000000 -0700 +++ ./usr.sbin/sysinstall/Makefile 2010-04-12 10:38:03.000000000 -0600 @@ -1,6 +1,6 @@ -# $FreeBSD: head/usr.sbin/sysinstall/Makefile 201390 2010-01-02 11:07:44Z ed $ +# $FreeBSD: user/imp/tbemd/usr.sbin/sysinstall/Makefile 203446 2010-02-03 21:29:06Z imp $ -.if ${MACHINE_ARCH} != "ia64" +.if ${MACHINE_CPUARCH} != "ia64" _wizard= wizard.c .endif diff -N -x .svn -I FreeBSD: -ur /dune/imp/svn/head/usr.sbin/tcpdump/tcpdump/Makefile ./usr.sbin/tcpdump/tcpdump/Makefile --- /dune/imp/svn/head/usr.sbin/tcpdump/tcpdump/Makefile 2010-02-18 08:58:23.000000000 -0700 +++ ./usr.sbin/tcpdump/tcpdump/Makefile 2010-04-12 10:37:43.000000000 -0600 @@ -46,7 +46,7 @@ print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c CFLAGS+= -DINET6 .endif -.if ${MACHINE_ARCH} != "i386" +.if ${MACHINE_CPUARCH} != "i386" CFLAGS+= -DLBL_ALIGN .endif