svn commit: r270410 - in projects/ipfw: . bin/ed bin/pkill/tests bin/rmail bin/sh bin/sh/tests bin/sh/tests/errors bin/sh/tests/expansion cddl cddl/contrib/opensolaris/cmd/lockstat cddl/contrib/ope...
Alexander V. Chernikov
melifaro at FreeBSD.org
Sat Aug 23 14:58:41 UTC 2014
Author: melifaro
Date: Sat Aug 23 14:58:31 2014
New Revision: 270410
URL: http://svnweb.freebsd.org/changeset/base/270410
Log:
Sync to HEAD at r270409.
Added:
projects/ipfw/bin/sh/tests/expansion/arith14.0
- copied unchanged from r270409, head/bin/sh/tests/expansion/arith14.0
projects/ipfw/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff
- copied unchanged from r270409, head/contrib/llvm/patches/patch-r270147-llvm-r197824-r213427-r213960.diff
projects/ipfw/etc/auto_master
- copied unchanged from r270409, head/etc/auto_master
projects/ipfw/etc/autofs/
- copied from r270409, head/etc/autofs/
projects/ipfw/etc/rc.d/automount
- copied unchanged from r270409, head/etc/rc.d/automount
projects/ipfw/etc/rc.d/automountd
- copied unchanged from r270409, head/etc/rc.d/automountd
projects/ipfw/etc/rc.d/autounmountd
- copied unchanged from r270409, head/etc/rc.d/autounmountd
projects/ipfw/sbin/devd/tests/
- copied from r270409, head/sbin/devd/tests/
projects/ipfw/sbin/ifconfig/sfp.c
- copied unchanged from r270409, head/sbin/ifconfig/sfp.c
projects/ipfw/share/man/man5/autofs.5
- copied unchanged from r270409, head/share/man/man5/autofs.5
projects/ipfw/share/vt/keymaps/INDEX.keymaps
- copied unchanged from r270409, head/share/vt/keymaps/INDEX.keymaps
projects/ipfw/share/vt/keymaps/am.kbd
- copied unchanged from r270409, head/share/vt/keymaps/am.kbd
projects/ipfw/share/vt/keymaps/be.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/be.acc.kbd
projects/ipfw/share/vt/keymaps/be.kbd
- copied unchanged from r270409, head/share/vt/keymaps/be.kbd
projects/ipfw/share/vt/keymaps/bg.bds.kbd
- copied unchanged from r270409, head/share/vt/keymaps/bg.bds.kbd
projects/ipfw/share/vt/keymaps/bg.phonetic.kbd
- copied unchanged from r270409, head/share/vt/keymaps/bg.phonetic.kbd
projects/ipfw/share/vt/keymaps/br.kbd
- copied unchanged from r270409, head/share/vt/keymaps/br.kbd
projects/ipfw/share/vt/keymaps/br.noacc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/br.noacc.kbd
projects/ipfw/share/vt/keymaps/by.kbd
- copied unchanged from r270409, head/share/vt/keymaps/by.kbd
projects/ipfw/share/vt/keymaps/ca-fr.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ca-fr.kbd
projects/ipfw/share/vt/keymaps/ca.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ca.kbd
projects/ipfw/share/vt/keymaps/centraleuropean.kbd
- copied unchanged from r270409, head/share/vt/keymaps/centraleuropean.kbd
projects/ipfw/share/vt/keymaps/centraleuropean.qwerty.kbd
- copied unchanged from r270409, head/share/vt/keymaps/centraleuropean.qwerty.kbd
projects/ipfw/share/vt/keymaps/ch-fr.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ch-fr.acc.kbd
projects/ipfw/share/vt/keymaps/ch-fr.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ch-fr.kbd
projects/ipfw/share/vt/keymaps/ch.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ch.acc.kbd
projects/ipfw/share/vt/keymaps/ch.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ch.kbd
projects/ipfw/share/vt/keymaps/ch.macbook.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ch.macbook.acc.kbd
projects/ipfw/share/vt/keymaps/colemak.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/colemak.acc.kbd
projects/ipfw/share/vt/keymaps/cz.kbd
- copied unchanged from r270409, head/share/vt/keymaps/cz.kbd
projects/ipfw/share/vt/keymaps/de.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/de.acc.kbd
projects/ipfw/share/vt/keymaps/de.kbd
- copied unchanged from r270409, head/share/vt/keymaps/de.kbd
projects/ipfw/share/vt/keymaps/de.noacc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/de.noacc.kbd
projects/ipfw/share/vt/keymaps/dk.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/dk.acc.kbd
projects/ipfw/share/vt/keymaps/dk.kbd
- copied unchanged from r270409, head/share/vt/keymaps/dk.kbd
projects/ipfw/share/vt/keymaps/dk.macbook.kbd
- copied unchanged from r270409, head/share/vt/keymaps/dk.macbook.kbd
projects/ipfw/share/vt/keymaps/ee.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ee.kbd
projects/ipfw/share/vt/keymaps/es.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/es.acc.kbd
projects/ipfw/share/vt/keymaps/es.dvorak.kbd
- copied unchanged from r270409, head/share/vt/keymaps/es.dvorak.kbd
projects/ipfw/share/vt/keymaps/es.kbd
- copied unchanged from r270409, head/share/vt/keymaps/es.kbd
projects/ipfw/share/vt/keymaps/fi.kbd
- copied unchanged from r270409, head/share/vt/keymaps/fi.kbd
projects/ipfw/share/vt/keymaps/fr.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/fr.acc.kbd
projects/ipfw/share/vt/keymaps/fr.dvorak.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/fr.dvorak.acc.kbd
projects/ipfw/share/vt/keymaps/fr.dvorak.kbd
- copied unchanged from r270409, head/share/vt/keymaps/fr.dvorak.kbd
projects/ipfw/share/vt/keymaps/fr.kbd
- copied unchanged from r270409, head/share/vt/keymaps/fr.kbd
projects/ipfw/share/vt/keymaps/fr.macbook.kbd
- copied unchanged from r270409, head/share/vt/keymaps/fr.macbook.kbd
projects/ipfw/share/vt/keymaps/gr.101.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/gr.101.acc.kbd
projects/ipfw/share/vt/keymaps/gr.elot.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/gr.elot.acc.kbd
projects/ipfw/share/vt/keymaps/gr.kbd
- copied unchanged from r270409, head/share/vt/keymaps/gr.kbd
projects/ipfw/share/vt/keymaps/hr.kbd
- copied unchanged from r270409, head/share/vt/keymaps/hr.kbd
projects/ipfw/share/vt/keymaps/hu.101.kbd
- copied unchanged from r270409, head/share/vt/keymaps/hu.101.kbd
projects/ipfw/share/vt/keymaps/hu.102.kbd
- copied unchanged from r270409, head/share/vt/keymaps/hu.102.kbd
projects/ipfw/share/vt/keymaps/il.kbd
- copied unchanged from r270409, head/share/vt/keymaps/il.kbd
projects/ipfw/share/vt/keymaps/is.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/is.acc.kbd
projects/ipfw/share/vt/keymaps/is.kbd
- copied unchanged from r270409, head/share/vt/keymaps/is.kbd
projects/ipfw/share/vt/keymaps/it.kbd
- copied unchanged from r270409, head/share/vt/keymaps/it.kbd
projects/ipfw/share/vt/keymaps/jp.capsctrl.kbd
- copied unchanged from r270409, head/share/vt/keymaps/jp.capsctrl.kbd
projects/ipfw/share/vt/keymaps/jp.kbd
- copied unchanged from r270409, head/share/vt/keymaps/jp.kbd
projects/ipfw/share/vt/keymaps/jp.pc98.iso.kbd
- copied unchanged from r270409, head/share/vt/keymaps/jp.pc98.iso.kbd
projects/ipfw/share/vt/keymaps/jp.pc98.kbd
- copied unchanged from r270409, head/share/vt/keymaps/jp.pc98.kbd
projects/ipfw/share/vt/keymaps/kz.io.kbd
- copied unchanged from r270409, head/share/vt/keymaps/kz.io.kbd
projects/ipfw/share/vt/keymaps/kz.kst.kbd
- copied unchanged from r270409, head/share/vt/keymaps/kz.kst.kbd
projects/ipfw/share/vt/keymaps/latinamerican.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/latinamerican.acc.kbd
projects/ipfw/share/vt/keymaps/latinamerican.kbd
- copied unchanged from r270409, head/share/vt/keymaps/latinamerican.kbd
projects/ipfw/share/vt/keymaps/lt.kbd
- copied unchanged from r270409, head/share/vt/keymaps/lt.kbd
projects/ipfw/share/vt/keymaps/nl.kbd
- copied unchanged from r270409, head/share/vt/keymaps/nl.kbd
projects/ipfw/share/vt/keymaps/no.dvorak.kbd
- copied unchanged from r270409, head/share/vt/keymaps/no.dvorak.kbd
projects/ipfw/share/vt/keymaps/no.kbd
- copied unchanged from r270409, head/share/vt/keymaps/no.kbd
projects/ipfw/share/vt/keymaps/nordic.asus-eee.kbd
- copied unchanged from r270409, head/share/vt/keymaps/nordic.asus-eee.kbd
projects/ipfw/share/vt/keymaps/pl.dvorak.kbd
- copied unchanged from r270409, head/share/vt/keymaps/pl.dvorak.kbd
projects/ipfw/share/vt/keymaps/pt.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/pt.acc.kbd
projects/ipfw/share/vt/keymaps/pt.kbd
- copied unchanged from r270409, head/share/vt/keymaps/pt.kbd
projects/ipfw/share/vt/keymaps/ru.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ru.kbd
projects/ipfw/share/vt/keymaps/ru.shift.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ru.shift.kbd
projects/ipfw/share/vt/keymaps/ru.win.kbd
- copied unchanged from r270409, head/share/vt/keymaps/ru.win.kbd
projects/ipfw/share/vt/keymaps/se.kbd
- copied unchanged from r270409, head/share/vt/keymaps/se.kbd
projects/ipfw/share/vt/keymaps/si.kbd
- copied unchanged from r270409, head/share/vt/keymaps/si.kbd
projects/ipfw/share/vt/keymaps/sk.kbd
- copied unchanged from r270409, head/share/vt/keymaps/sk.kbd
projects/ipfw/share/vt/keymaps/tr.kbd
- copied unchanged from r270409, head/share/vt/keymaps/tr.kbd
projects/ipfw/share/vt/keymaps/uk.capsctrl.kbd
- copied unchanged from r270409, head/share/vt/keymaps/uk.capsctrl.kbd
projects/ipfw/share/vt/keymaps/uk.dvorak.kbd
- copied unchanged from r270409, head/share/vt/keymaps/uk.dvorak.kbd
projects/ipfw/share/vt/keymaps/uk.kbd
- copied unchanged from r270409, head/share/vt/keymaps/uk.kbd
projects/ipfw/share/vt/keymaps/us.acc.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.acc.kbd
projects/ipfw/share/vt/keymaps/us.ctrl.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.ctrl.kbd
projects/ipfw/share/vt/keymaps/us.dvorak.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.dvorak.kbd
projects/ipfw/share/vt/keymaps/us.dvorakl.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.dvorakl.kbd
projects/ipfw/share/vt/keymaps/us.dvorakp.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.dvorakp.kbd
projects/ipfw/share/vt/keymaps/us.dvorakr.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.dvorakr.kbd
projects/ipfw/share/vt/keymaps/us.dvorakx.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.dvorakx.kbd
projects/ipfw/share/vt/keymaps/us.emacs.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.emacs.kbd
projects/ipfw/share/vt/keymaps/us.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.kbd
projects/ipfw/share/vt/keymaps/us.unix.kbd
- copied unchanged from r270409, head/share/vt/keymaps/us.unix.kbd
projects/ipfw/sys/arm/at91/at91_common.c
- copied unchanged from r270409, head/sys/arm/at91/at91_common.c
projects/ipfw/sys/arm/at91/at91_pinctrl.c
- copied unchanged from r270409, head/sys/arm/at91/at91_pinctrl.c
projects/ipfw/sys/arm/include/acle-compat.h
- copied unchanged from r270409, head/sys/arm/include/acle-compat.h
projects/ipfw/sys/boot/fdt/dts/arm/sam9260ek.dts
- copied unchanged from r270409, head/sys/boot/fdt/dts/arm/sam9260ek.dts
projects/ipfw/sys/cddl/dev/fbt/fbt.h
- copied unchanged from r270409, head/sys/cddl/dev/fbt/fbt.h
projects/ipfw/sys/cddl/dev/fbt/powerpc/
- copied from r270409, head/sys/cddl/dev/fbt/powerpc/
projects/ipfw/sys/cddl/dev/fbt/x86/
- copied from r270409, head/sys/cddl/dev/fbt/x86/
projects/ipfw/sys/dev/ixl/
- copied from r270409, head/sys/dev/ixl/
projects/ipfw/sys/dev/netmap/if_vtnet_netmap.h
- copied unchanged from r270409, head/sys/dev/netmap/if_vtnet_netmap.h
projects/ipfw/sys/dev/netmap/netmap_monitor.c
- copied unchanged from r270409, head/sys/dev/netmap/netmap_monitor.c
projects/ipfw/sys/fs/autofs/
- copied from r270409, head/sys/fs/autofs/
projects/ipfw/sys/gnu/dts/arm/sam9260ek_common.dtsi
- copied unchanged from r270409, head/sys/gnu/dts/arm/sam9260ek_common.dtsi
projects/ipfw/sys/libkern/strndup.c
- copied unchanged from r270409, head/sys/libkern/strndup.c
projects/ipfw/sys/modules/autofs/
- copied from r270409, head/sys/modules/autofs/
projects/ipfw/sys/modules/ixl/
- copied from r270409, head/sys/modules/ixl/
projects/ipfw/sys/modules/ixlv/
- copied from r270409, head/sys/modules/ixlv/
projects/ipfw/sys/modules/si/
- copied from r270409, head/sys/modules/si/
projects/ipfw/sys/modules/wds/
- copied from r270409, head/sys/modules/wds/
projects/ipfw/sys/modules/wl/
- copied from r270409, head/sys/modules/wl/
projects/ipfw/sys/net/paravirt.h
- copied unchanged from r270409, head/sys/net/paravirt.h
projects/ipfw/sys/net/sff8436.h
- copied unchanged from r270409, head/sys/net/sff8436.h
projects/ipfw/tools/build/options/WITHOUT_CUSE
- copied unchanged from r270409, head/tools/build/options/WITHOUT_CUSE
projects/ipfw/tools/tools/vt/keymaps/
- copied from r270409, head/tools/tools/vt/keymaps/
projects/ipfw/usr.sbin/autofs/
- copied from r270409, head/usr.sbin/autofs/
Deleted:
projects/ipfw/share/examples/autofs/
projects/ipfw/sys/cddl/dev/fbt/fbt_powerpc.c
projects/ipfw/sys/dev/i40e/
projects/ipfw/sys/modules/i40e/
projects/ipfw/tools/build/options/WITH_PIE
Modified:
projects/ipfw/.arcconfig
projects/ipfw/Makefile
projects/ipfw/Makefile.inc1
projects/ipfw/ObsoleteFiles.inc
projects/ipfw/bin/ed/cbc.c
projects/ipfw/bin/pkill/tests/Makefile
projects/ipfw/bin/rmail/Makefile
projects/ipfw/bin/sh/arith_yacc.c
projects/ipfw/bin/sh/histedit.c
projects/ipfw/bin/sh/mystring.c
projects/ipfw/bin/sh/tests/errors/bad-parm-exp2.2
projects/ipfw/bin/sh/tests/errors/bad-parm-exp2.2.stderr
projects/ipfw/bin/sh/tests/errors/bad-parm-exp3.2
projects/ipfw/bin/sh/tests/errors/bad-parm-exp3.2.stderr
projects/ipfw/bin/sh/tests/errors/bad-parm-exp4.2
projects/ipfw/bin/sh/tests/errors/bad-parm-exp4.2.stderr
projects/ipfw/bin/sh/tests/errors/bad-parm-exp5.2
projects/ipfw/bin/sh/tests/errors/bad-parm-exp5.2.stderr
projects/ipfw/bin/sh/tests/errors/bad-parm-exp6.2
projects/ipfw/bin/sh/tests/errors/bad-parm-exp6.2.stderr
projects/ipfw/bin/sh/tests/expansion/Makefile
projects/ipfw/bin/sh/tests/functional_test.sh
projects/ipfw/cddl/Makefile.inc
projects/ipfw/cddl/contrib/opensolaris/cmd/lockstat/sym.c
projects/ipfw/cddl/contrib/opensolaris/head/libintl.h
projects/ipfw/cddl/contrib/opensolaris/head/nlist.h
projects/ipfw/cddl/contrib/opensolaris/head/synch.h
projects/ipfw/cddl/contrib/opensolaris/head/thread.h
projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c
projects/ipfw/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c
projects/ipfw/cddl/lib/libdtrace/libproc_compat.h
projects/ipfw/contrib/gcc/config/i386/emmintrin.h
projects/ipfw/contrib/llvm/include/llvm/Support/ELF.h
projects/ipfw/contrib/llvm/lib/Object/ELF.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPC.h
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.h
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCMachineFunctionInfo.h
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h
projects/ipfw/etc/Makefile
projects/ipfw/etc/defaults/rc.conf
projects/ipfw/etc/devd/Makefile
projects/ipfw/etc/mtree/BSD.root.dist
projects/ipfw/etc/mtree/BSD.tests.dist
projects/ipfw/etc/rc.d/Makefile
projects/ipfw/etc/rc.subr
projects/ipfw/gnu/lib/libgcc/Makefile
projects/ipfw/gnu/usr.bin/binutils/addr2line/Makefile
projects/ipfw/gnu/usr.bin/binutils/nm/Makefile
projects/ipfw/gnu/usr.bin/binutils/objcopy/Makefile
projects/ipfw/gnu/usr.bin/binutils/objdump/Makefile
projects/ipfw/gnu/usr.bin/binutils/readelf/Makefile
projects/ipfw/gnu/usr.bin/binutils/size/Makefile
projects/ipfw/gnu/usr.bin/binutils/strings/Makefile
projects/ipfw/gnu/usr.bin/binutils/strip/Makefile
projects/ipfw/gnu/usr.bin/gdb/gdb/Makefile
projects/ipfw/gnu/usr.bin/gdb/gdbtui/Makefile
projects/ipfw/gnu/usr.bin/gdb/kgdb/Makefile
projects/ipfw/gnu/usr.bin/groff/src/devices/grodvi/Makefile
projects/ipfw/gnu/usr.bin/groff/src/devices/grohtml/Makefile
projects/ipfw/gnu/usr.bin/groff/src/devices/grolbp/Makefile
projects/ipfw/gnu/usr.bin/groff/src/devices/grolj4/Makefile
projects/ipfw/gnu/usr.bin/groff/src/devices/grops/Makefile
projects/ipfw/gnu/usr.bin/groff/src/devices/grotty/Makefile
projects/ipfw/gnu/usr.bin/groff/src/preproc/eqn/Makefile
projects/ipfw/gnu/usr.bin/groff/src/preproc/grn/Makefile
projects/ipfw/gnu/usr.bin/groff/src/preproc/html/Makefile
projects/ipfw/gnu/usr.bin/groff/src/preproc/pic/Makefile
projects/ipfw/gnu/usr.bin/groff/src/preproc/refer/Makefile
projects/ipfw/gnu/usr.bin/groff/src/preproc/soelim/Makefile
projects/ipfw/gnu/usr.bin/groff/src/preproc/tbl/Makefile
projects/ipfw/gnu/usr.bin/groff/src/roff/groff/Makefile
projects/ipfw/gnu/usr.bin/groff/src/roff/troff/Makefile
projects/ipfw/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
projects/ipfw/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
projects/ipfw/gnu/usr.bin/groff/src/utils/indxbib/Makefile
projects/ipfw/gnu/usr.bin/groff/src/utils/lkbib/Makefile
projects/ipfw/gnu/usr.bin/groff/src/utils/lookbib/Makefile
projects/ipfw/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
projects/ipfw/gnu/usr.bin/rcs/Makefile.inc
projects/ipfw/gnu/usr.bin/texinfo/info/Makefile
projects/ipfw/gnu/usr.bin/texinfo/infokey/Makefile
projects/ipfw/gnu/usr.bin/texinfo/install-info/Makefile
projects/ipfw/gnu/usr.bin/texinfo/makeinfo/Makefile
projects/ipfw/gnu/usr.bin/texinfo/texindex/Makefile
projects/ipfw/include/stddef.h
projects/ipfw/kerberos5/libexec/digest-service/Makefile
projects/ipfw/kerberos5/libexec/hprop/Makefile
projects/ipfw/kerberos5/libexec/hpropd/Makefile
projects/ipfw/kerberos5/libexec/ipropd-master/Makefile
projects/ipfw/kerberos5/libexec/ipropd-slave/Makefile
projects/ipfw/kerberos5/libexec/kadmind/Makefile
projects/ipfw/kerberos5/libexec/kcm/Makefile
projects/ipfw/kerberos5/libexec/kdc/Makefile
projects/ipfw/kerberos5/libexec/kdigest/Makefile
projects/ipfw/kerberos5/libexec/kfd/Makefile
projects/ipfw/kerberos5/libexec/kimpersonate/Makefile
projects/ipfw/kerberos5/libexec/kpasswdd/Makefile
projects/ipfw/kerberos5/tools/asn1_compile/Makefile
projects/ipfw/kerberos5/tools/slc/Makefile
projects/ipfw/kerberos5/usr.bin/hxtool/Makefile
projects/ipfw/kerberos5/usr.bin/kadmin/Makefile
projects/ipfw/kerberos5/usr.bin/kcc/Makefile
projects/ipfw/kerberos5/usr.bin/kdestroy/Makefile
projects/ipfw/kerberos5/usr.bin/kf/Makefile
projects/ipfw/kerberos5/usr.bin/kgetcred/Makefile
projects/ipfw/kerberos5/usr.bin/kinit/Makefile
projects/ipfw/kerberos5/usr.bin/kpasswd/Makefile
projects/ipfw/kerberos5/usr.bin/ksu/Makefile
projects/ipfw/kerberos5/usr.bin/string2key/Makefile
projects/ipfw/kerberos5/usr.bin/verify_krb5_conf/Makefile
projects/ipfw/kerberos5/usr.sbin/iprop-log/Makefile
projects/ipfw/kerberos5/usr.sbin/kstash/Makefile
projects/ipfw/kerberos5/usr.sbin/ktutil/Makefile
projects/ipfw/lib/atf/libatf-c++/Makefile
projects/ipfw/lib/clang/clang.build.mk
projects/ipfw/lib/clang/include/clang/Config/config.h
projects/ipfw/lib/clang/include/llvm/Config/config.h
projects/ipfw/lib/csu/amd64/Makefile
projects/ipfw/lib/csu/i386-elf/Makefile
projects/ipfw/lib/libc/arm/aeabi/aeabi_vfp.h
projects/ipfw/lib/libc/nameser/ns_print.c
projects/ipfw/lib/libc/net/sctp_sys_calls.c
projects/ipfw/lib/libcrypt/tests/Makefile
projects/ipfw/lib/libcuse/Makefile
projects/ipfw/lib/libopie/Makefile
projects/ipfw/lib/libusb/libusb.h
projects/ipfw/lib/msun/arm/fenv.c
projects/ipfw/libexec/getty/main.c
projects/ipfw/libexec/mail.local/Makefile
projects/ipfw/libexec/rshd/rshd.c
projects/ipfw/libexec/rtld-elf/Makefile
projects/ipfw/libexec/rtld-elf/libmap.c
projects/ipfw/libexec/smrsh/Makefile
projects/ipfw/libexec/telnetd/Makefile
projects/ipfw/rescue/rescue/Makefile
projects/ipfw/sbin/atm/atmconfig/Makefile
projects/ipfw/sbin/atm/atmconfig/main.c
projects/ipfw/sbin/devd/Makefile
projects/ipfw/sbin/devd/devd.8
projects/ipfw/sbin/devd/devd.cc
projects/ipfw/sbin/dhclient/tests/Makefile
projects/ipfw/sbin/fsck/Makefile
projects/ipfw/sbin/hastd/Makefile
projects/ipfw/sbin/ifconfig/Makefile
projects/ipfw/sbin/ifconfig/ifconfig.c
projects/ipfw/sbin/ifconfig/ifconfig.h
projects/ipfw/sbin/init/init.c
projects/ipfw/sbin/ipf/ipf/Makefile
projects/ipfw/sbin/ipf/ipfstat/Makefile
projects/ipfw/sbin/ipf/ipftest/Makefile
projects/ipfw/sbin/ipf/ipmon/Makefile
projects/ipfw/sbin/ipf/ipnat/Makefile
projects/ipfw/sbin/ipf/ippool/Makefile
projects/ipfw/sbin/ipf/ipresend/Makefile
projects/ipfw/sbin/mksnap_ffs/Makefile
projects/ipfw/sbin/mount/mntopts.h
projects/ipfw/sbin/mount/mount.8
projects/ipfw/sbin/mount/mount.c
projects/ipfw/sbin/newfs_msdos/newfs_msdos.c
projects/ipfw/sbin/rcorder/Makefile
projects/ipfw/sbin/shutdown/Makefile
projects/ipfw/sbin/umount/umount.c
projects/ipfw/secure/usr.bin/ssh/Makefile
projects/ipfw/share/man/man4/altera_atse.4
projects/ipfw/share/man/man4/iwn.4
projects/ipfw/share/man/man4/iwnfw.4
projects/ipfw/share/man/man4/urtwn.4
projects/ipfw/share/man/man5/Makefile
projects/ipfw/share/man/man5/src.conf.5
projects/ipfw/share/man/man9/timeout.9
projects/ipfw/share/misc/bsd-family-tree
projects/ipfw/share/mk/bsd.opts.mk
projects/ipfw/share/mk/bsd.prog.mk
projects/ipfw/share/mk/src.libnames.mk
projects/ipfw/share/syscons/keymaps/INDEX.keymaps
projects/ipfw/share/syscons/keymaps/be.iso.acc.kbd
projects/ipfw/share/syscons/keymaps/cs.latin2.qwertz.kbd
projects/ipfw/share/syscons/keymaps/uk.iso-ctrl.kbd
projects/ipfw/share/syscons/keymaps/uk.iso.kbd
projects/ipfw/share/vt/keymaps/Makefile
projects/ipfw/share/vt/keymaps/pl.kbd (contents, props changed)
projects/ipfw/share/vt/keymaps/ua.kbd (contents, props changed)
projects/ipfw/share/vt/keymaps/ua.shift.alt.kbd (contents, props changed)
projects/ipfw/sys/amd64/amd64/pmap.c
projects/ipfw/sys/amd64/conf/NOTES
projects/ipfw/sys/amd64/include/param.h
projects/ipfw/sys/amd64/include/vmparam.h
projects/ipfw/sys/amd64/vmm/intel/vtd.c
projects/ipfw/sys/amd64/vmm/io/vatpic.c
projects/ipfw/sys/amd64/vmm/vmm.c
projects/ipfw/sys/arm/arm/disassem.c
projects/ipfw/sys/arm/arm/elf_machdep.c
projects/ipfw/sys/arm/arm/nexus.c
projects/ipfw/sys/arm/at91/at91.c
projects/ipfw/sys/arm/at91/at91_aic.c
projects/ipfw/sys/arm/at91/at91_machdep.c
projects/ipfw/sys/arm/at91/at91_mci.c
projects/ipfw/sys/arm/at91/at91_mcireg.h
projects/ipfw/sys/arm/at91/at91_pio.c
projects/ipfw/sys/arm/at91/at91_piovar.h
projects/ipfw/sys/arm/at91/at91_pit.c
projects/ipfw/sys/arm/at91/at91_pmc.c
projects/ipfw/sys/arm/at91/at91sam9260.c
projects/ipfw/sys/arm/at91/at91sam9260reg.h
projects/ipfw/sys/arm/at91/files.at91
projects/ipfw/sys/arm/at91/std.atmel
projects/ipfw/sys/arm/conf/HL201
projects/ipfw/sys/arm/freescale/imx/imx6_anatop.c
projects/ipfw/sys/arm/include/elf.h
projects/ipfw/sys/arm/include/param.h
projects/ipfw/sys/arm/include/platform.h
projects/ipfw/sys/arm/ti/ti_i2c.c
projects/ipfw/sys/arm/ti/ti_i2c.h
projects/ipfw/sys/boot/i386/boot2/Makefile
projects/ipfw/sys/boot/i386/btx/btx/Makefile
projects/ipfw/sys/boot/i386/btx/btxldr/Makefile
projects/ipfw/sys/boot/i386/btx/lib/Makefile
projects/ipfw/sys/boot/i386/loader/Makefile
projects/ipfw/sys/boot/mips/beri/boot2/Makefile
projects/ipfw/sys/boot/mips/beri/loader/Makefile
projects/ipfw/sys/boot/pc98/boot2/Makefile
projects/ipfw/sys/boot/pc98/btx/lib/Makefile
projects/ipfw/sys/boot/pc98/loader/Makefile
projects/ipfw/sys/boot/sparc64/boot1/Makefile
projects/ipfw/sys/boot/sparc64/loader/Makefile
projects/ipfw/sys/cam/ata/ata_da.c
projects/ipfw/sys/cam/ata/ata_xpt.c
projects/ipfw/sys/cam/ctl/ctl_frontend_iscsi.c
projects/ipfw/sys/cam/ctl/ctl_tpc.c
projects/ipfw/sys/cam/scsi/scsi_da.c
projects/ipfw/sys/cam/scsi/scsi_low.c
projects/ipfw/sys/cddl/compat/opensolaris/sys/atomic.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/os/fm.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c
projects/ipfw/sys/cddl/dev/fbt/fbt.c
projects/ipfw/sys/conf/Makefile.arm
projects/ipfw/sys/conf/NOTES
projects/ipfw/sys/conf/files
projects/ipfw/sys/conf/kern.mk
projects/ipfw/sys/conf/options
projects/ipfw/sys/ddb/db_run.c
projects/ipfw/sys/dev/cs/if_cs.c
projects/ipfw/sys/dev/cxgbe/t4_netmap.c
projects/ipfw/sys/dev/e1000/if_em.c
projects/ipfw/sys/dev/e1000/if_igb.c
projects/ipfw/sys/dev/e1000/if_lem.c
projects/ipfw/sys/dev/ep/if_ep.c
projects/ipfw/sys/dev/hptnr/README
projects/ipfw/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
projects/ipfw/sys/dev/hptnr/hptnr_config.c
projects/ipfw/sys/dev/hptnr/hptnr_os_bsd.c
projects/ipfw/sys/dev/hptnr/hptnr_osm_bsd.c
projects/ipfw/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
projects/ipfw/sys/dev/iscsi/icl.c
projects/ipfw/sys/dev/iscsi/icl_proxy.c
projects/ipfw/sys/dev/iscsi/iscsi.c
projects/ipfw/sys/dev/ixgbe/ixgbe.c
projects/ipfw/sys/dev/netmap/if_em_netmap.h
projects/ipfw/sys/dev/netmap/if_igb_netmap.h
projects/ipfw/sys/dev/netmap/if_lem_netmap.h
projects/ipfw/sys/dev/netmap/if_re_netmap.h
projects/ipfw/sys/dev/netmap/ixgbe_netmap.h
projects/ipfw/sys/dev/netmap/netmap.c
projects/ipfw/sys/dev/netmap/netmap_freebsd.c
projects/ipfw/sys/dev/netmap/netmap_generic.c
projects/ipfw/sys/dev/netmap/netmap_kern.h
projects/ipfw/sys/dev/netmap/netmap_mbq.h
projects/ipfw/sys/dev/netmap/netmap_mem2.c
projects/ipfw/sys/dev/netmap/netmap_mem2.h
projects/ipfw/sys/dev/netmap/netmap_offloadings.c
projects/ipfw/sys/dev/netmap/netmap_pipe.c
projects/ipfw/sys/dev/netmap/netmap_vale.c
projects/ipfw/sys/dev/pci/pci.c
projects/ipfw/sys/dev/pci/pci_if.m
projects/ipfw/sys/dev/pci/pci_private.h
projects/ipfw/sys/dev/pci/pcivar.h
projects/ipfw/sys/dev/si/si.c
projects/ipfw/sys/dev/sound/usb/uaudio.c
projects/ipfw/sys/dev/usb/usbdevs
projects/ipfw/sys/dev/usb/wlan/if_run.c
projects/ipfw/sys/dev/usb/wlan/if_urtwn.c
projects/ipfw/sys/dev/virtio/network/if_vtnet.c
projects/ipfw/sys/dev/virtio/virtqueue.c
projects/ipfw/sys/dev/vt/font/vt_mouse_cursor.c
projects/ipfw/sys/dev/vt/hw/vga/vt_vga.c
projects/ipfw/sys/dev/vt/vt.h
projects/ipfw/sys/dev/vt/vt_buf.c
projects/ipfw/sys/dev/vt/vt_core.c
projects/ipfw/sys/dev/vt/vt_sysmouse.c
projects/ipfw/sys/dev/xen/blkback/blkback.c
projects/ipfw/sys/dev/xen/netback/netback.c
projects/ipfw/sys/geom/geom_dev.c
projects/ipfw/sys/i386/conf/NOTES
projects/ipfw/sys/i386/i386/pmap.c
projects/ipfw/sys/i386/xen/pmap.c
projects/ipfw/sys/kern/imgact_elf.c
projects/ipfw/sys/kern/kern_exit.c
projects/ipfw/sys/kern/kern_malloc.c
projects/ipfw/sys/kern/kern_sig.c
projects/ipfw/sys/kern/kern_umtx.c
projects/ipfw/sys/kern/uipc_socket.c
projects/ipfw/sys/kern/vfs_mount.c
projects/ipfw/sys/modules/Makefile
projects/ipfw/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
projects/ipfw/sys/modules/dtrace/fbt/Makefile
projects/ipfw/sys/net/if.c
projects/ipfw/sys/net/if_gre.c
projects/ipfw/sys/net/if_stf.c
projects/ipfw/sys/net/netmap.h
projects/ipfw/sys/net/netmap_user.h
projects/ipfw/sys/net/pfvar.h
projects/ipfw/sys/net/rtsock.c
projects/ipfw/sys/net/sff8472.h
projects/ipfw/sys/net80211/ieee80211_amrr.c
projects/ipfw/sys/netinet/cc/cc_cdg.c
projects/ipfw/sys/netinet/in.c
projects/ipfw/sys/netinet/in_gif.c
projects/ipfw/sys/netinet/ip_carp.c
projects/ipfw/sys/netinet/ip_mroute.c
projects/ipfw/sys/netinet/ip_var.h
projects/ipfw/sys/netinet/raw_ip.c
projects/ipfw/sys/netinet/sctp.h
projects/ipfw/sys/netinet/sctp_input.c
projects/ipfw/sys/netinet/sctp_output.c
projects/ipfw/sys/netinet/sctp_structs.h
projects/ipfw/sys/netinet/sctp_uio.h
projects/ipfw/sys/netinet/sctp_usrreq.c
projects/ipfw/sys/netinet/sctputil.c
projects/ipfw/sys/netinet6/in6.c
projects/ipfw/sys/netinet6/in6_gif.c
projects/ipfw/sys/netinet6/in6_proto.c
projects/ipfw/sys/netinet6/ip6_mroute.c
projects/ipfw/sys/netinet6/scope6.c
projects/ipfw/sys/netinet6/scope6_var.h
projects/ipfw/sys/netipsec/keysock.c
projects/ipfw/sys/netipsec/keysock.h
projects/ipfw/sys/netpfil/pf/if_pfsync.c
projects/ipfw/sys/netpfil/pf/pf.c
projects/ipfw/sys/netpfil/pf/pf.h
projects/ipfw/sys/netpfil/pf/pf_ioctl.c
projects/ipfw/sys/netpfil/pf/pf_lb.c
projects/ipfw/sys/ofed/include/linux/pci.h
projects/ipfw/sys/powerpc/include/vmparam.h
projects/ipfw/sys/security/audit/audit_pipe.c
projects/ipfw/sys/sparc64/sparc64/pmap.c
projects/ipfw/sys/sys/_cpuset.h
projects/ipfw/sys/sys/callout.h
projects/ipfw/sys/sys/elf_common.h
projects/ipfw/sys/sys/hhook.h
projects/ipfw/sys/sys/imgact_elf.h
projects/ipfw/sys/sys/khelp.h
projects/ipfw/sys/sys/libkern.h
projects/ipfw/sys/sys/mount.h
projects/ipfw/sys/sys/param.h
projects/ipfw/sys/sys/protosw.h
projects/ipfw/sys/sys/sf_buf.h
projects/ipfw/sys/sys/socketvar.h
projects/ipfw/sys/ufs/ffs/ffs_vfsops.c
projects/ipfw/sys/ufs/ufs/ufs_vnops.c
projects/ipfw/sys/vm/vm_fault.c
projects/ipfw/tests/sys/kern/unix_seqpacket_test.c
projects/ipfw/tools/build/make_check/Makefile
projects/ipfw/tools/build/mk/OptionalObsoleteFiles.inc
projects/ipfw/tools/tools/ath/athaggrstats/Makefile
projects/ipfw/tools/tools/ath/athstats/Makefile
projects/ipfw/tools/tools/nanobsd/dhcpd/common
projects/ipfw/tools/tools/nanobsd/nanobsd.sh
projects/ipfw/tools/tools/nanobsd/rescue/common
projects/ipfw/tools/tools/netmap/pkt-gen.c
projects/ipfw/tools/tools/netmap/vale-ctl.c
projects/ipfw/usr.bin/clang/clang-tblgen/Makefile
projects/ipfw/usr.bin/clang/clang.prog.mk
projects/ipfw/usr.bin/clang/tblgen/Makefile
projects/ipfw/usr.bin/compile_et/Makefile
projects/ipfw/usr.bin/elfdump/elfdump.c
projects/ipfw/usr.bin/grep/util.c
projects/ipfw/usr.bin/iscsictl/iscsictl.c
projects/ipfw/usr.bin/lock/lock.c
projects/ipfw/usr.bin/login/login.c
projects/ipfw/usr.bin/mail/edit.c
projects/ipfw/usr.bin/mandoc/Makefile
projects/ipfw/usr.bin/netstat/inet6.c
projects/ipfw/usr.bin/showmount/showmount.8
projects/ipfw/usr.bin/showmount/showmount.c
projects/ipfw/usr.bin/svn/svn/Makefile
projects/ipfw/usr.bin/svn/svnadmin/Makefile
projects/ipfw/usr.bin/svn/svndumpfilter/Makefile
projects/ipfw/usr.bin/svn/svnlook/Makefile
projects/ipfw/usr.bin/svn/svnmucc/Makefile
projects/ipfw/usr.bin/svn/svnrdump/Makefile
projects/ipfw/usr.bin/svn/svnserve/Makefile
projects/ipfw/usr.bin/svn/svnsync/Makefile
projects/ipfw/usr.bin/svn/svnversion/Makefile
projects/ipfw/usr.bin/telnet/Makefile
projects/ipfw/usr.bin/vacation/Makefile
projects/ipfw/usr.sbin/Makefile
projects/ipfw/usr.sbin/amd/amd/Makefile
projects/ipfw/usr.sbin/amd/amq/Makefile
projects/ipfw/usr.sbin/amd/fixmount/Makefile
projects/ipfw/usr.sbin/amd/fsinfo/Makefile
projects/ipfw/usr.sbin/amd/hlfsd/Makefile
projects/ipfw/usr.sbin/amd/mk-amd-map/Makefile
projects/ipfw/usr.sbin/amd/pawd/Makefile
projects/ipfw/usr.sbin/amd/wire-test/Makefile
projects/ipfw/usr.sbin/bhyve/virtio.c
projects/ipfw/usr.sbin/bsdconfig/share/packages/packages.subr
projects/ipfw/usr.sbin/btxld/Makefile
projects/ipfw/usr.sbin/cron/cron/Makefile
projects/ipfw/usr.sbin/cron/crontab/Makefile
projects/ipfw/usr.sbin/crunch/crunchgen/Makefile
projects/ipfw/usr.sbin/crunch/crunchide/Makefile
projects/ipfw/usr.sbin/ctld/Makefile
projects/ipfw/usr.sbin/ctld/ctld.c
projects/ipfw/usr.sbin/ctld/discovery.c
projects/ipfw/usr.sbin/ctld/kernel.c
projects/ipfw/usr.sbin/ctld/keys.c
projects/ipfw/usr.sbin/ctld/log.c
projects/ipfw/usr.sbin/ctld/login.c
projects/ipfw/usr.sbin/ctld/pdu.c
projects/ipfw/usr.sbin/editmap/Makefile
projects/ipfw/usr.sbin/fifolog/fifolog_create/Makefile
projects/ipfw/usr.sbin/fifolog/fifolog_reader/Makefile
projects/ipfw/usr.sbin/fifolog/fifolog_writer/Makefile
projects/ipfw/usr.sbin/ftp-proxy/ftp-proxy/Makefile
projects/ipfw/usr.sbin/iscsid/Makefile
projects/ipfw/usr.sbin/iscsid/discovery.c
projects/ipfw/usr.sbin/iscsid/iscsid.c
projects/ipfw/usr.sbin/iscsid/keys.c
projects/ipfw/usr.sbin/iscsid/log.c
projects/ipfw/usr.sbin/iscsid/login.c
projects/ipfw/usr.sbin/iscsid/pdu.c
projects/ipfw/usr.sbin/kbdmap/kbdmap.c
projects/ipfw/usr.sbin/kbdmap/kbdmap.h
projects/ipfw/usr.sbin/lpr/chkprintcap/Makefile
projects/ipfw/usr.sbin/lpr/lpc/Makefile
projects/ipfw/usr.sbin/lpr/lpd/Makefile
projects/ipfw/usr.sbin/lpr/lpq/Makefile
projects/ipfw/usr.sbin/lpr/lpr/Makefile
projects/ipfw/usr.sbin/lpr/lprm/Makefile
projects/ipfw/usr.sbin/lpr/pac/Makefile
projects/ipfw/usr.sbin/mailstats/Makefile
projects/ipfw/usr.sbin/makefs/Makefile
projects/ipfw/usr.sbin/makemap/Makefile
projects/ipfw/usr.sbin/mountd/exports.5
projects/ipfw/usr.sbin/mountd/mountd.c
projects/ipfw/usr.sbin/nmtree/Makefile
projects/ipfw/usr.sbin/ntp/ntp-keygen/Makefile
projects/ipfw/usr.sbin/ntp/ntpd/Makefile
projects/ipfw/usr.sbin/ntp/ntpdate/Makefile
projects/ipfw/usr.sbin/ntp/ntpdc/Makefile
projects/ipfw/usr.sbin/ntp/ntpq/Makefile
projects/ipfw/usr.sbin/ntp/ntptime/Makefile
projects/ipfw/usr.sbin/ppp/Makefile
projects/ipfw/usr.sbin/praliases/Makefile
projects/ipfw/usr.sbin/route6d/route6d.c
projects/ipfw/usr.sbin/sendmail/Makefile
projects/ipfw/usr.sbin/timed/timedc/timedc.c
Directory Properties:
projects/ipfw/ (props changed)
projects/ipfw/cddl/ (props changed)
projects/ipfw/cddl/contrib/opensolaris/ (props changed)
projects/ipfw/contrib/gcc/ (props changed)
projects/ipfw/contrib/llvm/ (props changed)
projects/ipfw/etc/ (props changed)
projects/ipfw/gnu/lib/ (props changed)
projects/ipfw/gnu/usr.bin/binutils/ (props changed)
projects/ipfw/gnu/usr.bin/gdb/ (props changed)
projects/ipfw/include/ (props changed)
projects/ipfw/lib/libc/ (props changed)
projects/ipfw/sbin/ (props changed)
projects/ipfw/share/ (props changed)
projects/ipfw/share/man/man4/ (props changed)
projects/ipfw/sys/ (props changed)
projects/ipfw/sys/amd64/vmm/ (props changed)
projects/ipfw/sys/boot/ (props changed)
projects/ipfw/sys/cddl/contrib/opensolaris/ (props changed)
projects/ipfw/sys/conf/ (props changed)
projects/ipfw/sys/gnu/dts/ (props changed)
projects/ipfw/usr.sbin/bhyve/ (props changed)
Modified: projects/ipfw/.arcconfig
==============================================================================
--- projects/ipfw/.arcconfig Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/.arcconfig Sat Aug 23 14:58:31 2014 (r270410)
@@ -1,5 +1,5 @@
{
"project.name": "S",
- "phabricator.uri" : "https://phabric.freebsd.org/",
+ "phabricator.uri" : "https://reviews.freebsd.org/",
"history.immutable" : true
}
Modified: projects/ipfw/Makefile
==============================================================================
--- projects/ipfw/Makefile Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/Makefile Sat Aug 23 14:58:31 2014 (r270410)
@@ -37,6 +37,8 @@
# xdev-build - Build cross-development tools.
# xdev-install - Install cross-development tools.
# xdev-links - Create traditional links in /usr/bin for cc, etc
+# native-xtools - Create host binaries that produce target objects
+# for use in qemu user-mode jails.
#
# "quick" way to test all kernel builds:
# _jflag=`sysctl -n hw.ncpu`
@@ -111,7 +113,7 @@ TGTS= all all-man buildenv buildenvvars
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
- xdev-links \
+ xdev-links native-xtools \
TGTS+= ${SUBDIR_TARGETS}
Modified: projects/ipfw/Makefile.inc1
==============================================================================
--- projects/ipfw/Makefile.inc1 Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/Makefile.inc1 Sat Aug 23 14:58:31 2014 (r270410)
@@ -246,7 +246,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
- SSP_CFLAGS= MK_PIE=no \
+ SSP_CFLAGS= \
MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
@@ -258,7 +258,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
- SSP_CFLAGS= MK_PIE=no \
+ SSP_CFLAGS= \
-DNO_LINT \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no MK_CLANG_FULL=no MK_LLDB=no MK_TESTS=no
@@ -276,7 +276,7 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOB
${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
- SSP_CFLAGS= MK_PIE=no \
+ SSP_CFLAGS= \
MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no
@@ -1239,11 +1239,11 @@ _lex= usr.bin/lex
_awk= usr.bin/awk
.endif
-.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree)
+.if ${MK_BSNMP} != "no"
_gensnmptree= usr.sbin/bsnmpd/gensnmptree
.endif
-# We need to build tlbgen when we're building clang either as
+# We need to build tblgen when we're building clang either as
# the bootstrap compiler, or as the part of the normal build.
.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no"
_clang_tblgen= \
@@ -1418,6 +1418,48 @@ cross-tools: .MAKE
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
.endfor
+NXBENV= MAKEOBJDIRPREFIX=${OBJTREE}/nxb \
+ INSTALL="sh ${.CURDIR}/tools/install.sh" \
+ VERSION="${VERSION}"
+NXBMAKE= ${NXBENV} ${MAKE} \
+ TBLGEN=${OBJTREE}/nxb-bin/usr/bin/tblgen \
+ CLANG_TBLGEN=${OBJTREE}/nxb-bin/usr/bin/clang-tblgen \
+ MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
+ MK_GDB=no MK_TESTS=no \
+ SSP_CFLAGS= \
+ MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
+ -DNO_PIC MK_PROFILE=no -DNO_SHARED \
+ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
+ MK_CLANG_FULL=no MK_LLDB=no
+
+native-xtools: .MAKE
+ mkdir -p ${OBJTREE}/nxb-bin/usr
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+ -p ${OBJTREE}/nxb-bin/usr >/dev/null
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
+ -p ${OBJTREE}/nxb-bin/usr/include >/dev/null
+.for _tool in \
+ ${_clang_tblgen} \
+ usr.bin/ar \
+ ${_binutils} \
+ ${_cc} \
+ ${_gcc_tools} \
+ ${_clang_libs} \
+ ${_clang} \
+ usr.bin/awk \
+ usr.bin/bmake \
+ usr.bin/lex \
+ usr.bin/lorder \
+ usr.bin/sed \
+ usr.bin/yacc
+ ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
+ cd ${.CURDIR}/${_tool} && \
+ ${NXBMAKE} DIRPRFX=${_tool}/ obj && \
+ ${NXBMAKE} DIRPRFX=${_tool}/ depend && \
+ ${NXBMAKE} DIRPRFX=${_tool}/ all && \
+ ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${OBJTREE}/nxb-bin install
+.endfor
+
#
# hierarchy - ensure that all the needed directories are present
#
Modified: projects/ipfw/ObsoleteFiles.inc
==============================================================================
--- projects/ipfw/ObsoleteFiles.inc Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/ObsoleteFiles.inc Sat Aug 23 14:58:31 2014 (r270410)
@@ -38,6 +38,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20140814: libopie version bump
+OLD_LIBS+=usr/lib/libopie.so.7
+OLD_LIBS+=usr/lib32/libopie.so.7
# 20140811: otp-sha renamed to otp-sha1
OLD_FILES+=usr/bin/otp-sha
OLD_FILES+=usr/share/man/man1/otp-sha.1.gz
Modified: projects/ipfw/bin/ed/cbc.c
==============================================================================
--- projects/ipfw/bin/ed/cbc.c Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/ed/cbc.c Sat Aug 23 14:58:31 2014 (r270410)
@@ -237,7 +237,7 @@ expand_des_key(char *obuf, char *kbuf)
/*
* now translate it, bombing on any illegal hex digit
*/
- for (i = 0; kbuf[i] && i < 16; i++)
+ for (i = 0; i < 16 && kbuf[i]; i++)
if ((nbuf[i] = hex_to_binary((int) kbuf[i], 16)) == -1)
des_error("bad hex digit in key");
while (i < 16)
Modified: projects/ipfw/bin/pkill/tests/Makefile
==============================================================================
--- projects/ipfw/bin/pkill/tests/Makefile Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/pkill/tests/Makefile Sat Aug 23 14:58:31 2014 (r270410)
@@ -14,6 +14,7 @@ TAP_TESTS_SH+= pgrep-g_test
TAP_TESTS_SH+= pgrep-i_test
TAP_TESTS_SH+= pgrep-j_test
TEST_METADATA.pgrep-j_test+= required_user="root"
+TEST_METADATA.pgrep-j_test+= required_programs="jail jls"
TAP_TESTS_SH+= pgrep-l_test
TAP_TESTS_SH+= pgrep-n_test
TAP_TESTS_SH+= pgrep-o_test
@@ -31,6 +32,7 @@ TAP_TESTS_SH+= pkill-g_test
TAP_TESTS_SH+= pkill-i_test
TAP_TESTS_SH+= pkill-j_test
TEST_METADATA.pkill-j_test+= required_user="root"
+TEST_METADATA.pkill-j_test+= required_programs="jail jls"
TAP_TESTS_SH+= pkill-s_test
TAP_TESTS_SH+= pkill-t_test
TAP_TESTS_SH+= pkill-x_test
Modified: projects/ipfw/bin/rmail/Makefile
==============================================================================
--- projects/ipfw/bin/rmail/Makefile Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/rmail/Makefile Sat Aug 23 14:58:31 2014 (r270410)
@@ -14,8 +14,6 @@ MAN= rmail.8
WARNS?= 2
CFLAGS+=-I${SENDMAIL_DIR}/include -I.
-NO_PIE= yes
-
LIBSMDIR= ${.OBJDIR}/../../lib/libsm
LIBSM= ${LIBSMDIR}/libsm.a
Modified: projects/ipfw/bin/sh/arith_yacc.c
==============================================================================
--- projects/ipfw/bin/sh/arith_yacc.c Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/arith_yacc.c Sat Aug 23 14:58:31 2014 (r270410)
@@ -139,9 +139,9 @@ static arith_t do_binop(int op, arith_t
case ARITH_SUB:
return (uintmax_t)a - (uintmax_t)b;
case ARITH_LSHIFT:
- return (uintmax_t)a << b;
+ return (uintmax_t)a << (b & (sizeof(uintmax_t) * CHAR_BIT - 1));
case ARITH_RSHIFT:
- return a >> b;
+ return a >> (b & (sizeof(uintmax_t) * CHAR_BIT - 1));
case ARITH_LT:
return a < b;
case ARITH_LE:
Modified: projects/ipfw/bin/sh/histedit.c
==============================================================================
--- projects/ipfw/bin/sh/histedit.c Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/histedit.c Sat Aug 23 14:58:31 2014 (r270410)
@@ -166,9 +166,10 @@ sethistsize(const char *hs)
HistEvent he;
if (hist != NULL) {
- if (hs == NULL || *hs == '\0' ||
- (histsize = atoi(hs)) < 0)
+ if (hs == NULL || !is_number(hs))
histsize = 100;
+ else
+ histsize = atoi(hs);
history(hist, &he, H_SETSIZE, histsize);
history(hist, &he, H_SETUNIQUE, 1);
}
Modified: projects/ipfw/bin/sh/mystring.c
==============================================================================
--- projects/ipfw/bin/sh/mystring.c Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/mystring.c Sat Aug 23 14:58:31 2014 (r270410)
@@ -82,9 +82,17 @@ number(const char *s)
int
is_number(const char *p)
{
- do {
- if (! is_digit(*p))
+ const char *q;
+
+ if (*p == '\0')
+ return 0;
+ while (*p == '0')
+ p++;
+ for (q = p; *q != '\0'; q++)
+ if (! is_digit(*q))
return 0;
- } while (*++p != '\0');
+ if (q - p > 10 ||
+ (q - p == 10 && memcmp(p, "2147483647", 10) > 0))
+ return 0;
return 1;
}
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp2.2
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp2.2 Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp2.2 Sat Aug 23 14:58:31 2014 (r270410)
@@ -1,2 +1,2 @@
# $FreeBSD$
-${}
+eval '${}'
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp2.2.stderr
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp2.2.stderr Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp2.2.stderr Sat Aug 23 14:58:31 2014 (r270410)
@@ -1 +1 @@
-./bad-parm-exp2.2: ${}: Bad substitution
+eval: ${}: Bad substitution
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp3.2
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp3.2 Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp3.2 Sat Aug 23 14:58:31 2014 (r270410)
@@ -1,2 +1,2 @@
# $FreeBSD$
-${foo/}
+eval '${foo/}'
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp3.2.stderr
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp3.2.stderr Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp3.2.stderr Sat Aug 23 14:58:31 2014 (r270410)
@@ -1 +1 @@
-./bad-parm-exp3.2: ${foo/}: Bad substitution
+eval: ${foo/}: Bad substitution
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp4.2
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp4.2 Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp4.2 Sat Aug 23 14:58:31 2014 (r270410)
@@ -1,2 +1,2 @@
# $FreeBSD$
-${foo:@abc}
+eval '${foo:@abc}'
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp4.2.stderr
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp4.2.stderr Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp4.2.stderr Sat Aug 23 14:58:31 2014 (r270410)
@@ -1 +1 @@
-./bad-parm-exp4.2: ${foo:@...}: Bad substitution
+eval: ${foo:@...}: Bad substitution
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp5.2
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp5.2 Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp5.2 Sat Aug 23 14:58:31 2014 (r270410)
@@ -1,2 +1,2 @@
# $FreeBSD$
-${/}
+eval '${/}'
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp5.2.stderr
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp5.2.stderr Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp5.2.stderr Sat Aug 23 14:58:31 2014 (r270410)
@@ -1 +1 @@
-./bad-parm-exp5.2: ${/}: Bad substitution
+eval: ${/}: Bad substitution
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp6.2
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp6.2 Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp6.2 Sat Aug 23 14:58:31 2014 (r270410)
@@ -1,2 +1,2 @@
# $FreeBSD$
-${#foo^}
+eval '${#foo^}'
Modified: projects/ipfw/bin/sh/tests/errors/bad-parm-exp6.2.stderr
==============================================================================
--- projects/ipfw/bin/sh/tests/errors/bad-parm-exp6.2.stderr Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/errors/bad-parm-exp6.2.stderr Sat Aug 23 14:58:31 2014 (r270410)
@@ -1 +1 @@
-./bad-parm-exp6.2: ${foo...}: Bad substitution
+eval: ${foo...}: Bad substitution
Modified: projects/ipfw/bin/sh/tests/expansion/Makefile
==============================================================================
--- projects/ipfw/bin/sh/tests/expansion/Makefile Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/expansion/Makefile Sat Aug 23 14:58:31 2014 (r270410)
@@ -20,6 +20,7 @@ FILES+= arith10.0
FILES+= arith11.0
FILES+= arith12.0
FILES+= arith13.0
+FILES+= arith14.0
FILES+= assign1.0
FILES+= cmdsubst1.0
FILES+= cmdsubst2.0
Copied: projects/ipfw/bin/sh/tests/expansion/arith14.0 (from r270409, head/bin/sh/tests/expansion/arith14.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/ipfw/bin/sh/tests/expansion/arith14.0 Sat Aug 23 14:58:31 2014 (r270410, copy of r270409, head/bin/sh/tests/expansion/arith14.0)
@@ -0,0 +1,40 @@
+# $FreeBSD$
+# Check that <</>> use the low bits of the shift count.
+
+if [ $((1<<16<<16)) = 0 ]; then
+ width=32
+elif [ $((1<<32<<32)) = 0 ]; then
+ width=64
+elif [ $((1<<64<<64)) = 0 ]; then
+ width=128
+elif [ $((1<<64>>64)) = 1 ]; then
+ # Integers are wider than 128 bits; assume arbitrary precision.
+ # Nothing to test here.
+ exit 0
+else
+ echo "Cannot determine integer width"
+ exit 2
+fi
+
+twowidth=$((width * 2))
+j=43 k=$((1 << (width - 2))) r=0
+
+i=0
+while [ $i -lt $twowidth ]; do
+ if [ "$((j << i))" != "$((j << (i + width)))" ]; then
+ echo "Problem with $j << $i"
+ r=2
+ fi
+ i=$((i + 1))
+done
+
+i=0
+while [ $i -lt $twowidth ]; do
+ if [ "$((k >> i))" != "$((k >> (i + width)))" ]; then
+ echo "Problem with $k >> $i"
+ r=2
+ fi
+ i=$((i + 1))
+done
+
+exit $r
Modified: projects/ipfw/bin/sh/tests/functional_test.sh
==============================================================================
--- projects/ipfw/bin/sh/tests/functional_test.sh Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/bin/sh/tests/functional_test.sh Sat Aug 23 14:58:31 2014 (r270410)
@@ -39,13 +39,7 @@ check()
local out_file="${SRCDIR}/${tc}.stdout"
[ -f "${out_file}" ] && out_flag="-o file:${out_file}"
- # We need to copy the testcase scenario file because some of the
- # testcases hardcode relative paths in the stderr/stdout.
- #
- # TODO: we might be able to generate this path at build time
- cp ${SRCDIR}/${tc} .
-
- atf_check -s exit:${tc##*.} ${err_flag} ${out_flag} ${SH} "./${tc}"
+ atf_check -s exit:${tc##*.} ${err_flag} ${out_flag} ${SH} "${SRCDIR}/${tc}"
}
add_testcase()
Modified: projects/ipfw/cddl/Makefile.inc
==============================================================================
--- projects/ipfw/cddl/Makefile.inc Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/Makefile.inc Sat Aug 23 14:58:31 2014 (r270410)
@@ -8,7 +8,6 @@ IGNORE_PRAGMA= YES
CFLAGS+= -DNEED_SOLARIS_BOOLEAN
WARNS?= 6
-CSTD?= gnu89
# Do not lint the CDDL stuff. It is all externally maintained and
# lint output is wasteful noise here.
Modified: projects/ipfw/cddl/contrib/opensolaris/cmd/lockstat/sym.c
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/cmd/lockstat/sym.c Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/contrib/opensolaris/cmd/lockstat/sym.c Sat Aug 23 14:58:31 2014 (r270410)
@@ -50,6 +50,9 @@
/* FreeBSD */
#include <sys/elf.h>
#include <sys/ksyms.h>
+#include <sys/param.h>
+#include <sys/module.h>
+#include <sys/linker.h>
#endif
#include <sys/cpuvar.h>
Modified: projects/ipfw/cddl/contrib/opensolaris/head/libintl.h
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/head/libintl.h Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/contrib/opensolaris/head/libintl.h Sat Aug 23 14:58:31 2014 (r270410)
@@ -19,6 +19,8 @@
* CDDL HEADER END
*/
/*
+ * Copyright 2014 Garrett D'Amore <garrett at damore.org>
+ *
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -27,8 +29,6 @@
#ifndef _LIBINTL_H
#define _LIBINTL_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/isa_defs.h>
#ifdef __cplusplus
@@ -64,7 +64,6 @@ typedef long wchar_t;
#define __GNU_GETTEXT_SUPPORTED_REVISION(m) \
((((m) == 0) || ((m) == 1)) ? 1 : -1)
-#ifdef __STDC__
extern char *dcgettext(const char *, const char *, const int);
extern char *dgettext(const char *, const char *);
extern char *gettext(const char *);
@@ -91,33 +90,6 @@ extern wchar_t *wddelim(wchar_t, wchar_t
extern wchar_t mcfiller(void);
extern int mcwrap(void);
-#else
-extern char *dcgettext();
-extern char *dgettext();
-extern char *gettext();
-extern char *textdomain();
-extern char *bindtextdomain();
-
-/*
- * LI18NUX 2000 Globalization Specification Version 1.0
- * with Amendment 2
- */
-extern char *dcngettext();
-extern char *dngettext();
-extern char *ngettext();
-extern char *bind_textdomain_codeset();
-
-/* Word handling functions --- requires dynamic linking */
-/* Warning: these are experimental and subject to change. */
-extern int wdinit();
-extern int wdchkind();
-extern int wdbindf();
-extern wchar_t *wddelim();
-extern wchar_t mcfiller();
-extern int mcwrap();
-
-#endif
-
#ifdef __cplusplus
}
#endif
Modified: projects/ipfw/cddl/contrib/opensolaris/head/nlist.h
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/head/nlist.h Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/contrib/opensolaris/head/nlist.h Sat Aug 23 14:58:31 2014 (r270410)
@@ -19,6 +19,9 @@
*
* CDDL HEADER END
*/
+/*
+ * Copyright 2014 Garrett D'Amore <garrett at damore.org>
+ */
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
@@ -26,8 +29,6 @@
#ifndef _NLIST_H
#define _NLIST_H
-#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.8.2.4 */
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -41,11 +42,7 @@ struct nlist {
char n_numaux; /* number of aux. entries */
};
-#if defined(__STDC__)
extern int nlist(const char *, struct nlist *);
-#else /* __STDC__ */
-extern int nlist();
-#endif /* __STDC__ */
#ifdef __cplusplus
}
Modified: projects/ipfw/cddl/contrib/opensolaris/head/synch.h
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/head/synch.h Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/contrib/opensolaris/head/synch.h Sat Aug 23 14:58:31 2014 (r270410)
@@ -20,6 +20,7 @@
*/
/*
+ * Copyright 2014 Garrett D'Amore <garrett at damore.org>
* Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
*/
@@ -86,7 +87,6 @@ typedef struct _rwlock {
cond_t writercv; /* used only to indicate ownership */
} rwlock_t;
-#ifdef __STDC__
int _lwp_mutex_lock(lwp_mutex_t *);
int _lwp_mutex_unlock(lwp_mutex_t *);
int _lwp_mutex_trylock(lwp_mutex_t *);
@@ -127,50 +127,6 @@ int sema_reltimedwait(sema_t *, const ti
int sema_post(sema_t *);
int sema_trywait(sema_t *);
-#else /* __STDC__ */
-
-int _lwp_mutex_lock();
-int _lwp_mutex_unlock();
-int _lwp_mutex_trylock();
-int _lwp_cond_wait();
-int _lwp_cond_timedwait();
-int _lwp_cond_reltimedwait();
-int _lwp_cond_signal();
-int _lwp_cond_broadcast();
-int _lwp_sema_init();
-int _lwp_sema_wait();
-int _lwp_sema_trywait();
-int _lwp_sema_post();
-int cond_init();
-int cond_destroy();
-int cond_wait();
-int cond_timedwait();
-int cond_reltimedwait();
-int cond_signal();
-int cond_broadcast();
-int mutex_init();
-int mutex_destroy();
-int mutex_consistent();
-int mutex_lock();
-int mutex_trylock();
-int mutex_unlock();
-int rwlock_init();
-int rwlock_destroy();
-int rw_rdlock();
-int rw_wrlock();
-int rw_unlock();
-int rw_tryrdlock();
-int rw_trywrlock();
-int sema_init();
-int sema_destroy();
-int sema_wait();
-int sema_timedwait();
-int sema_reltimedwait();
-int sema_post();
-int sema_trywait();
-
-#endif /* __STDC__ */
-
#endif /* _ASM */
/* "Magic numbers" tagging synchronization object types */
@@ -238,8 +194,6 @@ int sema_trywait();
#ifndef _ASM
-#ifdef __STDC__
-
/*
* The *_held() functions apply equally well to Solaris threads
* and to Posix threads synchronization objects, but the formal
@@ -252,21 +206,8 @@ int _rw_read_held(void *); /* rwlock_t
int _rw_write_held(void *); /* rwlock_t or pthread_rwlock_t */
int _mutex_held(void *); /* mutex_t or pthread_mutex_t */
-#else /* __STDC__ */
-
-int _sema_held();
-int _rw_read_held();
-int _rw_write_held();
-int _mutex_held();
-
-#endif /* __STDC__ */
-
/* Pause API */
-#ifdef __STDC__
void smt_pause(void);
-#else /* __STDC__ */
-void smt_pause();
-#endif /* __STDC__ */
#endif /* _ASM */
Modified: projects/ipfw/cddl/contrib/opensolaris/head/thread.h
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/head/thread.h Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/contrib/opensolaris/head/thread.h Sat Aug 23 14:58:31 2014 (r270410)
@@ -20,6 +20,8 @@
*/
/*
+ * Copyright 2014 Garrett D'Amore <garrett at damore.org>
+ *
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -27,8 +29,6 @@
#ifndef _THREAD_H
#define _THREAD_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <pthread.h>
#include <pthread_np.h>
#include <assert.h>
Modified: projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Sat Aug 23 14:58:31 2014 (r270410)
@@ -723,6 +723,11 @@ extern int _dtrace_argmax; /* default m
extern const char *_dtrace_libdir; /* default library directory */
extern const char *_dtrace_moddir; /* default kernel module directory */
+#ifdef __FreeBSD__
+extern int gmatch(const char *, const char *);
+extern int yylex(void);
+#endif
+
#ifdef __cplusplus
}
#endif
Modified: projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sat Aug 23 14:58:31 2014 (r270410)
@@ -29,6 +29,11 @@
#if defined(sun)
#include <sys/modctl.h>
#include <sys/systeminfo.h>
+#else
+/* FreeBSD */
+#include <sys/param.h>
+#include <sys/module.h>
+#include <sys/linker.h>
#endif
#include <sys/resource.h>
Modified: projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c Sat Aug 23 14:58:31 2014 (r270410)
@@ -36,6 +36,7 @@
#include <stdio.h>
#include <sys/types.h>
+#include <sys/sysctl.h>
#include <sys/stat.h>
#include <dt_parser.h>
Modified: projects/ipfw/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c Sat Aug 23 14:58:31 2014 (r270410)
@@ -42,6 +42,7 @@
#include <widec.h>
#include "_range.h"
#else
+#include <ctype.h>
/* DOODAD */ static int multibyte = 0;
#define WCHAR_CSMASK 0x30000000
#define valid_range(c1, c2) \
Modified: projects/ipfw/cddl/lib/libdtrace/libproc_compat.h
==============================================================================
--- projects/ipfw/cddl/lib/libdtrace/libproc_compat.h Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/cddl/lib/libdtrace/libproc_compat.h Sat Aug 23 14:58:31 2014 (r270410)
@@ -43,6 +43,7 @@
#define Pcreate_error strerror
#define Pdelbkpt proc_bkptdel
#define Pgrab_error strerror
+#define Plmid(p, a, l) (-1)
#define Plmid_to_map(p, l, o) proc_obj2map((p), (o))
#define Plookup_by_addr proc_addr2sym
#define Pname_to_ctf(p, obj) NULL
Modified: projects/ipfw/contrib/gcc/config/i386/emmintrin.h
==============================================================================
--- projects/ipfw/contrib/gcc/config/i386/emmintrin.h Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/contrib/gcc/config/i386/emmintrin.h Sat Aug 23 14:58:31 2014 (r270410)
@@ -1193,7 +1193,7 @@ _mm_srli_epi64 (__m128i __A, int __B)
#define _mm_srli_epi32(__A, __B) \
((__m128i)__builtin_ia32_psrldi128 ((__v4si)(__A), __B))
#define _mm_srli_epi64(__A, __B) \
- ((__m128i)__builtin_ia32_psrlqi128 ((__v4si)(__A), __B))
+ ((__m128i)__builtin_ia32_psrlqi128 ((__v2di)(__A), __B))
#endif
static __inline __m128i __attribute__((__always_inline__))
Modified: projects/ipfw/contrib/llvm/include/llvm/Support/ELF.h
==============================================================================
--- projects/ipfw/contrib/llvm/include/llvm/Support/ELF.h Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/contrib/llvm/include/llvm/Support/ELF.h Sat Aug 23 14:58:31 2014 (r270410)
@@ -437,6 +437,7 @@ enum {
R_PPC_GOT16_LO = 15,
R_PPC_GOT16_HI = 16,
R_PPC_GOT16_HA = 17,
+ R_PPC_PLTREL24 = 18,
R_PPC_REL32 = 26,
R_PPC_TLS = 67,
R_PPC_DTPMOD32 = 68,
Modified: projects/ipfw/contrib/llvm/lib/Object/ELF.cpp
==============================================================================
--- projects/ipfw/contrib/llvm/lib/Object/ELF.cpp Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/contrib/llvm/lib/Object/ELF.cpp Sat Aug 23 14:58:31 2014 (r270410)
@@ -507,6 +507,7 @@ StringRef getELFRelocationTypeName(uint3
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_GOT16_LO);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_GOT16_HI);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_GOT16_HA);
+ LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_PLTREL24);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_REL32);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_TLS);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_PPC_DTPMOD32);
Modified: projects/ipfw/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
==============================================================================
--- projects/ipfw/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp Sat Aug 23 14:58:31 2014 (r270410)
@@ -18,6 +18,7 @@
#include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCInst.h"
#include "llvm/MC/MCInstrInfo.h"
+#include "llvm/MC/MCSymbol.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetOpcodes.h"
@@ -294,10 +295,16 @@ void PPCInstPrinter::printMemRegReg(cons
void PPCInstPrinter::printTLSCall(const MCInst *MI, unsigned OpNo,
raw_ostream &O) {
- printBranchOperand(MI, OpNo, O);
+ // On PPC64, VariantKind is VK_None, but on PPC32, it's VK_PLT, and it must
+ // come at the _end_ of the expression.
+ const MCOperand &Op = MI->getOperand(OpNo);
+ const MCSymbolRefExpr &refExp = cast<MCSymbolRefExpr>(*Op.getExpr());
+ O << refExp.getSymbol().getName();
O << '(';
printOperand(MI, OpNo+1, O);
O << ')';
+ if (refExp.getKind() != MCSymbolRefExpr::VK_None)
+ O << '@' << MCSymbolRefExpr::getVariantKindName(refExp.getKind());
}
Modified: projects/ipfw/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
==============================================================================
--- projects/ipfw/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp Sat Aug 23 14:58:31 2014 (r270410)
@@ -64,7 +64,15 @@ unsigned PPCELFObjectWriter::getRelocTyp
llvm_unreachable("Unimplemented");
case PPC::fixup_ppc_br24:
case PPC::fixup_ppc_br24abs:
- Type = ELF::R_PPC_REL24;
+ switch (Modifier) {
+ default: llvm_unreachable("Unsupported Modifier");
+ case MCSymbolRefExpr::VK_None:
+ Type = ELF::R_PPC_REL24;
+ break;
+ case MCSymbolRefExpr::VK_PLT:
+ Type = ELF::R_PPC_PLTREL24;
+ break;
+ }
break;
case PPC::fixup_ppc_brcond14:
case PPC::fixup_ppc_brcond14abs:
@@ -205,7 +213,10 @@ unsigned PPCELFObjectWriter::getRelocTyp
Type = ELF::R_PPC64_DTPREL16_HIGHESTA;
break;
case MCSymbolRefExpr::VK_PPC_GOT_TLSGD:
- Type = ELF::R_PPC64_GOT_TLSGD16;
+ if (is64Bit())
+ Type = ELF::R_PPC64_GOT_TLSGD16;
+ else
+ Type = ELF::R_PPC_GOT_TLSGD16;
break;
case MCSymbolRefExpr::VK_PPC_GOT_TLSGD_LO:
Type = ELF::R_PPC64_GOT_TLSGD16_LO;
@@ -217,7 +228,10 @@ unsigned PPCELFObjectWriter::getRelocTyp
Type = ELF::R_PPC64_GOT_TLSGD16_HA;
break;
case MCSymbolRefExpr::VK_PPC_GOT_TLSLD:
- Type = ELF::R_PPC64_GOT_TLSLD16;
+ if (is64Bit())
+ Type = ELF::R_PPC64_GOT_TLSLD16;
+ else
+ Type = ELF::R_PPC_GOT_TLSLD16;
break;
case MCSymbolRefExpr::VK_PPC_GOT_TLSLD_LO:
Type = ELF::R_PPC64_GOT_TLSLD16_LO;
@@ -313,13 +327,22 @@ unsigned PPCELFObjectWriter::getRelocTyp
switch (Modifier) {
default: llvm_unreachable("Unsupported Modifier");
case MCSymbolRefExpr::VK_PPC_TLSGD:
- Type = ELF::R_PPC64_TLSGD;
+ if (is64Bit())
+ Type = ELF::R_PPC64_TLSGD;
+ else
+ Type = ELF::R_PPC_TLSGD;
break;
case MCSymbolRefExpr::VK_PPC_TLSLD:
- Type = ELF::R_PPC64_TLSLD;
+ if (is64Bit())
+ Type = ELF::R_PPC64_TLSLD;
+ else
+ Type = ELF::R_PPC_TLSLD;
break;
case MCSymbolRefExpr::VK_PPC_TLS:
- Type = ELF::R_PPC64_TLS;
+ if (is64Bit())
+ Type = ELF::R_PPC64_TLS;
+ else
+ Type = ELF::R_PPC_TLS;
break;
}
break;
Modified: projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPC.h
==============================================================================
--- projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPC.h Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPC.h Sat Aug 23 14:58:31 2014 (r270410)
@@ -53,10 +53,11 @@ namespace llvm {
// PPC Specific MachineOperand flags.
MO_NO_FLAG,
- /// MO_DARWIN_STUB - On a symbol operand "FOO", this indicates that the
- /// reference is actually to the "FOO$stub" symbol. This is used for calls
- /// and jumps to external functions on Tiger and earlier.
- MO_DARWIN_STUB = 1,
+ /// MO_PLT_OR_STUB - On a symbol operand "FOO", this indicates that the
+ /// reference is actually to the "FOO$stub" or "FOO at plt" symbol. This is
+ /// used for calls and jumps to external functions on Tiger and earlier, and
+ /// for PIC calls on Linux and ELF systems.
+ MO_PLT_OR_STUB = 1,
/// MO_PIC_FLAG - If this bit is set, the symbol reference is relative to
/// the function's picbase, e.g. lo16(symbol-picbase).
Modified: projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
==============================================================================
--- projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp Sat Aug 23 14:42:53 2014 (r270409)
+++ projects/ipfw/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp Sat Aug 23 14:58:31 2014 (r270410)
@@ -19,6 +19,7 @@
#define DEBUG_TYPE "asmprinter"
#include "PPC.h"
#include "InstPrinter/PPCInstPrinter.h"
+#include "PPCMachineFunctionInfo.h"
#include "MCTargetDesc/PPCPredicates.h"
#include "MCTargetDesc/PPCMCExpr.h"
#include "PPCSubtarget.h"
@@ -29,6 +30,7 @@
#include "llvm/ADT/StringExtras.h"
#include "llvm/Assembly/Writer.h"
#include "llvm/CodeGen/AsmPrinter.h"
+#include "llvm/CodeGen/MachineConstantPool.h"
#include "llvm/CodeGen/MachineFunctionPass.h"
#include "llvm/CodeGen/MachineInstr.h"
#include "llvm/CodeGen/MachineInstrBuilder.h"
@@ -100,6 +102,7 @@ namespace {
}
bool doFinalization(Module &M);
+ void EmitStartOfAsmFile(Module &M);
virtual void EmitFunctionEntryLabel();
@@ -325,6 +328,7 @@ MCSymbol *PPCAsmPrinter::lookUpOrCreateT
///
void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) {
MCInst TmpInst;
+ bool isPPC64 = Subtarget.isPPC64();
// Lower multi-instruction pseudo operations.
switch (MI->getOpcode()) {
@@ -349,6 +353,66 @@ void PPCAsmPrinter::EmitInstruction(cons
OutStreamer.EmitLabel(PICBase);
return;
}
+ case PPC::GetGBRO: {
+ // Get the offset from the GOT Base Register to the GOT
+ LowerPPCMachineInstrToMCInst(MI, TmpInst, *this, Subtarget.isDarwin());
+ MCSymbol *PICOffset = MF->getInfo<PPCFunctionInfo>()->getPICOffsetSymbol();
+ TmpInst.setOpcode(PPC::LWZ);
+ const MCExpr *Exp =
+ MCSymbolRefExpr::Create(PICOffset, MCSymbolRefExpr::VK_None, OutContext);
+ const MCExpr *PB =
+ MCSymbolRefExpr::Create(MF->getPICBaseSymbol(),
+ MCSymbolRefExpr::VK_None,
+ OutContext);
+ const MCOperand MO = TmpInst.getOperand(1);
+ TmpInst.getOperand(1) = MCOperand::CreateExpr(MCBinaryExpr::CreateSub(Exp,
+ PB,
+ OutContext));
+ TmpInst.addOperand(MO);
+ OutStreamer.EmitInstruction(TmpInst);
+ return;
+ }
+ case PPC::UpdateGBR: {
+ // Update the GOT Base Register to point to the GOT. It may be possible to
+ // merge this with the PPC::GetGBRO, doing it all in one step.
+ LowerPPCMachineInstrToMCInst(MI, TmpInst, *this, Subtarget.isDarwin());
+ TmpInst.setOpcode(PPC::ADD4);
+ TmpInst.addOperand(TmpInst.getOperand(0));
+ OutStreamer.EmitInstruction(TmpInst);
+ return;
+ }
+ case PPC::LWZtoc: {
+ // Transform %X3 = LWZtoc <ga:@min1>, %X2
+ LowerPPCMachineInstrToMCInst(MI, TmpInst, *this, Subtarget.isDarwin());
+
+ // Change the opcode to LWZ, and the global address operand to be a
+ // reference to the GOT entry we will synthesize later.
+ TmpInst.setOpcode(PPC::LWZ);
+ const MachineOperand &MO = MI->getOperand(1);
+
+ // Map symbol -> label of TOC entry
+ assert(MO.isGlobal() || MO.isCPI() || MO.isJTI());
+ MCSymbol *MOSymbol = NULL;
+ if (MO.isGlobal())
+ MOSymbol = getSymbol(MO.getGlobal());
+ else if (MO.isCPI())
+ MOSymbol = GetCPISymbol(MO.getIndex());
+ else if (MO.isJTI())
+ MOSymbol = GetJTISymbol(MO.getIndex());
+
+ MCSymbol *TOCEntry = lookUpOrCreateTOCEntry(MOSymbol);
+
+ const MCExpr *Exp =
+ MCSymbolRefExpr::Create(TOCEntry, MCSymbolRefExpr::VK_None,
+ OutContext);
+ const MCExpr *PB =
+ MCSymbolRefExpr::Create(OutContext.GetOrCreateSymbol(Twine(".L.TOC.")),
+ OutContext);
+ Exp = MCBinaryExpr::CreateSub(Exp, PB, OutContext);
+ TmpInst.getOperand(1) = MCOperand::CreateExpr(Exp);
+ OutStreamer.EmitInstruction(TmpInst);
+ return;
+ }
case PPC::LDtocJTI:
case PPC::LDtocCPT:
case PPC::LDtoc: {
@@ -518,12 +582,13 @@ void PPCAsmPrinter::EmitInstruction(cons
.addExpr(SymGotTprel));
return;
}
- case PPC::LDgotTprelL: {
+ case PPC::LDgotTprelL:
+ case PPC::LDgotTprelL32: {
// Transform %Xd = LDgotTprelL <ga:@sym>, %Xs
LowerPPCMachineInstrToMCInst(MI, TmpInst, *this, Subtarget.isDarwin());
// Change the opcode to LD.
- TmpInst.setOpcode(PPC::LD);
+ TmpInst.setOpcode(isPPC64 ? PPC::LD : PPC::LWZ);
const MachineOperand &MO = MI->getOperand(1);
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = getSymbol(GValue);
@@ -534,6 +599,52 @@ void PPCAsmPrinter::EmitInstruction(cons
OutStreamer.EmitInstruction(TmpInst);
return;
}
+
+ case PPC::PPC32PICGOT: {
+ MCSymbol *GOTSymbol = OutContext.GetOrCreateSymbol(StringRef("_GLOBAL_OFFSET_TABLE_"));
+ MCSymbol *GOTRef = OutContext.CreateTempSymbol();
+ MCSymbol *NextInstr = OutContext.CreateTempSymbol();
+
+ OutStreamer.EmitInstruction(MCInstBuilder(PPC::BL)
+ // FIXME: We would like an efficient form for this, so we don't have to do
+ // a lot of extra uniquing.
+ .addExpr(MCSymbolRefExpr::Create(NextInstr, OutContext)));
+ const MCExpr *OffsExpr =
+ MCBinaryExpr::CreateSub(MCSymbolRefExpr::Create(GOTSymbol, OutContext),
+ MCSymbolRefExpr::Create(GOTRef, OutContext),
+ OutContext);
+ OutStreamer.EmitLabel(GOTRef);
+ OutStreamer.EmitValue(OffsExpr, 4);
+ OutStreamer.EmitLabel(NextInstr);
+ OutStreamer.EmitInstruction(MCInstBuilder(PPC::MFLR)
+ .addReg(MI->getOperand(0).getReg()));
+ OutStreamer.EmitInstruction(MCInstBuilder(PPC::LWZ)
+ .addReg(MI->getOperand(1).getReg())
+ .addImm(0)
+ .addReg(MI->getOperand(0).getReg()));
+ OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADD4)
+ .addReg(MI->getOperand(0).getReg())
+ .addReg(MI->getOperand(1).getReg())
+ .addReg(MI->getOperand(0).getReg()));
+ return;
+ }
+ case PPC::PPC32GOT: {
+ MCSymbol *GOTSymbol = OutContext.GetOrCreateSymbol(StringRef("_GLOBAL_OFFSET_TABLE_"));
+ const MCExpr *SymGotTlsL =
+ MCSymbolRefExpr::Create(GOTSymbol, MCSymbolRefExpr::VK_PPC_LO,
+ OutContext);
+ const MCExpr *SymGotTlsHA =
+ MCSymbolRefExpr::Create(GOTSymbol, MCSymbolRefExpr::VK_PPC_HA,
+ OutContext);
+ OutStreamer.EmitInstruction(MCInstBuilder(PPC::LI)
+ .addReg(MI->getOperand(0).getReg())
+ .addExpr(SymGotTlsL));
+ OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDIS)
+ .addReg(MI->getOperand(0).getReg())
+ .addReg(MI->getOperand(0).getReg())
+ .addExpr(SymGotTlsHA));
+ return;
+ }
case PPC::ADDIStlsgdHA: {
// Transform: %Xd = ADDIStlsgdHA %X2, <ga:@sym>
// Into: %Xd = ADDIS8 %X2, sym at got@tlsgd at ha
@@ -550,38 +661,50 @@ void PPCAsmPrinter::EmitInstruction(cons
.addExpr(SymGotTlsGD));
return;
}
- case PPC::ADDItlsgdL: {
+ case PPC::ADDItlsgdL:
// Transform: %Xd = ADDItlsgdL %Xs, <ga:@sym>
// Into: %Xd = ADDI8 %Xs, sym at got@tlsgd at l
- assert(Subtarget.isPPC64() && "Not supported for 32-bit PowerPC");
+ case PPC::ADDItlsgdL32: {
+ // Transform: %Rd = ADDItlsgdL32 %Rs, <ga:@sym>
+ // Into: %Rd = ADDI %Rs, sym at got@tlsgd
const MachineOperand &MO = MI->getOperand(2);
const GlobalValue *GValue = MO.getGlobal();
MCSymbol *MOSymbol = getSymbol(GValue);
const MCExpr *SymGotTlsGD =
- MCSymbolRefExpr::Create(MOSymbol, MCSymbolRefExpr::VK_PPC_GOT_TLSGD_LO,
+ MCSymbolRefExpr::Create(MOSymbol, Subtarget.isPPC64() ?
+ MCSymbolRefExpr::VK_PPC_GOT_TLSGD_LO :
+ MCSymbolRefExpr::VK_PPC_GOT_TLSGD,
OutContext);
- OutStreamer.EmitInstruction(MCInstBuilder(PPC::ADDI8)
- .addReg(MI->getOperand(0).getReg())
- .addReg(MI->getOperand(1).getReg())
- .addExpr(SymGotTlsGD));
+ OutStreamer.EmitInstruction(MCInstBuilder(Subtarget.isPPC64() ? PPC::ADDI8 : PPC::ADDI)
+ .addReg(MI->getOperand(0).getReg())
+ .addReg(MI->getOperand(1).getReg())
+ .addExpr(SymGotTlsGD));
return;
}
- case PPC::GETtlsADDR: {
+ case PPC::GETtlsADDR:
// Transform: %X3 = GETtlsADDR %X3, <ga:@sym>
// Into: BL8_NOP_TLS __tls_get_addr(sym at tlsgd)
- assert(Subtarget.isPPC64() && "Not supported for 32-bit PowerPC");
+ case PPC::GETtlsADDR32: {
+ // Transform: %R3 = GETtlsADDR32 %R3, <ga:@sym>
+ // Into: BL_TLS __tls_get_addr(sym at tlsgd)@PLT
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list