svn commit: r218746 - in projects/binutils-2.17: . bin/ed bin/sh
bin/test cddl/lib/libzpool contrib/top crypto/openssl/ssl
games/fortune/datfiles gnu/usr.bin/groff/tmac lib/libc/gen
lib/libdevinfo ...
Dimitry Andric
dim at FreeBSD.org
Wed Feb 16 19:30:32 UTC 2011
Author: dim
Date: Wed Feb 16 19:30:29 2011
New Revision: 218746
URL: http://svn.freebsd.org/changeset/base/218746
Log:
Sync: merge r218496 through r218745 from ^/head.
Added:
projects/binutils-2.17/share/examples/kld/khelp/
- copied from r218745, head/share/examples/kld/khelp/
projects/binutils-2.17/share/man/man4/mos.4
- copied unchanged from r218745, head/share/man/man4/mos.4
projects/binutils-2.17/sys/boot/pc98/pc98boot/
- copied from r218745, head/sys/boot/pc98/pc98boot/
projects/binutils-2.17/sys/compat/linux/linux_fork.c
- copied unchanged from r218745, head/sys/compat/linux/linux_fork.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/aslbtypes.c
- copied unchanged from r218745, head/sys/contrib/dev/acpica/compiler/aslbtypes.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/aslwalks.c
- copied unchanged from r218745, head/sys/contrib/dev/acpica/compiler/aslwalks.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/dtexpress.c
- copied unchanged from r218745, head/sys/contrib/dev/acpica/compiler/dtexpress.c
projects/binutils-2.17/sys/contrib/dev/acpica/debugger/dbmethod.c
- copied unchanged from r218745, head/sys/contrib/dev/acpica/debugger/dbmethod.c
projects/binutils-2.17/sys/contrib/dev/acpica/debugger/dbnames.c
- copied unchanged from r218745, head/sys/contrib/dev/acpica/debugger/dbnames.c
projects/binutils-2.17/sys/contrib/dev/acpica/dispatcher/dsargs.c
- copied unchanged from r218745, head/sys/contrib/dev/acpica/dispatcher/dsargs.c
projects/binutils-2.17/sys/contrib/dev/acpica/dispatcher/dscontrol.c
- copied unchanged from r218745, head/sys/contrib/dev/acpica/dispatcher/dscontrol.c
projects/binutils-2.17/sys/contrib/dev/acpica/dispatcher/dswload2.c
- copied unchanged from r218745, head/sys/contrib/dev/acpica/dispatcher/dswload2.c
projects/binutils-2.17/sys/contrib/dev/acpica/utilities/utdecode.c
- copied unchanged from r218745, head/sys/contrib/dev/acpica/utilities/utdecode.c
projects/binutils-2.17/sys/dev/usb/net/if_mos.c
- copied unchanged from r218745, head/sys/dev/usb/net/if_mos.c
projects/binutils-2.17/sys/dev/usb/net/if_mosreg.h
- copied unchanged from r218745, head/sys/dev/usb/net/if_mosreg.h
projects/binutils-2.17/sys/modules/usb/mos/
- copied from r218745, head/sys/modules/usb/mos/
projects/binutils-2.17/tools/regression/bin/sh/expansion/arith11.0
- copied unchanged from r218745, head/tools/regression/bin/sh/expansion/arith11.0
Modified:
projects/binutils-2.17/Makefile
projects/binutils-2.17/Makefile.inc1
projects/binutils-2.17/bin/ed/ed.1
projects/binutils-2.17/bin/sh/arith_yacc.c
projects/binutils-2.17/bin/sh/shell.h
projects/binutils-2.17/bin/test/test.c
projects/binutils-2.17/cddl/lib/libzpool/Makefile
projects/binutils-2.17/crypto/openssl/ssl/t1_lib.c
projects/binutils-2.17/games/fortune/datfiles/fortunes
projects/binutils-2.17/games/fortune/datfiles/fortunes-o.real
projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local
projects/binutils-2.17/lib/libc/gen/glob.3
projects/binutils-2.17/lib/libc/gen/sysconf.3
projects/binutils-2.17/lib/libdevinfo/devinfo.h
projects/binutils-2.17/lib/libdevinfo/devinfo_var.h
projects/binutils-2.17/lib/liblzma/Makefile
projects/binutils-2.17/lib/libmd/Makefile
projects/binutils-2.17/lib/libufs/libufs.h
projects/binutils-2.17/lib/libz/Makefile
projects/binutils-2.17/lib/msun/src/e_asin.c
projects/binutils-2.17/lib/msun/src/e_expf.c
projects/binutils-2.17/lib/msun/src/s_atan.c
projects/binutils-2.17/lib/msun/src/s_cos.c
projects/binutils-2.17/lib/msun/src/s_nexttoward.c
projects/binutils-2.17/lib/msun/src/s_nexttowardf.c
projects/binutils-2.17/lib/msun/src/s_sin.c
projects/binutils-2.17/lib/msun/src/s_tan.c
projects/binutils-2.17/release/doc/en_US.ISO8859-1/relnotes/article.sgml
projects/binutils-2.17/sbin/fsck_ffs/fsck.h
projects/binutils-2.17/sbin/fsck_ffs/setup.c
projects/binutils-2.17/sbin/fsck_ffs/suj.c
projects/binutils-2.17/sbin/mdconfig/mdconfig.c
projects/binutils-2.17/sbin/mksnap_ffs/mksnap_ffs.8
projects/binutils-2.17/sbin/newfs/newfs.8
projects/binutils-2.17/sbin/newfs/newfs.c
projects/binutils-2.17/sbin/tunefs/tunefs.c
projects/binutils-2.17/secure/lib/libcrypto/Makefile
projects/binutils-2.17/share/examples/kld/Makefile
projects/binutils-2.17/share/examples/pf/pf.conf
projects/binutils-2.17/share/man/man4/ath_hal.4
projects/binutils-2.17/share/man/man4/bwn.4
projects/binutils-2.17/share/man/man7/build.7
projects/binutils-2.17/share/man/man7/ports.7
projects/binutils-2.17/share/man/man9/rman.9
projects/binutils-2.17/share/misc/committers-ports.dot
projects/binutils-2.17/share/mk/bsd.own.mk
projects/binutils-2.17/sys/amd64/amd64/machdep.c
projects/binutils-2.17/sys/amd64/amd64/trap.c
projects/binutils-2.17/sys/amd64/include/reg.h
projects/binutils-2.17/sys/amd64/linux32/linux.h
projects/binutils-2.17/sys/amd64/linux32/linux32_machdep.c
projects/binutils-2.17/sys/amd64/linux32/linux32_proto.h
projects/binutils-2.17/sys/amd64/linux32/linux32_syscall.h
projects/binutils-2.17/sys/amd64/linux32/linux32_sysent.c
projects/binutils-2.17/sys/amd64/linux32/linux32_sysvec.c
projects/binutils-2.17/sys/amd64/linux32/syscalls.master
projects/binutils-2.17/sys/arm/at91/at91_machdep.c
projects/binutils-2.17/sys/arm/econa/econa_machdep.c
projects/binutils-2.17/sys/arm/sa11x0/assabet_machdep.c
projects/binutils-2.17/sys/arm/xscale/i80321/ep80219_machdep.c
projects/binutils-2.17/sys/arm/xscale/i80321/iq31244_machdep.c
projects/binutils-2.17/sys/arm/xscale/ixp425/avila_machdep.c
projects/binutils-2.17/sys/boot/common/ufsread.c
projects/binutils-2.17/sys/boot/i386/boot2/boot2.c
projects/binutils-2.17/sys/boot/pc98/Makefile
projects/binutils-2.17/sys/boot/pc98/boot2/boot2.c
projects/binutils-2.17/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
projects/binutils-2.17/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/binutils-2.17/sys/compat/linux/linux_emul.c
projects/binutils-2.17/sys/compat/linux/linux_emul.h
projects/binutils-2.17/sys/compat/linux/linux_futex.c
projects/binutils-2.17/sys/compat/linux/linux_misc.c
projects/binutils-2.17/sys/compat/linux/linux_signal.c
projects/binutils-2.17/sys/compat/linux/linux_signal.h
projects/binutils-2.17/sys/compat/linux/linux_stats.c
projects/binutils-2.17/sys/conf/NOTES
projects/binutils-2.17/sys/conf/files
projects/binutils-2.17/sys/conf/files.amd64
projects/binutils-2.17/sys/conf/files.i386
projects/binutils-2.17/sys/conf/files.pc98
projects/binutils-2.17/sys/conf/kern.pre.mk
projects/binutils-2.17/sys/conf/options
projects/binutils-2.17/sys/contrib/dev/acpica/changes.txt
projects/binutils-2.17/sys/contrib/dev/acpica/common/dmtable.c
projects/binutils-2.17/sys/contrib/dev/acpica/common/dmtbdump.c
projects/binutils-2.17/sys/contrib/dev/acpica/common/dmtbinfo.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/aslanalyze.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/aslcompile.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/aslcompiler.h
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/aslcompiler.l
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/aslcompiler.y
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/aslmessages.h
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/aslpredef.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/asltree.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/dtcompile.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/dtcompiler.h
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/dtfield.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/dtio.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/dttable.c
projects/binutils-2.17/sys/contrib/dev/acpica/compiler/dtutils.c
projects/binutils-2.17/sys/contrib/dev/acpica/debugger/dbcmds.c
projects/binutils-2.17/sys/contrib/dev/acpica/debugger/dbdisply.c
projects/binutils-2.17/sys/contrib/dev/acpica/debugger/dbinput.c
projects/binutils-2.17/sys/contrib/dev/acpica/dispatcher/dsopcode.c
projects/binutils-2.17/sys/contrib/dev/acpica/dispatcher/dswload.c
projects/binutils-2.17/sys/contrib/dev/acpica/events/evgpe.c
projects/binutils-2.17/sys/contrib/dev/acpica/events/evregion.c
projects/binutils-2.17/sys/contrib/dev/acpica/events/evxfregn.c
projects/binutils-2.17/sys/contrib/dev/acpica/executer/exfldio.c
projects/binutils-2.17/sys/contrib/dev/acpica/include/acdebug.h
projects/binutils-2.17/sys/contrib/dev/acpica/include/acdisasm.h
projects/binutils-2.17/sys/contrib/dev/acpica/include/acdispat.h
projects/binutils-2.17/sys/contrib/dev/acpica/include/acglobal.h
projects/binutils-2.17/sys/contrib/dev/acpica/include/aclocal.h
projects/binutils-2.17/sys/contrib/dev/acpica/include/acoutput.h
projects/binutils-2.17/sys/contrib/dev/acpica/include/acpixf.h
projects/binutils-2.17/sys/contrib/dev/acpica/include/actbl.h
projects/binutils-2.17/sys/contrib/dev/acpica/tables/tbfadt.c
projects/binutils-2.17/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h
projects/binutils-2.17/sys/contrib/dev/acpica/utilities/utglobal.c
projects/binutils-2.17/sys/dev/acpica/Osd/OsdTable.c
projects/binutils-2.17/sys/dev/acpica/acpi_resource.c
projects/binutils-2.17/sys/dev/ahci/ahci.c
projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
projects/binutils-2.17/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
projects/binutils-2.17/sys/dev/ath/if_ath.c
projects/binutils-2.17/sys/dev/ath/if_ath_tx.c
projects/binutils-2.17/sys/dev/ath/if_ath_tx_ht.c
projects/binutils-2.17/sys/dev/ath/if_ath_tx_ht.h
projects/binutils-2.17/sys/dev/ath/if_athioctl.h
projects/binutils-2.17/sys/dev/bce/if_bce.c
projects/binutils-2.17/sys/dev/bce/if_bcefw.h
projects/binutils-2.17/sys/dev/bce/if_bcereg.h
projects/binutils-2.17/sys/dev/e1000/e1000_80003es2lan.c
projects/binutils-2.17/sys/dev/e1000/e1000_80003es2lan.h
projects/binutils-2.17/sys/dev/e1000/e1000_82540.c
projects/binutils-2.17/sys/dev/e1000/e1000_82541.c
projects/binutils-2.17/sys/dev/e1000/e1000_82542.c
projects/binutils-2.17/sys/dev/e1000/e1000_82543.c
projects/binutils-2.17/sys/dev/e1000/e1000_82571.c
projects/binutils-2.17/sys/dev/e1000/e1000_82575.c
projects/binutils-2.17/sys/dev/e1000/e1000_82575.h
projects/binutils-2.17/sys/dev/e1000/e1000_api.c
projects/binutils-2.17/sys/dev/e1000/e1000_api.h
projects/binutils-2.17/sys/dev/e1000/e1000_defines.h
projects/binutils-2.17/sys/dev/e1000/e1000_hw.h
projects/binutils-2.17/sys/dev/e1000/e1000_ich8lan.c
projects/binutils-2.17/sys/dev/e1000/e1000_ich8lan.h
projects/binutils-2.17/sys/dev/e1000/e1000_mac.c
projects/binutils-2.17/sys/dev/e1000/e1000_mac.h
projects/binutils-2.17/sys/dev/e1000/e1000_manage.c
projects/binutils-2.17/sys/dev/e1000/e1000_manage.h
projects/binutils-2.17/sys/dev/e1000/e1000_mbx.c
projects/binutils-2.17/sys/dev/e1000/e1000_nvm.c
projects/binutils-2.17/sys/dev/e1000/e1000_nvm.h
projects/binutils-2.17/sys/dev/e1000/e1000_osdep.c
projects/binutils-2.17/sys/dev/e1000/e1000_phy.c
projects/binutils-2.17/sys/dev/e1000/e1000_phy.h
projects/binutils-2.17/sys/dev/e1000/e1000_regs.h
projects/binutils-2.17/sys/dev/e1000/e1000_vf.c
projects/binutils-2.17/sys/dev/e1000/e1000_vf.h
projects/binutils-2.17/sys/dev/e1000/if_igb.c
projects/binutils-2.17/sys/dev/e1000/if_igb.h
projects/binutils-2.17/sys/dev/fb/splash.c
projects/binutils-2.17/sys/dev/fxp/if_fxp.c
projects/binutils-2.17/sys/dev/isp/isp.c
projects/binutils-2.17/sys/dev/isp/isp_freebsd.c
projects/binutils-2.17/sys/dev/isp/isp_freebsd.h
projects/binutils-2.17/sys/dev/isp/isp_library.c
projects/binutils-2.17/sys/dev/isp/isp_pci.c
projects/binutils-2.17/sys/dev/isp/isp_sbus.c
projects/binutils-2.17/sys/dev/isp/ispvar.h
projects/binutils-2.17/sys/dev/pci/pci.c
projects/binutils-2.17/sys/dev/usb/usbdevs
projects/binutils-2.17/sys/dev/usb/wlan/if_run.c
projects/binutils-2.17/sys/dev/usb/wlan/if_runreg.h
projects/binutils-2.17/sys/dev/usb/wlan/if_runvar.h
projects/binutils-2.17/sys/fs/tmpfs/tmpfs.h
projects/binutils-2.17/sys/fs/tmpfs/tmpfs_subr.c
projects/binutils-2.17/sys/geom/eli/g_eli.c
projects/binutils-2.17/sys/geom/part/g_part_pc98.c
projects/binutils-2.17/sys/geom/sched/gs_rr.c
projects/binutils-2.17/sys/i386/i386/machdep.c
projects/binutils-2.17/sys/i386/i386/trap.c
projects/binutils-2.17/sys/i386/include/reg.h
projects/binutils-2.17/sys/i386/linux/linux.h
projects/binutils-2.17/sys/i386/linux/linux_machdep.c
projects/binutils-2.17/sys/i386/linux/linux_proto.h
projects/binutils-2.17/sys/i386/linux/linux_syscall.h
projects/binutils-2.17/sys/i386/linux/linux_sysent.c
projects/binutils-2.17/sys/i386/linux/linux_sysvec.c
projects/binutils-2.17/sys/i386/linux/syscalls.master
projects/binutils-2.17/sys/kern/subr_smp.c
projects/binutils-2.17/sys/kern/subr_trap.c
projects/binutils-2.17/sys/kern/uipc_socket.c
projects/binutils-2.17/sys/kern/vfs_bio.c
projects/binutils-2.17/sys/mips/cavium/if_octm.c
projects/binutils-2.17/sys/mips/cavium/octe/ethernet-common.c
projects/binutils-2.17/sys/mips/cavium/octeon_mp.c
projects/binutils-2.17/sys/mips/include/hwfunc.h
projects/binutils-2.17/sys/mips/mips/mp_machdep.c
projects/binutils-2.17/sys/mips/rmi/xlr_machdep.c
projects/binutils-2.17/sys/mips/sibyte/sb_scd.c
projects/binutils-2.17/sys/modules/acpi/acpi/Makefile
projects/binutils-2.17/sys/modules/linux/Makefile
projects/binutils-2.17/sys/modules/usb/Makefile
projects/binutils-2.17/sys/net/if.c
projects/binutils-2.17/sys/net/netisr.c
projects/binutils-2.17/sys/net/rtsock.c
projects/binutils-2.17/sys/net/vnet.h
projects/binutils-2.17/sys/netinet/ipfw/ip_dummynet.c
projects/binutils-2.17/sys/netinet/sctp_asconf.c
projects/binutils-2.17/sys/netinet/sctp_input.c
projects/binutils-2.17/sys/netinet/sctp_ss_functions.c
projects/binutils-2.17/sys/sys/mutex.h
projects/binutils-2.17/sys/sys/proc.h
projects/binutils-2.17/sys/ufs/ffs/ffs_softdep.c
projects/binutils-2.17/sys/ufs/ffs/fs.h
projects/binutils-2.17/sys/ufs/ufs/ufs_vnops.c
projects/binutils-2.17/sys/vm/vm_kern.c
projects/binutils-2.17/sys/vm/vm_meter.c
projects/binutils-2.17/sys/vm/vm_object.c
projects/binutils-2.17/sys/vm/vm_page.c
projects/binutils-2.17/tools/tools/ath/ath_ee_v14_print/ath_ee_v14_print.c
projects/binutils-2.17/tools/tools/nanobsd/FlashDevice.sub
projects/binutils-2.17/usr.bin/stat/stat.c
projects/binutils-2.17/usr.bin/truss/setup.c
projects/binutils-2.17/usr.sbin/acpi/acpidb/Makefile
projects/binutils-2.17/usr.sbin/acpi/iasl/Makefile
projects/binutils-2.17/usr.sbin/config/configvers.h
projects/binutils-2.17/usr.sbin/config/mkmakefile.c
Directory Properties:
projects/binutils-2.17/ (props changed)
projects/binutils-2.17/cddl/contrib/opensolaris/ (props changed)
projects/binutils-2.17/contrib/bind9/ (props changed)
projects/binutils-2.17/contrib/binutils/ (props changed)
projects/binutils-2.17/contrib/bzip2/ (props changed)
projects/binutils-2.17/contrib/dialog/ (props changed)
projects/binutils-2.17/contrib/ee/ (props changed)
projects/binutils-2.17/contrib/expat/ (props changed)
projects/binutils-2.17/contrib/file/ (props changed)
projects/binutils-2.17/contrib/gdb/ (props changed)
projects/binutils-2.17/contrib/gdtoa/ (props changed)
projects/binutils-2.17/contrib/gnu-sort/ (props changed)
projects/binutils-2.17/contrib/groff/ (props changed)
projects/binutils-2.17/contrib/less/ (props changed)
projects/binutils-2.17/contrib/libpcap/ (props changed)
projects/binutils-2.17/contrib/llvm/ (props changed)
projects/binutils-2.17/contrib/llvm/tools/clang/ (props changed)
projects/binutils-2.17/contrib/ncurses/ (props changed)
projects/binutils-2.17/contrib/netcat/ (props changed)
projects/binutils-2.17/contrib/ntp/ (props changed)
projects/binutils-2.17/contrib/one-true-awk/ (props changed)
projects/binutils-2.17/contrib/openbsm/ (props changed)
projects/binutils-2.17/contrib/openpam/ (props changed)
projects/binutils-2.17/contrib/pf/ (props changed)
projects/binutils-2.17/contrib/sendmail/ (props changed)
projects/binutils-2.17/contrib/tcpdump/ (props changed)
projects/binutils-2.17/contrib/tcsh/ (props changed)
projects/binutils-2.17/contrib/top/ (props changed)
projects/binutils-2.17/contrib/top/install-sh (props changed)
projects/binutils-2.17/contrib/tzcode/stdtime/ (props changed)
projects/binutils-2.17/contrib/tzcode/zic/ (props changed)
projects/binutils-2.17/contrib/tzdata/ (props changed)
projects/binutils-2.17/contrib/wpa/ (props changed)
projects/binutils-2.17/contrib/xz/ (props changed)
projects/binutils-2.17/crypto/openssh/ (props changed)
projects/binutils-2.17/crypto/openssl/ (props changed)
projects/binutils-2.17/lib/libc/ (props changed)
projects/binutils-2.17/lib/libc/stdtime/ (props changed)
projects/binutils-2.17/lib/libutil/ (props changed)
projects/binutils-2.17/lib/libz/ (props changed)
projects/binutils-2.17/sbin/ (props changed)
projects/binutils-2.17/sbin/ipfw/ (props changed)
projects/binutils-2.17/share/mk/bsd.arch.inc.mk (props changed)
projects/binutils-2.17/share/zoneinfo/ (props changed)
projects/binutils-2.17/sys/ (props changed)
projects/binutils-2.17/sys/amd64/include/xen/ (props changed)
projects/binutils-2.17/sys/cddl/contrib/opensolaris/ (props changed)
projects/binutils-2.17/sys/contrib/dev/acpica/ (props changed)
projects/binutils-2.17/sys/contrib/octeon-sdk/ (props changed)
projects/binutils-2.17/sys/contrib/pf/ (props changed)
projects/binutils-2.17/sys/contrib/x86emu/ (props changed)
projects/binutils-2.17/usr.bin/calendar/ (props changed)
projects/binutils-2.17/usr.bin/csup/ (props changed)
projects/binutils-2.17/usr.bin/procstat/ (props changed)
projects/binutils-2.17/usr.sbin/zic/ (props changed)
Modified: projects/binutils-2.17/Makefile
==============================================================================
--- projects/binutils-2.17/Makefile Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/Makefile Wed Feb 16 19:30:29 2011 (r218746)
@@ -30,6 +30,7 @@
# delete-old-libs - Delete obsolete libraries.
# targets - Print a list of supported TARGET/TARGET_ARCH pairs
# for world and kernel targets.
+# toolchains - Build a toolchain for all world and kernel targets.
#
# This makefile is simple by design. The FreeBSD make automatically reads
# the /usr/share/mk/sys.mk unless the -m argument is specified on the
@@ -307,8 +308,10 @@ make: .PHONY
${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
tinderbox:
- @cd ${.CURDIR} && \
- DOING_TINDERBOX=YES ${MAKE} JFLAG=${JFLAG} universe
+ @cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
+
+toolchains:
+ @cd ${.CURDIR} && ${MAKE} UNIVERSE_TARGET=toolchain universe
#
# universe
@@ -328,6 +331,12 @@ TARGET_ARCHES_sun4v?= sparc64
TARGET_ARCHES_${target}?= ${target}
.endfor
+.if defined(UNIVERSE_TARGET)
+MAKE_JUST_WORLDS= YES
+.else
+UNIVERSE_TARGET?= buildworld
+.endif
+
targets:
@echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets"
.for target in ${TARGETS}
@@ -361,16 +370,16 @@ universe_${target}_prologue:
.for target_arch in ${TARGET_ARCHES_${target}}
universe_${target}: universe_${target}_${target_arch}
universe_${target}_${target_arch}: universe_${target}_prologue
- @echo ">> ${target}.${target_arch} buildworld started on `LC_ALL=C date`"
+ @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
- ${MAKE} ${JFLAG} buildworld \
+ ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
TARGET=${target} \
TARGET_ARCH=${target_arch} \
- > _.${target}.${target_arch}.buildworld 2>&1 || \
- (echo "${target}.${target_arch} world failed," \
- "check _.${target}.${target_arch}.buildworld for details" | \
+ > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \
+ (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \
+ "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \
${MAKEFAIL}))
- @echo ">> ${target}.${target_arch} buildworld completed on `LC_ALL=C date`"
+ @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`"
.endfor
.endif
.if !defined(MAKE_JUST_WORLDS)
Modified: projects/binutils-2.17/Makefile.inc1
==============================================================================
--- projects/binutils-2.17/Makefile.inc1 Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/Makefile.inc1 Wed Feb 16 19:30:29 2011 (r218746)
@@ -28,6 +28,17 @@
# /usr/share/mk. These include:
# obj depend all install clean cleandepend cleanobj
+# You are supposed to define both of these when calling Makefile.inc1
+# directly. However, some old scripts don't. Cope for the moment, but
+# issue a new warning for a transition period.
+.if defined(TARGET) && !defined(TARGET_ARCH)
+.warning "You must pass both TARGET and TARGET_ARCH to Makefile.inc1. Setting TARGET_ARCH=${TARGET}."
+TARGET_ARCH=${TARGET}
+.endif
+.if !defined(TARGET) || !defined(TARGET_ARCH)
+.error "Both TARGET and TARGET_ARCH must be defined."
+.endif
+
.include <bsd.own.mk>
.include <bsd.arch.inc.mk>
@@ -1378,19 +1389,63 @@ check-old: check-old-files check-old-lib
showconfig:
@${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort
+.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
+DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
+
+.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
+.if exists(${KERNCONFDIR}/${KERNCONF})
+FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
+ ${KERNCONFDIR}/${KERNCONF}
+.endif
+.endif
+
+.endif
+
+.if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
+DTBOUTPUTPATH= ${.CURDIR}
+.endif
+
+#
+# Build 'standalone' Device Tree Blob
+#
+builddtb:
+ @if [ "${FDT_DTS_FILE}" = "" ]; then \
+ echo "ERROR: FDT_DTS_FILE must be specified!"; \
+ exit 1; \
+ fi; \
+ if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE} ]; then \
+ echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
+ exist!"; \
+ exit 1; \
+ fi; \
+ if [ "${DTBOUTPUTPATH}" = "${.CURDIR}" ]; then \
+ echo "WARNING: DTB will be placed in the current working \
+ directory"; \
+ fi
+ @PATH=${TMPPATH} \
+ dtc -O dtb -o \
+ ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
+ -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}
###############
.if defined(XDEV) && defined(XDEV_ARCH)
+.if ${XDEV} == ${MACHINE} && ${XDEV_ARCH} == ${MACHINE_ARCH}
+XDEV_CPUTYPE?=${CPUTYPE}
+.else
+XDEV_CPUTYPE?=${TARGET_CPUTYPE}
+.endif
+
NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \
- -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS
+ -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
+ TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
+ CPUTYPE=${XDEV_CPUTYPE}
-XDDIR=${XDEV}-freebsd
+XDDIR=${XDEV_ARCH}-freebsd
XDTP=/usr/${XDDIR}
-CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
- TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH}
+CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR}
CDENV= ${CDBENV} \
_SHLIBDIRPREFIX=${XDTP} \
TOOLS_PREFIX=${XDTP}
@@ -1412,7 +1467,7 @@ xdev: xdev-build xdev-install
xdev-build: _xb-build-tools _xb-cross-tools
_xb-build-tools:
- ${_+_}cd ${.CURDIR}; \
+ ${_+_}@cd ${.CURDIR}; \
${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
_xb-cross-tools:
@@ -1466,41 +1521,3 @@ _xi-links:
../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
done
.endif
-
-.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
-DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
-
-.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
-.if exists(${KERNCONFDIR}/${KERNCONF})
-FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
- ${KERNCONFDIR}/${KERNCONF}
-.endif
-.endif
-
-.endif
-
-.if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
-DTBOUTPUTPATH= ${.CURDIR}
-.endif
-
-#
-# Build 'standalone' Device Tree Blob
-#
-builddtb:
- @if [ "${FDT_DTS_FILE}" = "" ]; then \
- echo "ERROR: FDT_DTS_FILE must be specified!"; \
- exit 1; \
- fi; \
- if [ ! -f ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE} ]; then \
- echo "ERROR: Specified DTS file (${FDT_DTS_FILE}) does not \
- exist!"; \
- exit 1; \
- fi; \
- if [ "${DTBOUTPUTPATH}" = "${.CURDIR}" ]; then \
- echo "WARNING: DTB will be placed in the current working \
- directory"; \
- fi
- @PATH=${TMPPATH} \
- dtc -O dtb -o \
- ${DTBOUTPUTPATH}/`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 \
- -p 1024 ${.CURDIR}/sys/boot/fdt/dts/${FDT_DTS_FILE}
Modified: projects/binutils-2.17/bin/ed/ed.1
==============================================================================
--- projects/binutils-2.17/bin/ed/ed.1 Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/bin/ed/ed.1 Wed Feb 16 19:30:29 2011 (r218746)
@@ -231,7 +231,7 @@ The current line (address) in the buffer
The last line in the buffer.
.It n
The
-.Em n Ns th,
+.Em n Ns th
line in the buffer
where
.Em n
@@ -649,7 +649,7 @@ The mark is not cleared until the line i
deleted or otherwise modified.
.It (.,.)l
Print the addressed lines unambiguously.
-If a single line fills for than one screen (as might be the case
+If a single line fills more than one screen (as might be the case
when viewing a binary file, for instance), a
.Dq Li --More--
prompt is printed on the last line.
Modified: projects/binutils-2.17/bin/sh/arith_yacc.c
==============================================================================
--- projects/binutils-2.17/bin/sh/arith_yacc.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/bin/sh/arith_yacc.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -125,6 +125,8 @@ static arith_t do_binop(int op, arith_t
case ARITH_DIV:
if (!b)
yyerror("division by zero");
+ if (a == ARITH_MIN && b == -1)
+ yyerror("divide error");
return op == ARITH_REM ? a % b : a / b;
case ARITH_MUL:
return a * b;
Modified: projects/binutils-2.17/bin/sh/shell.h
==============================================================================
--- projects/binutils-2.17/bin/sh/shell.h Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/bin/sh/shell.h Wed Feb 16 19:30:29 2011 (r218746)
@@ -59,6 +59,8 @@ typedef intmax_t arith_t;
#define ARITH_FORMAT_STR "%" PRIdMAX
#define atoarith_t(arg) strtoimax(arg, NULL, 0)
#define strtoarith_t(nptr, endptr, base) strtoimax(nptr, endptr, base)
+#define ARITH_MIN INTMAX_MIN
+#define ARITH_MAX INTMAX_MAX
typedef void *pointer;
#define MKINIT /* empty */
Modified: projects/binutils-2.17/bin/test/test.c
==============================================================================
--- projects/binutils-2.17/bin/test/test.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/bin/test/test.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -9,6 +9,10 @@
*
* This program is in the Public Domain.
*/
+/*
+ * Important: This file is used both as a standalone program /bin/test and
+ * as a builtin for /bin/sh (#define SHELL).
+ */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
Modified: projects/binutils-2.17/cddl/lib/libzpool/Makefile
==============================================================================
--- projects/binutils-2.17/cddl/lib/libzpool/Makefile Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/cddl/lib/libzpool/Makefile Wed Feb 16 19:30:29 2011 (r218746)
@@ -14,6 +14,9 @@
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc64"
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= opensolaris_atomic.S
+.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64"
+ACFLAGS+= -Wa,--noexecstack
+.endif
.else
.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern
ATOMIC_SRCS= opensolaris_atomic.c
Modified: projects/binutils-2.17/crypto/openssl/ssl/t1_lib.c
==============================================================================
--- projects/binutils-2.17/crypto/openssl/ssl/t1_lib.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/crypto/openssl/ssl/t1_lib.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -521,6 +521,7 @@ int ssl_parse_clienthello_tlsext(SSL *s,
}
n2s(data, idsize);
dsize -= 2 + idsize;
+ size -= 2 + idsize;
if (dsize < 0)
{
*al = SSL_AD_DECODE_ERROR;
@@ -559,9 +560,14 @@ int ssl_parse_clienthello_tlsext(SSL *s,
}
/* Read in request_extensions */
+ if (size < 2)
+ {
+ *al = SSL_AD_DECODE_ERROR;
+ return 0;
+ }
n2s(data,dsize);
size -= 2;
- if (dsize > size)
+ if (dsize != size)
{
*al = SSL_AD_DECODE_ERROR;
return 0;
Modified: projects/binutils-2.17/games/fortune/datfiles/fortunes
==============================================================================
--- projects/binutils-2.17/games/fortune/datfiles/fortunes Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/games/fortune/datfiles/fortunes Wed Feb 16 19:30:29 2011 (r218746)
@@ -38136,10 +38136,6 @@ couldn't compete successfully with poets
-- Kilgore Trout (Philip J. Farmer) "Venus on the Half
Shell"
%
-PLATONIC FRIENDSHIP:
- What develops when two people get
- tired of making love to each other.
-%
Play Rogue, visit exotic locations, meet strange creatures and kill
them.
%
Modified: projects/binutils-2.17/games/fortune/datfiles/fortunes-o.real
==============================================================================
--- projects/binutils-2.17/games/fortune/datfiles/fortunes-o.real Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/games/fortune/datfiles/fortunes-o.real Wed Feb 16 19:30:29 2011 (r218746)
@@ -10487,6 +10487,10 @@ Pile driver, n.:
Planned Parenthood:
The emission Control Center.
%
+PLATONIC FRIENDSHIP:
+ What develops when two people get
+ tired of making love to each other.
+%
Playing poker with busty Ms. Ware,
He announced as he folded with flair,
"I had four of a kind,
Modified: projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local Wed Feb 16 19:30:29 2011 (r218746)
@@ -74,6 +74,7 @@
.ds doc-default-operating-system FreeBSD\~9.0
.
.\" FreeBSD releases not found in doc-common
+.ds doc-operating-system-FreeBSD-7.4 7.4
.ds doc-operating-system-FreeBSD-8.2 8.2
.ds doc-operating-system-FreeBSD-9.0 9.0
.
Modified: projects/binutils-2.17/lib/libc/gen/glob.3
==============================================================================
--- projects/binutils-2.17/lib/libc/gen/glob.3 Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/libc/gen/glob.3 Wed Feb 16 19:30:29 2011 (r218746)
@@ -30,7 +30,7 @@
.\" @(#)glob.3 8.3 (Berkeley) 4/16/94
.\" $FreeBSD$
.\"
-.Dd September 1, 2004
+.Dd February 15, 2011
.Dt GLOB 3
.Os
.Sh NAME
@@ -417,7 +417,7 @@ execvp("ls", g.gl_pathv);
.Sh SEE ALSO
.Xr sh 1 ,
.Xr fnmatch 3 ,
-.Xr regexp 3
+.Xr regex 3
.Sh STANDARDS
The current implementation of the
.Fn glob
Modified: projects/binutils-2.17/lib/libc/gen/sysconf.3
==============================================================================
--- projects/binutils-2.17/lib/libc/gen/sysconf.3 Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/libc/gen/sysconf.3 Wed Feb 16 19:30:29 2011 (r218746)
@@ -28,7 +28,7 @@
.\" @(#)sysconf.3 8.3 (Berkeley) 4/19/94
.\" $FreeBSD$
.\"
-.Dd December 14, 2006
+.Dd February 13, 2011
.Dt SYSCONF 3
.Os
.Sh NAME
@@ -85,6 +85,9 @@ The number of processors currently onlin
The maximum number of open files per user id.
.It Li _SC_PAGESIZE
The size of a system page in bytes.
+.It Li _SC_PAGE_SIZE
+Equivalent to
+.Li _SC_PAGESIZE .
.It Li _SC_STREAM_MAX
The minimum maximum number of streams that a process may have open
at any one time.
@@ -160,10 +163,64 @@ otherwise \-1.
.It Li _SC_2_UPE
Return 1 if the system supports the User Portability Utilities Option,
otherwise \-1.
+.It Li _SC_AIO_LISTIO_MAX
+Maximum number of I/O operations in a single list I/O call supported.
+.It Li _SC_AIO_MAX
+Maximum number of outstanding asynchronous I/O operations supported.
+.It Li _SC_AIO_PRIO_DELTA_MAX
+The maximum amount by which a process can decrease its asynchronous I/O
+priority level from its own scheduling priority.
+.It Li _SC_DELAYTIMER_MAX
+Maximum number of timer expiration overruns.
+.It Li _SC_MQ_OPEN_MAX
+The maximum number of open message queue descriptors a process may hold.
+.It Li _SC_RTSIG_MAX
+Maximum number of realtime signals reserved for application use.
+.It Li _SC_SEM_NSEMS_MAX
+Maximum number of semaphores that a process may have.
+.It Li _SC_SEM_VALUE_MAX
+The maximum value a semaphore may have.
+.It Li _SC_SIGQUEUE_MAX
+Maximum number of queued signals that a process may send and have pending at
+the receiver(s) at any time.
+.It Li _SC_TIMER_MAX
+Maximum number of timers per process supported.
+.It Li _SC_GETGR_R_SIZE_MAX
+Suggested initial value for the size of the group entry buffer.
+.It Li _SC_GETPW_R_SIZE_MAX
+Suggested initial value for the size of the password entry buffer.
+.It Li _SC_HOST_NAME_MAX
+Maximum length of a host name (not including the terminating null) as
+returned from the
+.Fn gethostname
+function.
+.It Li _SC_LOGIN_NAME_MAX
+Maximum length of a login name.
+.It Li _SC_THREAD_STACK_MIN
+Minimum size in bytes of thread stack storage.
+.It Li _SC_THREAD_THREADS_MAX
+Maximum number of threads that can be created per process.
+.It Li _SC_TTY_NAME_MAX
+Maximum length of terminal device name.
+.It Li _SC_SYMLOOP_MAX
+Maximum number of symbolic links that can be reliably traversed in the
+resolution of a pathname in the absence of a loop.
+.It Li _SC_ATEXIT_MAX
+Maximum number of functions that may be registered with
+.Fn atexit .
+.It Li _SC_XOPEN_VERSION
+An integer value greater than or equal to 4,
+indicating the version of the X/Open Portability Guide to which this
+system conforms.
+.It Li _SC_XOPEN_XCU_VERSION
+An integer value indicating the version of the XCU Specification to which
+this system conforms.
.El
.Pp
These values also exist, but may not be standard:
.Bl -tag -width 6n
+.It Li _SC_CPUSET_SIZE
+Size of the kernel cpuset.
.It Li _SC_PHYS_PAGES
The number of pages of physical memory.
Note that it is possible that the product of this value and the value of
Modified: projects/binutils-2.17/lib/libdevinfo/devinfo.h
==============================================================================
--- projects/binutils-2.17/lib/libdevinfo/devinfo.h Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/libdevinfo/devinfo.h Wed Feb 16 19:30:29 2011 (r218746)
@@ -31,7 +31,7 @@
#define _DEVINFO_H_INCLUDED
#include <sys/cdefs.h>
-#include <sys/_types.h>
+#include <sys/types.h>
#include <sys/bus.h>
typedef __uintptr_t devinfo_handle_t;
Modified: projects/binutils-2.17/lib/libdevinfo/devinfo_var.h
==============================================================================
--- projects/binutils-2.17/lib/libdevinfo/devinfo_var.h Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/libdevinfo/devinfo_var.h Wed Feb 16 19:30:29 2011 (r218746)
@@ -27,6 +27,7 @@
* $FreeBSD$
*/
+#include <sys/types.h>
#include <sys/rman.h>
#include <sys/bus.h>
Modified: projects/binutils-2.17/lib/liblzma/Makefile
==============================================================================
--- projects/binutils-2.17/lib/liblzma/Makefile Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/liblzma/Makefile Wed Feb 16 19:30:29 2011 (r218746)
@@ -78,6 +78,7 @@ SRCS+= check.c \
.if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386"
SRCS+= crc32_x86.S \
crc64_x86.S
+ACFLAGS+= -Wa,--noexecstack
.else
SRCS+= crc32_fast.c \
crc64_fast.c
Modified: projects/binutils-2.17/lib/libmd/Makefile
==============================================================================
--- projects/binutils-2.17/lib/libmd/Makefile Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/libmd/Makefile Wed Feb 16 19:30:29 2011 (r218746)
@@ -43,11 +43,14 @@ CFLAGS+= -I${.CURDIR}
.if exists(${MACHINE_ARCH}/sha.S)
SRCS+= sha.S
-CFLAGS+= -DSHA1_ASM -DELF
+CFLAGS+= -DSHA1_ASM
.endif
.if exists(${MACHINE_ARCH}/rmd160.S)
SRCS+= rmd160.S
-CFLAGS+= -DRMD160_ASM -DELF
+CFLAGS+= -DRMD160_ASM
+.endif
+.if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S)
+ACFLAGS+= -DELF -Wa,--noexecstack
.endif
md2hl.c: mdXhl.c
Modified: projects/binutils-2.17/lib/libufs/libufs.h
==============================================================================
--- projects/binutils-2.17/lib/libufs/libufs.h Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/libufs/libufs.h Wed Feb 16 19:30:29 2011 (r218746)
@@ -31,34 +31,6 @@
#define __LIBUFS_H__
/*
- * libufs macros (internal, non-exported).
- */
-#ifdef _LIBUFS
-#ifdef _LIBUFS_DEBUGGING
-/*
- * Trace steps through libufs, to be used at entry and erroneous return.
- */
-#define ERROR(uufsd, str) \
-do { \
- fprintf(stderr, "libufs in %s", __func__); \
- if (str != NULL) \
- fprintf(stderr, ": %s", str); \
- if (errno) \
- fprintf(stderr, ": %s", strerror(errno)); \
- fprintf(stderr, "\n"); \
- if ((uufsd) != NULL) \
- (uufsd)->d_error = str; \
-} while (0)
-#else /* _LIBUFS_DEBUGGING */
-#define ERROR(uufsd, str) \
-do { \
- if ((uufsd) != NULL) \
- (uufsd)->d_error = str; \
-} while (0)
-#endif /* _LIBUFS_DEBUGGING */
-#endif /* _LIBUFS */
-
-/*
* libufs structures.
*/
@@ -94,6 +66,30 @@ struct uufsd {
#define d_cg d_cgunion.d_cg
};
+/*
+ * libufs macros (internal, non-exported).
+ */
+#ifdef _LIBUFS
+/*
+ * Trace steps through libufs, to be used at entry and erroneous return.
+ */
+static inline void
+ERROR(struct uufsd *u, const char *str)
+{
+
+#ifdef _LIBUFS_DEBUGGING
+ if (str != NULL) {
+ fprintf(stderr, "libufs: %s", str);
+ if (errno != 0)
+ fprintf(stderr, ": %s", strerror(errno));
+ fprintf(stderr, "\n");
+ }
+#endif
+ if (u != NULL)
+ u->d_error = str;
+}
+#endif /* _LIBUFS */
+
__BEGIN_DECLS
/*
Modified: projects/binutils-2.17/lib/libz/Makefile
==============================================================================
--- projects/binutils-2.17/lib/libz/Makefile Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/libz/Makefile Wed Feb 16 19:30:29 2011 (r218746)
@@ -39,12 +39,14 @@ SRCS+= zutil.c
.PATH: ${.CURDIR}/contrib/asm686
SRCS+= match.S
CFLAGS+= -DASMV -DNO_UNDERLINE
+ACFLAGS+= -Wa,--noexecstack
.endif
.if ${MACHINE_ARCH} == "amd64"
.PATH: ${.CURDIR}/contrib/gcc_gvmat64
SRCS+= gvmat64.S
CFLAGS+= -DASMV -DNO_UNDERLINE
+ACFLAGS+= -Wa,--noexecstack
.endif
VERSION_DEF= ${.CURDIR}/Versions.def
Modified: projects/binutils-2.17/lib/msun/src/e_asin.c
==============================================================================
--- projects/binutils-2.17/lib/msun/src/e_asin.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/msun/src/e_asin.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -82,7 +82,7 @@ __ieee754_asin(double x)
return x*pio2_hi+x*pio2_lo;
return (x-x)/(x-x); /* asin(|x|>1) is NaN */
} else if (ix<0x3fe00000) { /* |x|<0.5 */
- if(ix<0x3e400000) { /* if |x| < 2**-27 */
+ if(ix<0x3e500000) { /* if |x| < 2**-26 */
if(huge+x>one) return x;/* return x with inexact if x!=0*/
}
t = x*x;
Modified: projects/binutils-2.17/lib/msun/src/e_expf.c
==============================================================================
--- projects/binutils-2.17/lib/msun/src/e_expf.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/msun/src/e_expf.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -72,7 +72,7 @@ __ieee754_expf(float x) /* default IEEE
}
x = hi - lo;
}
- else if(hx < 0x31800000) { /* when |x|<2**-28 */
+ else if(hx < 0x39000000) { /* when |x|<2**-14 */
if(huge+x>one) return one+x;/* trigger inexact */
}
else k = 0;
Modified: projects/binutils-2.17/lib/msun/src/s_atan.c
==============================================================================
--- projects/binutils-2.17/lib/msun/src/s_atan.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/msun/src/s_atan.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -87,7 +87,7 @@ atan(double x)
if(hx>0) return atanhi[3]+*(volatile double *)&atanlo[3];
else return -atanhi[3]-*(volatile double *)&atanlo[3];
} if (ix < 0x3fdc0000) { /* |x| < 0.4375 */
- if (ix < 0x3e200000) { /* |x| < 2^-29 */
+ if (ix < 0x3e400000) { /* |x| < 2^-27 */
if(huge+x>one) return x; /* raise inexact */
}
id = -1;
Modified: projects/binutils-2.17/lib/msun/src/s_cos.c
==============================================================================
--- projects/binutils-2.17/lib/msun/src/s_cos.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/msun/src/s_cos.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -63,7 +63,7 @@ cos(double x)
/* |x| ~< pi/4 */
ix &= 0x7fffffff;
if(ix <= 0x3fe921fb) {
- if(ix<0x3e400000) /* if x < 2**-27 */
+ if(ix<0x3e46a09e) /* if x < 2**-27 * sqrt(2) */
if(((int)x)==0) return 1.0; /* generate inexact */
return __kernel_cos(x,z);
}
Modified: projects/binutils-2.17/lib/msun/src/s_nexttoward.c
==============================================================================
--- projects/binutils-2.17/lib/msun/src/s_nexttoward.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/msun/src/s_nexttoward.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -63,8 +63,8 @@ nexttoward(double x, long double y)
if(ix<0x00100000) { /* underflow */
t = x*x;
if(t!=x) { /* raise underflow flag */
- INSERT_WORDS(y,hx,lx);
- return y;
+ INSERT_WORDS(x,hx,lx);
+ return x;
}
}
INSERT_WORDS(x,hx,lx);
Modified: projects/binutils-2.17/lib/msun/src/s_nexttowardf.c
==============================================================================
--- projects/binutils-2.17/lib/msun/src/s_nexttowardf.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/msun/src/s_nexttowardf.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -50,8 +50,8 @@ nexttowardf(float x, long double y)
if(ix<0x00800000) { /* underflow */
t = x*x;
if(t!=x) { /* raise underflow flag */
- SET_FLOAT_WORD(y,hx);
- return y;
+ SET_FLOAT_WORD(x,hx);
+ return x;
}
}
SET_FLOAT_WORD(x,hx);
Modified: projects/binutils-2.17/lib/msun/src/s_sin.c
==============================================================================
--- projects/binutils-2.17/lib/msun/src/s_sin.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/msun/src/s_sin.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -63,7 +63,7 @@ sin(double x)
/* |x| ~< pi/4 */
ix &= 0x7fffffff;
if(ix <= 0x3fe921fb) {
- if(ix<0x3e400000) /* |x| < 2**-27 */
+ if(ix<0x3e500000) /* |x| < 2**-26 */
{if((int)x==0) return x;} /* generate inexact */
return __kernel_sin(x,z,0);
}
Modified: projects/binutils-2.17/lib/msun/src/s_tan.c
==============================================================================
--- projects/binutils-2.17/lib/msun/src/s_tan.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/lib/msun/src/s_tan.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -62,7 +62,7 @@ tan(double x)
/* |x| ~< pi/4 */
ix &= 0x7fffffff;
if(ix <= 0x3fe921fb) {
- if(ix<0x3e300000) /* x < 2**-28 */
+ if(ix<0x3e400000) /* x < 2**-27 */
if((int)x==0) return x; /* generate inexact */
return __kernel_tan(x,z,1);
}
Modified: projects/binutils-2.17/release/doc/en_US.ISO8859-1/relnotes/article.sgml
==============================================================================
--- projects/binutils-2.17/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed Feb 16 19:30:29 2011 (r218746)
@@ -496,9 +496,8 @@
<para><application>WPA Supplicant</application> has been
updated from 0.5.8 to 0.5.10.</para>
- <para role="merged">A snapshot of <application>xz</application> as of
- 12 April 2010 has been added. More information can be found in the
- &man.xz.1;, &man.xzdec.1; and &man.lzmainfo.1; manual pages.</para>
+ <para role="merged"><application>xz</application> has been updated
+ from snapshot as of 12 April 2010 to 5.0.0.</para>
</sect2>
Modified: projects/binutils-2.17/sbin/fsck_ffs/fsck.h
==============================================================================
--- projects/binutils-2.17/sbin/fsck_ffs/fsck.h Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/sbin/fsck_ffs/fsck.h Wed Feb 16 19:30:29 2011 (r218746)
@@ -268,6 +268,7 @@ char snapname[BUFSIZ]; /* when doing sna
char *cdevname; /* name of device being checked */
long dev_bsize; /* computed value of DEV_BSIZE */
long secsize; /* actual disk sector size */
+long real_dev_bsize;
char nflag; /* assume a no response */
char yflag; /* assume a yes response */
int bkgrdflag; /* use a snapshot to run on an active system */
Modified: projects/binutils-2.17/sbin/fsck_ffs/setup.c
==============================================================================
--- projects/binutils-2.17/sbin/fsck_ffs/setup.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/sbin/fsck_ffs/setup.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -446,7 +446,7 @@ sblock_init(void)
if (sblk.b_un.b_buf == NULL || asblk.b_un.b_buf == NULL)
errx(EEXIT, "cannot allocate space for superblock");
if ((lp = getdisklabel(NULL, fsreadfd)))
- dev_bsize = secsize = lp->d_secsize;
+ real_dev_bsize = dev_bsize = secsize = lp->d_secsize;
else
dev_bsize = secsize = DEV_BSIZE;
}
Modified: projects/binutils-2.17/sbin/fsck_ffs/suj.c
==============================================================================
--- projects/binutils-2.17/sbin/fsck_ffs/suj.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/sbin/fsck_ffs/suj.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -28,6 +28,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/mount.h>
#include <sys/stat.h>
@@ -201,6 +202,11 @@ opendisk(const char *devnam)
disk->d_error);
}
fs = &disk->d_fs;
+ if (real_dev_bsize == 0 && ioctl(disk->d_fd, DIOCGSECTORSIZE,
+ &real_dev_bsize) == -1)
+ real_dev_bsize = secsize;
+ if (debug)
+ printf("dev_bsize %ld\n", real_dev_bsize);
}
/*
@@ -2262,7 +2268,7 @@ suj_build(void)
rec = (union jrec *)seg->ss_blk;
for (i = 0; i < seg->ss_rec.jsr_cnt; off += JREC_SIZE, rec++) {
/* skip the segrec. */
- if ((off % DEV_BSIZE) == 0)
+ if ((off % real_dev_bsize) == 0)
continue;
switch (rec->rec_jrefrec.jr_op) {
case JOP_ADDREF:
@@ -2340,7 +2346,7 @@ suj_prune(void)
TAILQ_FOREACH_SAFE(seg, &allsegs, ss_next, segn) {
if (!discard && newseq++ == seg->ss_rec.jsr_seq) {
jrecs += seg->ss_rec.jsr_cnt;
- jbytes += seg->ss_rec.jsr_blocks * DEV_BSIZE;
+ jbytes += seg->ss_rec.jsr_blocks * real_dev_bsize;
continue;
}
discard = 1;
@@ -2440,7 +2446,7 @@ jblocks_next(struct jblocks *jblocks, in
int freecnt;
int blocks;
- blocks = bytes / DEV_BSIZE;
+ blocks = bytes / disk->d_bsize;
jext = &jblocks->jb_extent[jblocks->jb_head];
freecnt = jext->je_blocks - jblocks->jb_off;
if (freecnt == 0) {
@@ -2452,7 +2458,7 @@ jblocks_next(struct jblocks *jblocks, in
}
if (freecnt > blocks)
freecnt = blocks;
- *actual = freecnt * DEV_BSIZE;
+ *actual = freecnt * disk->d_bsize;
daddr = jext->je_daddr + jblocks->jb_off;
return (daddr);
@@ -2466,7 +2472,7 @@ static void
jblocks_advance(struct jblocks *jblocks, int bytes)
{
- jblocks->jb_off += bytes / DEV_BSIZE;
+ jblocks->jb_off += bytes / disk->d_bsize;
}
static void
@@ -2563,7 +2569,7 @@ restart:
}
for (rec = (void *)block; size; size -= recsize,
rec = (struct jsegrec *)((uintptr_t)rec + recsize)) {
- recsize = DEV_BSIZE;
+ recsize = real_dev_bsize;
if (rec->jsr_time != fs->fs_mtime) {
if (debug)
printf("Rec time %jd != fs mtime %jd\n",
@@ -2579,7 +2585,7 @@ restart:
continue;
}
blocks = rec->jsr_blocks;
- recsize = blocks * DEV_BSIZE;
+ recsize = blocks * real_dev_bsize;
if (recsize > size) {
/*
* We may just have run out of buffer, restart
@@ -2592,7 +2598,7 @@ restart:
if (debug)
printf("Found invalid segsize %d > %d\n",
recsize, size);
- recsize = DEV_BSIZE;
+ recsize = real_dev_bsize;
jblocks_advance(suj_jblocks, recsize);
continue;
}
@@ -2600,15 +2606,15 @@ restart:
* Verify that all blocks in the segment are present.
*/
for (i = 1; i < blocks; i++) {
- recn = (void *)
- ((uintptr_t)rec) + i * DEV_BSIZE;
+ recn = (void *)((uintptr_t)rec) + i *
+ real_dev_bsize;
if (recn->jsr_seq == rec->jsr_seq &&
recn->jsr_time == rec->jsr_time)
continue;
if (debug)
printf("Incomplete record %jd (%d)\n",
rec->jsr_seq, i);
- recsize = i * DEV_BSIZE;
+ recsize = i * real_dev_bsize;
jblocks_advance(suj_jblocks, recsize);
goto restart;
}
Modified: projects/binutils-2.17/sbin/mdconfig/mdconfig.c
==============================================================================
--- projects/binutils-2.17/sbin/mdconfig/mdconfig.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/sbin/mdconfig/mdconfig.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -373,7 +373,11 @@ md_list(char *units, int opt)
found = 1;
}
gc = &pp->lg_config;
- printf("%s", pp->lg_name);
+ if (nflag && strncmp(pp->lg_name, "md", 2) == 0)
+ printf("%s", pp->lg_name + 2);
+ else
+ printf("%s", pp->lg_name);
+
if (opt & OPT_VERBOSE || opt & OPT_UNIT) {
type = geom_config_get(gc, "type");
if (strcmp(type, "vnode") == 0)
Modified: projects/binutils-2.17/sbin/mksnap_ffs/mksnap_ffs.8
==============================================================================
--- projects/binutils-2.17/sbin/mksnap_ffs/mksnap_ffs.8 Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/sbin/mksnap_ffs/mksnap_ffs.8 Wed Feb 16 19:30:29 2011 (r218746)
@@ -34,7 +34,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 29, 2009
+.Dd February 14, 2011
.Dt MKSNAP_FFS 8
.Os
.Sh NAME
@@ -79,3 +79,12 @@ utility first appeared in
.Sh CAVEATS
The disk full situation is not handled gracefully and may
lead to a system panic when no free blocks are found.
+.Pp
+Every filesystem can have only up to 20 active snapshots.
+When this limit is reached, attempting to create more snapshots
+fails with
+.Er ENOSPC ,
+and
+.Nm
+reports that it is
+.Dq out of space .
Modified: projects/binutils-2.17/sbin/newfs/newfs.8
==============================================================================
--- projects/binutils-2.17/sbin/newfs/newfs.8 Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/sbin/newfs/newfs.8 Wed Feb 16 19:30:29 2011 (r218746)
@@ -36,7 +36,7 @@
.Nd construct a new UFS1/UFS2 file system
.Sh SYNOPSIS
.Nm
-.Op Fl EJNUlnt
+.Op Fl EJNUjlnt
.Op Fl L Ar volname
.Op Fl O Ar filesystem-type
.Op Fl S Ar sector-size
@@ -157,6 +157,12 @@ If fewer inodes are desired, a larger nu
to create more inodes a smaller number should be given.
One inode is required for each distinct file, so this value effectively
specifies the average file size on the file system.
+.It Fl j
+Enable soft updates journaling on the new file system.
+This flag is implemented by running the
+.Xr tunefs 8
+utility found in the user's
+.Dv $PATH .
.It Fl l
Enable multilabel MAC on the new file system.
.It Fl m Ar free-space
Modified: projects/binutils-2.17/sbin/newfs/newfs.c
==============================================================================
--- projects/binutils-2.17/sbin/newfs/newfs.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/sbin/newfs/newfs.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -87,6 +87,7 @@ int Nflag; /* run without writing file
int Oflag = 2; /* file system format (1 => UFS1, 2 => UFS2) */
int Rflag; /* regression test */
int Uflag; /* enable soft updates for file system */
+int jflag; /* enable soft updates journaling for filesys */
int Xflag = 0; /* exit in middle of newfs for testing */
int Jflag; /* enable gjournal for file system */
int lflag; /* enable multilabel for file system */
@@ -140,7 +141,7 @@ main(int argc, char *argv[])
part_name = 'c';
reserved = 0;
while ((ch = getopt(argc, argv,
- "EJL:NO:RS:T:UXa:b:c:d:e:f:g:h:i:lm:no:p:r:s:t")) != -1)
+ "EJL:NO:RS:T:UXa:b:c:d:e:f:g:h:i:jlm:no:p:r:s:t")) != -1)
switch (ch) {
case 'E':
Eflag = 1;
@@ -180,6 +181,9 @@ main(int argc, char *argv[])
case 'T':
disktype = optarg;
break;
+ case 'j':
+ jflag = 1;
+ /* fall through to enable soft updates */
case 'U':
Uflag = 1;
break;
@@ -397,7 +401,11 @@ main(int argc, char *argv[])
rewritelabel(special, lp);
}
ufs_disk_close(&disk);
- exit(0);
+ if (!jflag)
+ exit(0);
+ if (execlp("tunefs", "newfs", "-j", "enable", special, NULL) < 0)
+ err(1, "Cannot enable soft updates journaling, tunefs");
+ /* NOT REACHED */
}
void
@@ -492,6 +500,7 @@ usage()
fprintf(stderr, "\t-g average file size\n");
fprintf(stderr, "\t-h average files per directory\n");
fprintf(stderr, "\t-i number of bytes per inode\n");
+ fprintf(stderr, "\t-j enable soft updates journaling\n");
fprintf(stderr, "\t-l enable multilabel MAC\n");
fprintf(stderr, "\t-n do not create .snap directory\n");
fprintf(stderr, "\t-m minimum free space %%\n");
Modified: projects/binutils-2.17/sbin/tunefs/tunefs.c
==============================================================================
--- projects/binutils-2.17/sbin/tunefs/tunefs.c Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/sbin/tunefs/tunefs.c Wed Feb 16 19:30:29 2011 (r218746)
@@ -688,6 +688,19 @@ journal_findfile(void)
return (0);
}
+static void
+dir_clear_block(char *block, off_t off)
+{
+ struct direct *dp;
+
+ for (; off < sblock.fs_bsize; off += DIRBLKSIZ) {
+ dp = (struct direct *)&block[off];
+ dp->d_ino = 0;
+ dp->d_reclen = DIRBLKSIZ;
+ dp->d_type = DT_UNKNOWN;
+ }
+}
+
/*
* Insert the journal at inode 'ino' into directory blk 'blk' at the first
* free offset of 'off'. DIRBLKSIZ blocks after off are initialized as
@@ -710,13 +723,7 @@ dir_insert(ufs2_daddr_t blk, off_t off,
dp->d_type = DT_REG;
dp->d_namlen = strlen(SUJ_FILE);
bcopy(SUJ_FILE, &dp->d_name, strlen(SUJ_FILE));
- off += DIRBLKSIZ;
- for (; off < sblock.fs_bsize; off += DIRBLKSIZ) {
- dp = (struct direct *)&block[off];
- dp->d_ino = 0;
- dp->d_reclen = DIRBLKSIZ;
- dp->d_type = DT_UNKNOWN;
- }
+ dir_clear_block(block, off + DIRBLKSIZ);
if (bwrite(&disk, fsbtodb(&sblock, blk), block, sblock.fs_bsize) <= 0) {
warn("Failed to write dir block");
return (-1);
@@ -733,16 +740,19 @@ dir_extend(ufs2_daddr_t blk, ufs2_daddr_
{
char block[MAXBSIZE];
- if (bread(&disk, fsbtodb(&sblock, blk), block, size) <= 0) {
+ if (bread(&disk, fsbtodb(&sblock, blk), block,
+ roundup(size, sblock.fs_fsize)) <= 0) {
warn("Failed to read dir block");
return (-1);
}
- if (bwrite(&disk, fsbtodb(&sblock, nblk), block, size) <= 0) {
+ dir_clear_block(block, size);
+ if (bwrite(&disk, fsbtodb(&sblock, nblk), block, sblock.fs_bsize)
+ <= 0) {
warn("Failed to write dir block");
return (-1);
}
- return dir_insert(nblk, size, ino);
+ return (dir_insert(nblk, size, ino));
}
/*
Modified: projects/binutils-2.17/secure/lib/libcrypto/Makefile
==============================================================================
--- projects/binutils-2.17/secure/lib/libcrypto/Makefile Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/secure/lib/libcrypto/Makefile Wed Feb 16 19:30:29 2011 (r218746)
@@ -345,6 +345,10 @@ INCSDIR= ${INCLUDEDIR}/openssl
CSTD= gnu89
+.if !empty(SRCS:M*.s)
+AFLAGS+= --noexecstack
+.endif
+
CLEANFILES= buildinf.h opensslconf.h evp.h
buildinf.h: ${.CURDIR}/Makefile
Modified: projects/binutils-2.17/share/examples/kld/Makefile
==============================================================================
--- projects/binutils-2.17/share/examples/kld/Makefile Wed Feb 16 18:05:10 2011 (r218745)
+++ projects/binutils-2.17/share/examples/kld/Makefile Wed Feb 16 19:30:29 2011 (r218746)
@@ -67,6 +67,6 @@
# $FreeBSD$
#
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list