Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Feb 2015 13:12:04 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r278756 - in projects/clang360-import: . bin/pkill/tests cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io cddl/contrib/opensolaris/lib/libdtrace/arm cddl/contrib/opensolaris/tools...
Message-ID:  <201502141312.t1EDC4RF051076@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Sat Feb 14 13:12:03 2015
New Revision: 278756
URL: https://svnweb.freebsd.org/changeset/base/278756

Log:
  Merge ^/head r278499 through r278755.

Added:
  projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/arm/
     - copied from r278755, head/cddl/contrib/opensolaris/lib/libdtrace/arm/
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/arm/
     - copied from r278755, head/sys/cddl/contrib/opensolaris/uts/arm/
  projects/clang360-import/sys/cddl/dev/dtrace/arm/
     - copied from r278755, head/sys/cddl/dev/dtrace/arm/
  projects/clang360-import/sys/cddl/dev/fbt/arm/
     - copied from r278755, head/sys/cddl/dev/fbt/arm/
Deleted:
  projects/clang360-import/lib/libiconv/
  projects/clang360-import/share/info/
Modified:
  projects/clang360-import/Makefile.inc1
  projects/clang360-import/ObsoleteFiles.inc
  projects/clang360-import/UPDATING
  projects/clang360-import/bin/pkill/tests/pgrep-j_test.sh
  projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c
  projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d
  projects/clang360-import/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
  projects/clang360-import/cddl/lib/Makefile
  projects/clang360-import/cddl/lib/libdtrace/Makefile
  projects/clang360-import/cddl/usr.sbin/Makefile
  projects/clang360-import/contrib/binutils/ld/scripttempl/elf.sc
  projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c
  projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
  projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c
  projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h
  projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
  projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
  projects/clang360-import/contrib/netbsd-tests/games/t_factor.sh
  projects/clang360-import/contrib/top/utils.c
  projects/clang360-import/etc/login.conf
  projects/clang360-import/etc/master.passwd
  projects/clang360-import/etc/mtree/BSD.debug.dist
  projects/clang360-import/etc/mtree/BSD.usr.dist
  projects/clang360-import/etc/rc.d/LOGIN
  projects/clang360-import/etc/rc.d/NETWORKING
  projects/clang360-import/etc/rc.d/local_unbound
  projects/clang360-import/etc/rc.d/netif
  projects/clang360-import/etc/rc.d/utx
  projects/clang360-import/etc/root/dot.cshrc
  projects/clang360-import/etc/root/dot.login
  projects/clang360-import/etc/root/dot.profile
  projects/clang360-import/games/Makefile.inc
  projects/clang360-import/games/caesar/rot13.sh
  projects/clang360-import/games/fortune/datfiles/Makefile
  projects/clang360-import/games/fortune/datfiles/freebsd-tips
  projects/clang360-import/include/stdio.h
  projects/clang360-import/lib/Makefile
  projects/clang360-import/lib/libc/gen/_spinlock_stub.c
  projects/clang360-import/lib/libc/include/libc_private.h
  projects/clang360-import/lib/libc/nls/msgcat.c
  projects/clang360-import/lib/libc/regex/regcomp.c
  projects/clang360-import/lib/libc/sys/interposing_table.c
  projects/clang360-import/lib/libproc/proc_bkpt.c
  projects/clang360-import/lib/libproc/proc_regs.c
  projects/clang360-import/lib/libproc/proc_sym.c
  projects/clang360-import/lib/libthr/libthr.3
  projects/clang360-import/lib/libthr/thread/thr_private.h
  projects/clang360-import/lib/libthr/thread/thr_spinlock.c
  projects/clang360-import/lib/libthr/thread/thr_syscalls.c
  projects/clang360-import/release/scripts/make-manifest.sh
  projects/clang360-import/release/scripts/mk-vmimage.sh
  projects/clang360-import/sbin/sysctl/sysctl.8
  projects/clang360-import/sbin/sysctl/sysctl.c
  projects/clang360-import/share/man/man4/led.4
  projects/clang360-import/share/man/man4/ral.4
  projects/clang360-import/share/man/man5/nullfs.5
  projects/clang360-import/share/man/man6/intro.6
  projects/clang360-import/share/man/man7/hier.7
  projects/clang360-import/share/mk/bsd.lib.mk
  projects/clang360-import/share/mk/bsd.prog.mk
  projects/clang360-import/share/skel/dot.cshrc
  projects/clang360-import/share/skel/dot.login
  projects/clang360-import/share/skel/dot.profile
  projects/clang360-import/sys/amd64/amd64/db_disasm.c
  projects/clang360-import/sys/arm/arm/cpufunc.c
  projects/clang360-import/sys/arm/arm/cpufunc_asm_armv7.S
  projects/clang360-import/sys/arm/arm/db_trace.c
  projects/clang360-import/sys/arm/arm/elf_trampoline.c
  projects/clang360-import/sys/arm/arm/exception.S
  projects/clang360-import/sys/arm/arm/identcpu.c
  projects/clang360-import/sys/arm/arm/trap.c
  projects/clang360-import/sys/arm/conf/BEAGLEBONE
  projects/clang360-import/sys/arm/include/armreg.h
  projects/clang360-import/sys/arm/include/cpufunc.h
  projects/clang360-import/sys/arm/xscale/ixp425/if_npe.c
  projects/clang360-import/sys/boot/arm/ixp425/boot2/ixp425_board.c
  projects/clang360-import/sys/boot/pc98/boot2/Makefile
  projects/clang360-import/sys/cam/ctl/ctl.c
  projects/clang360-import/sys/cam/ctl/ctl.h
  projects/clang360-import/sys/cam/ctl/ctl_backend_block.c
  projects/clang360-import/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/clang360-import/sys/cam/ctl/ctl_private.h
  projects/clang360-import/sys/cam/ctl/ctl_tpc.c
  projects/clang360-import/sys/cam/ctl/ctl_tpc.h
  projects/clang360-import/sys/cam/ctl/ctl_tpc_local.c
  projects/clang360-import/sys/cam/scsi/scsi_all.h
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/clang360-import/sys/cddl/dev/lockstat/lockstat.c
  projects/clang360-import/sys/cddl/dev/profile/profile.c
  projects/clang360-import/sys/conf/kern.pre.mk
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22.ini
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9340.ini
  projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9580.ini
  projects/clang360-import/sys/contrib/dev/ral/microcode.h
  projects/clang360-import/sys/contrib/dev/ral/rt2860.fw.uu
  projects/clang360-import/sys/contrib/vchiq/interface/compat/vchi_bsd.h
  projects/clang360-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
  projects/clang360-import/sys/dev/dwc/if_dwc.c
  projects/clang360-import/sys/dev/hwpmc/hwpmc_armv7.c
  projects/clang360-import/sys/dev/malo/if_malo.c
  projects/clang360-import/sys/dev/mwl/if_mwl.c
  projects/clang360-import/sys/dev/oce/oce_mbox.c
  projects/clang360-import/sys/dev/ral/if_ral_pci.c
  projects/clang360-import/sys/dev/ral/rt2860.c
  projects/clang360-import/sys/dev/ral/rt2860reg.h
  projects/clang360-import/sys/dev/smc/if_smc.c
  projects/clang360-import/sys/dev/sound/usb/uaudio.c
  projects/clang360-import/sys/dev/vt/font/vt_mouse_cursor.c
  projects/clang360-import/sys/fs/autofs/autofs.c
  projects/clang360-import/sys/fs/autofs/autofs_ioctl.h
  projects/clang360-import/sys/i386/i386/db_disasm.c
  projects/clang360-import/sys/kern/kern_sig.c
  projects/clang360-import/sys/kern/kern_timeout.c
  projects/clang360-import/sys/kern/sysv_shm.c
  projects/clang360-import/sys/kern/vfs_mount.c
  projects/clang360-import/sys/modules/dtrace/Makefile
  projects/clang360-import/sys/modules/dtrace/dtrace/Makefile
  projects/clang360-import/sys/netgraph/ng_base.c
  projects/clang360-import/sys/ofed/include/linux/gfp.h
  projects/clang360-import/sys/ofed/include/linux/kernel.h
  projects/clang360-import/sys/ofed/include/linux/kref.h
  projects/clang360-import/sys/ofed/include/linux/pci.h
  projects/clang360-import/sys/sys/disk.h
  projects/clang360-import/sys/sys/sockbuf.h
  projects/clang360-import/sys/x86/acpica/madt.c
  projects/clang360-import/sys/x86/include/vmware.h
  projects/clang360-import/sys/x86/iommu/intel_drv.c
  projects/clang360-import/sys/x86/iommu/intel_reg.h
  projects/clang360-import/sys/x86/iommu/intel_utils.c
  projects/clang360-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang360-import/tools/tools/nanobsd/gateworks/Files/root/.profile
  projects/clang360-import/tools/tools/nanobsd/pcengines/Files/root/.cshrc
  projects/clang360-import/tools/tools/nanobsd/pcengines/Files/root/.login
  projects/clang360-import/tools/tools/nanobsd/rescue/Files/root/.cshrc
  projects/clang360-import/tools/tools/netmap/pkt-gen.c
  projects/clang360-import/usr.bin/svn/svn/Makefile
  projects/clang360-import/usr.bin/w/w.c
  projects/clang360-import/usr.bin/wc/wc.c
  projects/clang360-import/usr.bin/whereis/pathnames.h
  projects/clang360-import/usr.bin/whereis/whereis.1
  projects/clang360-import/usr.bin/whereis/whereis.c
  projects/clang360-import/usr.sbin/bsdconfig/include/messages.subr
  projects/clang360-import/usr.sbin/ctladm/ctladm.8
  projects/clang360-import/usr.sbin/ctld/ctl.conf.5
  projects/clang360-import/usr.sbin/ctld/ctld.c
  projects/clang360-import/usr.sbin/ctld/ctld.h
  projects/clang360-import/usr.sbin/ctld/keys.c
  projects/clang360-import/usr.sbin/flowctl/flowctl.c
  projects/clang360-import/usr.sbin/freebsd-update/freebsd-update.sh
  projects/clang360-import/usr.sbin/gssd/Makefile
  projects/clang360-import/usr.sbin/gssd/gssd.c
  projects/clang360-import/usr.sbin/iscsid/iscsid.h
  projects/clang360-import/usr.sbin/iscsid/keys.c
  projects/clang360-import/usr.sbin/mountd/mountd.c
  projects/clang360-import/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
Directory Properties:
  projects/clang360-import/   (props changed)
  projects/clang360-import/cddl/   (props changed)
  projects/clang360-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang360-import/contrib/binutils/   (props changed)
  projects/clang360-import/contrib/elftoolchain/   (props changed)
  projects/clang360-import/contrib/top/   (props changed)
  projects/clang360-import/etc/   (props changed)
  projects/clang360-import/include/   (props changed)
  projects/clang360-import/lib/libc/   (props changed)
  projects/clang360-import/sbin/   (props changed)
  projects/clang360-import/share/   (props changed)
  projects/clang360-import/share/man/man4/   (props changed)
  projects/clang360-import/sys/   (props changed)
  projects/clang360-import/sys/boot/   (props changed)
  projects/clang360-import/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang360-import/sys/conf/   (props changed)

Modified: projects/clang360-import/Makefile.inc1
==============================================================================
--- projects/clang360-import/Makefile.inc1	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/Makefile.inc1	Sat Feb 14 13:12:03 2015	(r278756)
@@ -50,10 +50,6 @@
 .include <bsd.arch.inc.mk>
 .include <bsd.compiler.mk>
 
-# We must do share/info early so that installation of info `dir'
-# entries works correctly.  Do it first since it is less likely to
-# grow dependencies on include and lib than vice versa.
-#
 # We must do lib/ and libexec/ before bin/, because if installworld
 # installs a new /bin/sh, the 'make' command will *immediately*
 # use that new version.  And the new (dynamically-linked) /bin/sh
@@ -63,7 +59,7 @@ SRCDIR?=	${.CURDIR}
 .if defined(SUBDIR_OVERRIDE)
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
-SUBDIR=	share/info lib libexec
+SUBDIR=	lib libexec
 SUBDIR+=bin
 .if ${MK_GAMES} != "no"
 SUBDIR+=games
@@ -193,9 +189,8 @@ OBJTREE=	${MAKEOBJDIRPREFIX}
 OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
-# /usr/games added for fortune which depend on strfile
-BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
-XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
+XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
 STRICTTMPPATH=	${BPATH}:${XPATH}
 TMPPATH=	${STRICTTMPPATH}:${PATH}
 
@@ -811,9 +806,6 @@ ITOOLS+=makewhatis
 
 # Non-base distributions produced by the base system
 EXTRA_DISTRIBUTIONS=	doc
-.if ${MK_GAMES} != "no"
-EXTRA_DISTRIBUTIONS+=	games
-.endif
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 EXTRA_DISTRIBUTIONS+=	lib32
 .endif

Modified: projects/clang360-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang360-import/ObsoleteFiles.inc	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/ObsoleteFiles.inc	Sat Feb 14 13:12:03 2015	(r278756)
@@ -38,7 +38,7 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 20150210: new clang import which bumps version from 3.5.1 to 3.6.0.
+# 2015mmdd: new clang import which bumps version from 3.5.1 to 3.6.0.
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.1/altivec.h
@@ -93,6 +93,22 @@ OLD_FILES+=usr/lib/clang/3.5.1/lib/freeb
 OLD_DIRS+=usr/lib/clang/3.5.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.1/lib
 OLD_DIRS+=usr/lib/clang/3.5.1
+# 20150212: /usr/games moving into /usr/bin
+OLD_FILES+=usr/games/bcd
+OLD_FILES+=usr/games/caesar
+OLD_FILES+=usr/games/factor
+OLD_FILES+=usr/games/fortune
+OLD_FILES+=usr/games/grdc
+OLD_FILES+=usr/games/morse
+OLD_FILES+=usr/games/number
+OLD_FILES+=usr/games/pom
+OLD_FILES+=usr/games/ppt
+OLD_FILES+=usr/games/primes
+OLD_FILES+=usr/games/random
+OLD_FILES+=usr/games/rot13
+OLD_FILES+=usr/games/strfile
+OLD_FILES+=usr/games/unstr
+OLD_DIRS+=usr/games
 # 20150209: liblzma header
 OLD_FILES+=usr/include/lzma/lzma.h
 # 20150124: spl.9 and friends

Modified: projects/clang360-import/UPDATING
==============================================================================
--- projects/clang360-import/UPDATING	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/UPDATING	Sat Feb 14 13:12:03 2015	(r278756)
@@ -34,6 +34,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 2015mmdd:
 	Clang and llvm have been upgraded to 3.6.0 release.
 
+20150210:
+	The autofs(4) ABI was changed in order to restore binary compatibility
+	with 10.1-RELEASE.  The automountd(8) daemon needs to be rebuilt to work
+	with the new kernel.
+
 20150131:
 	The powerpc64 kernel has been changed to a position-independent
 	executable. This can only be booted with a new version of loader(8),
@@ -290,6 +295,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	The lindev device has been removed since /dev/full has been made a
 	standard device.  __FreeBSD_version has been bumped.
 
+20140424:
+	The knob WITHOUT_VI was added to the base system, which controls
+	building ex(1), vi(1), etc. Older releases of FreeBSD required ex(1)
+	in order to reorder files share/termcap and didn't build ex(1) as a
+	build tool, so building/installing with WITH_VI is highly advised for
+	build hosts for older releases.
+
+	This issue has been fixed in stable/9 and stable/10 in r277022 and
+	r276991, respectively.
+
 20140418:
 	The YES_HESIOD knob has been removed. It has been obsolete for
 	a decade. Please move to using WITH_HESIOD instead or your builds

Modified: projects/clang360-import/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- projects/clang360-import/bin/pkill/tests/pgrep-j_test.sh	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/bin/pkill/tests/pgrep-j_test.sh	Sat Feb 14 13:12:03 2015	(r278756)
@@ -4,94 +4,87 @@
 jail_name_to_jid()
 {
 	local check_name="$1"
-	(
-		line="$(jls -n 2> /dev/null | grep  name=$check_name  )"
-		for nv in $line; do
-			local name="${nv%=*}"
-			if [ "${name}" = "jid" ]; then
-				eval $nv
-				echo $jid
-				break
-			fi
-		done
-	)
+	jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
 }
 
 base=pgrep_j_test
 
+if [ `id -u` -ne 0 ]; then
+	echo "1..0 # skip Test needs uid 0."
+	exit 0
+fi
+
 echo "1..3"
 
+sleep=$(pwd)/sleep.txt
+ln -sf /bin/sleep $sleep
+
 name="pgrep -j <jid>"
-if [ `id -u` -eq 0 ]; then
-	sleep=$(pwd)/sleep.txt
-	ln -sf /bin/sleep $sleep
-	jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
-	    command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
+sleep_amount=5
+jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount &
 
-	jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
-	    command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
+jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount &
 
+for i in `seq 1 10`; do
 	jid1=$(jail_name_to_jid ${base}_1_1)
 	jid2=$(jail_name_to_jid ${base}_1_2)
 	jid="${jid1},${jid2}"
-	pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)"
-	pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
-	    $(cat ${PWD}/${base}_1_2.pid) | sort)
-	if [ "$pid1" = "$pid2" ]; then
-		echo "ok 1 - $name"
-	else
-		echo "not ok 1 - $name"
-	fi
-	[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
-	[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
-	rm -f $sleep
+	case "$jid" in
+	[0-9]+,[0-9]+)
+		break
+		;;
+	esac
+	sleep 0.1
+done
+
+pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)"
+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
+    $(cat ${PWD}/${base}_1_2.pid) | sort)
+if [ "$pid1" = "$pid2" ]; then
+	echo "ok 1 - $name"
 else
-	echo "ok 1 - $name # skip Test needs uid 0."
+	echo "not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
 fi
+[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
+wait
 
 name="pgrep -j any"
-if [ `id -u` -eq 0 ]; then
-	sleep=$(pwd)/sleep.txt
-	ln -sf /bin/sleep $sleep
-	jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
-	    command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
-
-	jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
-	    command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
-
-	sleep 2
-	pid1="$(pgrep -f -x -j any "$sleep 5" | sort)"
-	pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
-	    $(cat ${PWD}/${base}_2_2.pid) | sort)
-	if [ "$pid1" = "$pid2" ]; then
-		echo "ok 2 - $name"
-	else
-		echo "not ok 2 - $name"
-	fi
-	[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
-	[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
-	rm -f $sleep
+sleep_amount=6
+jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount &
+
+sleep 2
+pid1="$(pgrep -f -x -j any "$sleep $sleep_amount" | sort)"
+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
+    $(cat ${PWD}/${base}_2_2.pid) | sort)
+if [ "$pid1" = "$pid2" ]; then
+	echo "ok 2 - $name"
 else
-	echo "ok 2 - $name # skip Test needs uid 0."
+	echo "not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
 fi
+[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
+wait
 
 name="pgrep -j none"
-if [ `id -u` -eq 0 ]; then
-	sleep=$(pwd)/sleep.txt
-	ln -sf /bin/sleep $sleep
-	daemon -p ${PWD}/${base}_3_1.pid $sleep 5 &
-	jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
-	    command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
-	sleep 2
-	pid="$(pgrep -f -x -j none "$sleep 5")"
-	if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
-		echo "ok 3 - $name"
-	else
-		echo "not ok 3 - $name"
-	fi
-	rm -f $sleep
-	[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) 
-	[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) 
+sleep_amount=7
+daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount &
+jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount &
+sleep 2
+pid="$(pgrep -f -x -j none "$sleep $sleep_amount")"
+if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
+	echo "ok 3 - $name"
 else
-	echo "ok 3 - $name # skip Test needs uid 0."
+	echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
 fi
+[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) 
+[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) 
+
+rm -f $sleep

Modified: projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -26,6 +26,8 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
+#include <sys/ioctl.h>
+
 #include <assert.h>
 #include <setjmp.h>
 #include <signal.h>
@@ -69,7 +71,7 @@ main(int argc, char *argv[])
 	 */
 	if (sigsetjmp(env, 1) == 0) {
 		for (;;)
-			(void) ioctl(-1, -1, NULL);
+			(void) ioctl(-1, 0, NULL);
 	}
 
 	/*
@@ -80,20 +82,19 @@ main(int argc, char *argv[])
 	fds[n++] = open(file, O_WRONLY);
 	fds[n++] = open(file, O_RDWR);
 
-	fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC |
-	    O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC |
-	    O_SYNC | O_TRUNC | O_XATTR, 0666);
+	fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT |
+	    O_NOCTTY | O_NONBLOCK | O_NDELAY | O_SYNC | O_TRUNC | 0666);
 
 	fds[n++] = open(file, O_RDWR);
 	(void) lseek(fds[n - 1], 123, SEEK_SET);
 
 	/*
 	 * Once we have all the file descriptors in the state we want to test,
-	 * issue a bogus ioctl() on each fd with cmd -1 and arg NULL to whack
+	 * issue a bogus ioctl() on each fd with cmd 0 and arg NULL to whack
 	 * our DTrace script into recording the content of the fds[] array.
 	 */
 	for (i = 0; i < n; i++)
-		(void) ioctl(fds[i], -1, NULL);
+		(void) ioctl(fds[i], 0, NULL);
 
 	assert(n <= sizeof (fds) / sizeof (fds[0]));
 	exit(0);

Modified: projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d	Sat Feb 14 13:12:03 2015	(r278756)
@@ -36,7 +36,7 @@ syscall::ioctl:entry
 }
 
 syscall::ioctl:entry
-/pid == $1 && arg0 != -1u && arg1 == -1u && arg2 == NULL/
+/pid == $1 && arg0 != -1u && arg1 == 0 && arg2 == NULL/
 {
 	printf("fds[%d] fi_name = %s\n", arg0, fds[arg0].fi_name);
 	printf("fds[%d] fi_dirname = %s\n", arg0, fds[arg0].fi_dirname);

Modified: projects/clang360-import/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -169,12 +169,12 @@ write_objects(iidesc_t *idp, ctf_buf_t *
 {
 	ushort_t id = (idp ? idp->ii_dtype->t_id : 0);
 
-	ctf_buf_write(b, &id, sizeof (id));
-
 	if (target_requires_swap) {
 		SWAP_16(id);
 	}
 
+	ctf_buf_write(b, &id, sizeof (id));
+
 	debug(3, "Wrote object %s (%d)\n", (idp ? idp->ii_name : "(null)"), id);
 }
 

Modified: projects/clang360-import/cddl/lib/Makefile
==============================================================================
--- projects/clang360-import/cddl/lib/Makefile	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/cddl/lib/Makefile	Sat Feb 14 13:12:03 2015	(r278756)
@@ -27,7 +27,8 @@ _libzpool=	libzpool
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
-	${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+	${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
+	${MACHINE_CPUARCH} == "arm"
 _drti=		drti
 _libdtrace=	libdtrace
 .endif

Modified: projects/clang360-import/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/clang360-import/cddl/lib/libdtrace/Makefile	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/cddl/lib/libdtrace/Makefile	Sat Feb 14 13:12:03 2015	(r278756)
@@ -81,6 +81,10 @@ CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/ut
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
 .PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
+.elif ${MACHINE_CPUARCH} == "arm"
+CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm
+.PATH:		${.CURDIR}/../../../sys/cddl/dev/dtrace/arm
 .elif ${MACHINE_CPUARCH} == "powerpc"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc

Modified: projects/clang360-import/cddl/usr.sbin/Makefile
==============================================================================
--- projects/clang360-import/cddl/usr.sbin/Makefile	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/cddl/usr.sbin/Makefile	Sat Feb 14 13:12:03 2015	(r278756)
@@ -30,6 +30,12 @@ _plockstat=	plockstat
 .endif
 .endif
 
+.if ${MACHINE_CPUARCH} == "arm"
+_dtrace=	dtrace
+_dtruss=	dtruss
+_lockstat=	lockstat
+.endif
+
 .if ${MACHINE_CPUARCH} == "mips"
 _dtrace=	dtrace
 .endif

Modified: projects/clang360-import/contrib/binutils/ld/scripttempl/elf.sc
==============================================================================
--- projects/clang360-import/contrib/binutils/ld/scripttempl/elf.sc	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/binutils/ld/scripttempl/elf.sc	Sat Feb 14 13:12:03 2015	(r278756)
@@ -402,8 +402,8 @@ cat <<EOF
   .fini_array   ${RELOCATING-0} :
   {
     ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}}
-    KEEP (*(.fini_array))
     KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array))
     ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}}
   }
   ${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h	Sat Feb 14 13:12:03 2015	(r278756)
@@ -49,7 +49,7 @@
 struct _libdwarf_globals {
 	Dwarf_Handler	errhand;
 	Dwarf_Ptr	errarg;
-	int		applyrela;
+	int		applyreloc;
 };
 
 extern struct _libdwarf_globals _libdwarf;

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -33,8 +33,8 @@ dwarf_set_reloc_application(int apply)
 {
 	int oldapply;
 
-	oldapply = _libdwarf.applyrela;
-	_libdwarf.applyrela = apply;
+	oldapply = _libdwarf.applyreloc;
+	_libdwarf.applyreloc = apply;
 
 	return (oldapply);
 }

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3	Sat Feb 14 13:12:03 2015	(r278756)
@@ -24,7 +24,7 @@
 .\"
 .\" $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $
 .\"
-.Dd June 26, 2011
+.Dd February 11, 2015
 .Os
 .Dt DWARF_SET_RELOC_APPLICATION 3
 .Sh NAME
@@ -47,6 +47,8 @@ handled by the DWARF(3) library.
 If the argument
 .Ar apply
 holds a non-zero value, the library will process all the relevant
+.Dq ".rel"
+and
 .Dq ".rela"
 relocation sections and will apply the relocation records found to
 their corresponding DWARF sections.

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -31,5 +31,5 @@ ELFTC_VCSID("$Id: libdwarf.c 2070 2011-1
 struct _libdwarf_globals _libdwarf = {
 	.errhand	= NULL,
 	.errarg		= NULL,
-	.applyrela	= 1
+	.applyreloc	= 1
 };

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h	Sat Feb 14 13:12:03 2015	(r278756)
@@ -439,6 +439,7 @@ enum Dwarf_ISA {
 	DW_ISA_SPARC,
 	DW_ISA_X86,
 	DW_ISA_X86_64,
+	DW_ISA_AARCH64,
 	DW_ISA_MAX
 };
 

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -50,32 +50,46 @@ static const char *debug_name[] = {
 };
 
 static void
-_dwarf_elf_apply_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
-    Elf_Data *symtab_data, int endian)
+_dwarf_elf_write_reloc(Dwarf_Debug dbg, Elf_Data *symtab_data, int endian,
+    void *buf, uint64_t offset, GElf_Xword r_info, GElf_Sxword r_addend)
 {
-	Dwarf_Unsigned type;
-	GElf_Rela rela;
 	GElf_Sym sym;
-	size_t symndx;
-	uint64_t offset;
-	int size, j;
+	int size;
 
-	j = 0;
-	while (gelf_getrela(rel_data, j++, &rela) != NULL) {
-		symndx = GELF_R_SYM(rela.r_info);
-		type = GELF_R_TYPE(rela.r_info);
+	if (gelf_getsym(symtab_data, GELF_R_SYM(r_info), &sym) == NULL)
+		return;
+	if ((size = _dwarf_get_reloc_size(dbg, GELF_R_TYPE(r_info))) == 0)
+		return; /* Unknown or non-absolute relocation. */
+	if (endian == ELFDATA2MSB)
+		_dwarf_write_msb(buf, &offset, sym.st_value + r_addend, size);
+	else
+		_dwarf_write_lsb(buf, &offset, sym.st_value + r_addend, size);
+}
 
-		if (gelf_getsym(symtab_data, symndx, &sym) == NULL)
-			continue;
+static void
+_dwarf_elf_apply_rel_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+    Elf_Data *symtab_data, int endian)
+{
+	GElf_Rel rel;
+	int j;
 
-		offset = rela.r_offset;
-		size = _dwarf_get_reloc_size(dbg, type);
+	j = 0;
+	while (gelf_getrel(rel_data, j++, &rel) != NULL)
+		_dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+		     rel.r_offset, rel.r_info, 0);
+}
 
-		if (endian == ELFDATA2MSB)
-			_dwarf_write_msb(buf, &offset, rela.r_addend, size);
-		else
-			_dwarf_write_lsb(buf, &offset, rela.r_addend, size);
-	}
+static void
+_dwarf_elf_apply_rela_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+    Elf_Data *symtab_data, int endian)
+{
+	GElf_Rela rela;
+	int j;
+
+	j = 0;
+	while (gelf_getrela(rel_data, j++, &rela) != NULL)
+		_dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+		    rela.r_offset, rela.r_info, rela.r_addend);
 }
 
 static int
@@ -104,7 +118,8 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
 			return (DW_DLE_ELF);
 		}
 
-		if (sh.sh_type != SHT_RELA || sh.sh_size == 0)
+		if ((sh.sh_type != SHT_REL && sh.sh_type != SHT_RELA) ||
+		     sh.sh_size == 0)
 			continue;
 
 		if (sh.sh_info == shndx && sh.sh_link == symtab) {
@@ -125,8 +140,12 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
 			}
 			memcpy(ed->ed_alloc, ed->ed_data->d_buf,
 			    ed->ed_data->d_size);
-			_dwarf_elf_apply_reloc(dbg, ed->ed_alloc, rel,
-			    symtab_data, eh.e_ident[EI_DATA]);
+			if (sh.sh_type == SHT_REL)
+				_dwarf_elf_apply_rel_reloc(dbg, ed->ed_alloc,
+				    rel, symtab_data, eh.e_ident[EI_DATA]);
+			else
+				_dwarf_elf_apply_rela_reloc(dbg, ed->ed_alloc,
+				    rel, symtab_data, eh.e_ident[EI_DATA]);
 
 			return (DW_DLE_NONE);
 		}
@@ -282,7 +301,7 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *el
 				}
 			}
 
-			if (_libdwarf.applyrela) {
+			if (_libdwarf.applyreloc) {
 				if (_dwarf_elf_relocate(dbg, elf,
 				    &e->eo_data[j], elf_ndxscn(scn), symtab_ndx,
 				    symtab_data, error) != DW_DLE_NONE)

Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -35,6 +35,8 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg,
 	assert(dbg != NULL);
 
 	switch (dbg->dbgp_isa) {
+	case DW_ISA_AARCH64:
+		return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32);
 	case DW_ISA_X86:
 		return (R_386_32);
 	case DW_ISA_X86_64:
@@ -62,6 +64,12 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D
 	switch (dbg->dbg_machine) {
 	case EM_NONE:
 		break;
+	case EM_AARCH64:
+		if (rel_type == R_AARCH64_ABS32)
+			return (4);
+		else if (rel_type == R_AARCH64_ABS64)
+			return (8);
+		break;
 	case EM_ARM:
 		if (rel_type == R_ARM_ABS32)
 			return (4);

Modified: projects/clang360-import/contrib/netbsd-tests/games/t_factor.sh
==============================================================================
--- projects/clang360-import/contrib/netbsd-tests/games/t_factor.sh	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/netbsd-tests/games/t_factor.sh	Sat Feb 14 13:12:03 2015	(r278756)
@@ -27,13 +27,13 @@
 
 expect() {
 	echo "${2}" >expout
-	atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
+	atf_check -s eq:0 -o file:expout -e empty /usr/bin/factor ${1}
 }
 
 atf_test_case overflow
 overflow_head() {
 	atf_set "descr" "Tests for overflow conditions"
-	atf_set "require.progs" "/usr/games/factor"
+	atf_set "require.progs" "/usr/bin/factor"
 }
 overflow_body() {
 	expect '8675309' '8675309: 8675309'
@@ -44,7 +44,7 @@ atf_test_case loop
 loop_head() {
 	atf_set "descr" "Tests some cases that once locked the program" \
 	                "in an infinite loop"
-	atf_set "require.progs" "/usr/games/factor"
+	atf_set "require.progs" "/usr/bin/factor"
 }
 loop_body() {
 	expect '99999999999991' '99999999999991: 7 13 769231 1428571'

Modified: projects/clang360-import/contrib/top/utils.c
==============================================================================
--- projects/clang360-import/contrib/top/utils.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/contrib/top/utils.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -58,6 +58,7 @@ char *str;
 				 * ever convert will be 2^32-1, which is 10
 				 * digits.
 				 */
+_Static_assert(sizeof(int) <= 4, "buffer too small for this sized int");
 
 char *itoa(val)
 

Modified: projects/clang360-import/etc/login.conf
==============================================================================
--- projects/clang360-import/etc/login.conf	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/login.conf	Sat Feb 14 13:12:03 2015	(r278756)
@@ -27,7 +27,7 @@ default:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
 	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
-	:path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\
+	:path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
 	:datasize=unlimited:\

Modified: projects/clang360-import/etc/master.passwd
==============================================================================
--- projects/clang360-import/etc/master.passwd	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/master.passwd	Sat Feb 14 13:12:03 2015	(r278756)
@@ -7,7 +7,7 @@ operator:*:2:5::0:0:System &:/:/usr/sbin
 bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
 tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
 kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
-games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin
+games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin
 news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin
 man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
 sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin

Modified: projects/clang360-import/etc/mtree/BSD.debug.dist
==============================================================================
--- projects/clang360-import/etc/mtree/BSD.debug.dist	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/mtree/BSD.debug.dist	Sat Feb 14 13:12:03 2015	(r278756)
@@ -21,8 +21,6 @@
         usr
             bin
             ..
-            games
-            ..
             lib
                 clang
                     3.6.0

Modified: projects/clang360-import/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/clang360-import/etc/mtree/BSD.usr.dist	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/mtree/BSD.usr.dist	Sat Feb 14 13:12:03 2015	(r278756)
@@ -7,8 +7,6 @@
 .
     bin
     ..
-    games
-    ..
     include
     ..
     lib

Modified: projects/clang360-import/etc/rc.d/LOGIN
==============================================================================
--- projects/clang360-import/etc/rc.d/LOGIN	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/rc.d/LOGIN	Sat Feb 14 13:12:03 2015	(r278756)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: LOGIN
-# REQUIRE: DAEMON utx
+# REQUIRE: DAEMON
 
 #	This is a dummy dependency to ensure user services such as xdm,
 #	inetd, cron and kerberos are started after everything else, in case

Modified: projects/clang360-import/etc/rc.d/NETWORKING
==============================================================================
--- projects/clang360-import/etc/rc.d/NETWORKING	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/rc.d/NETWORKING	Sat Feb 14 13:12:03 2015	(r278756)
@@ -6,7 +6,7 @@
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: netif netoptions routing ppp ipfw stf
 # REQUIRE: defaultroute routed route6d mroute6d resolv bridge
-# REQUIRE: static_arp static_ndp local_unbound
+# REQUIRE: static_arp static_ndp
 
 #	This is a dummy dependency, for services which require networking
 #	to be operational before starting.

Modified: projects/clang360-import/etc/rc.d/local_unbound
==============================================================================
--- projects/clang360-import/etc/rc.d/local_unbound	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/rc.d/local_unbound	Sat Feb 14 13:12:03 2015	(r278756)
@@ -5,6 +5,7 @@
 
 # PROVIDE: local_unbound
 # REQUIRE: FILESYSTEMS netif resolv
+# BEFORE: NETWORKING
 # KEYWORD: shutdown
 
 . /etc/rc.subr

Modified: projects/clang360-import/etc/rc.d/netif
==============================================================================
--- projects/clang360-import/etc/rc.d/netif	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/rc.d/netif	Sat Feb 14 13:12:03 2015	(r278756)
@@ -252,5 +252,8 @@ netif_common()
 	debug "The following interfaces were not configured: $_fail"
 }
 
+# Load the old "network" config file also for compatibility.
+# This is needed for mfsBSD at least.
+load_rc_config network
 load_rc_config $name
 run_rc_command $*

Modified: projects/clang360-import/etc/rc.d/utx
==============================================================================
--- projects/clang360-import/etc/rc.d/utx	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/rc.d/utx	Sat Feb 14 13:12:03 2015	(r278756)
@@ -5,6 +5,7 @@
 
 # PROVIDE: utx
 # REQUIRE: DAEMON FILESYSTEMS
+# BEFORE: LOGIN
 # KEYWORD: shutdown
 
 . /etc/rc.subr

Modified: projects/clang360-import/etc/root/dot.cshrc
==============================================================================
--- projects/clang360-import/etc/root/dot.cshrc	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/root/dot.cshrc	Sat Feb 14 13:12:03 2015	(r278756)
@@ -15,7 +15,7 @@ alias ll	ls -lAF
 # A righteous umask
 umask 22
 
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin)
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
 
 setenv	EDITOR	vi
 setenv	PAGER	more

Modified: projects/clang360-import/etc/root/dot.login
==============================================================================
--- projects/clang360-import/etc/root/dot.login	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/root/dot.login	Sat Feb 14 13:12:03 2015	(r278756)
@@ -6,4 +6,4 @@
 #
 
 # Uncomment to display a random cookie each login:
-# if ( -x /usr/games/fortune ) /usr/games/fortune -s
+# if ( -x /usr/bin/fortune ) /usr/bin/fortune -s

Modified: projects/clang360-import/etc/root/dot.profile
==============================================================================
--- projects/clang360-import/etc/root/dot.profile	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/etc/root/dot.profile	Sat Feb 14 13:12:03 2015	(r278756)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 #
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
 export PATH
 HOME=/root
 export HOME

Modified: projects/clang360-import/games/Makefile.inc
==============================================================================
--- projects/clang360-import/games/Makefile.inc	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/games/Makefile.inc	Sat Feb 14 13:12:03 2015	(r278756)
@@ -1,7 +1,6 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-BINDIR?=	/usr/games
+BINDIR?=	/usr/bin
 FILESDIR?=	${SHAREDIR}/games
 WARNS?=		6
-DISTRIBUTION?=	games

Modified: projects/clang360-import/games/caesar/rot13.sh
==============================================================================
--- projects/clang360-import/games/caesar/rot13.sh	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/games/caesar/rot13.sh	Sat Feb 14 13:12:03 2015	(r278756)
@@ -30,4 +30,4 @@
 #	@(#)rot13.sh	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-exec /usr/games/caesar 13 "$@"
+exec /usr/bin/caesar 13 "$@"

Modified: projects/clang360-import/games/fortune/datfiles/Makefile
==============================================================================
--- projects/clang360-import/games/fortune/datfiles/Makefile	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/games/fortune/datfiles/Makefile	Sat Feb 14 13:12:03 2015	(r278756)
@@ -15,7 +15,7 @@ FILESDIR=	${SHAREDIR}/games/fortune
 
 .for f in ${DB}
 $f.dat: $f
-	PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \
+	PATH=$$PATH:/usr/bin:${.OBJDIR}/../strfile \
 	    strfile -Cs ${.ALLSRC} ${.TARGET}
 .endfor
 

Modified: projects/clang360-import/games/fortune/datfiles/freebsd-tips
==============================================================================
--- projects/clang360-import/games/fortune/datfiles/freebsd-tips	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/games/fortune/datfiles/freebsd-tips	Sat Feb 14 13:12:03 2015	(r278756)
@@ -443,7 +443,7 @@ on this system.  Example entries are in
 %
 You can use "pkg info" to see a list of packages you have installed.
 %
-You can use the 'fetch' command to retrieve files over ftp or http.
+You can use the 'fetch' command to retrieve files over ftp, http or https.
 
 	 fetch http://www.FreeBSD.org/index.html
 

Modified: projects/clang360-import/include/stdio.h
==============================================================================
--- projects/clang360-import/include/stdio.h	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/include/stdio.h	Sat Feb 14 13:12:03 2015	(r278756)
@@ -166,7 +166,7 @@ __END_DECLS
 #define	__SRW	0x0010		/* open for reading & writing */
 #define	__SEOF	0x0020		/* found EOF */
 #define	__SERR	0x0040		/* found error */
-#define	__SMBF	0x0080		/* _buf is from malloc */
+#define	__SMBF	0x0080		/* _bf._base is from malloc */
 #define	__SAPP	0x0100		/* fdopen()ed in append mode */
 #define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
 #define	__SOPT	0x0400		/* do fseek() optimization */

Modified: projects/clang360-import/lib/Makefile
==============================================================================
--- projects/clang360-import/lib/Makefile	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/lib/Makefile	Sat Feb 14 13:12:03 2015	(r278756)
@@ -284,6 +284,12 @@ _libsmb=	libsmb
 _libsmb=	libsmb
 .endif
 
+.if ${MACHINE_CPUARCH} == "arm"
+_libsmb=	libsmb
+_libproc=	libproc
+_librtld_db=	librtld_db
+.endif
+
 .if ${MK_OPENSSL} != "no"
 _libmp=		libmp
 .endif

Modified: projects/clang360-import/lib/libc/gen/_spinlock_stub.c
==============================================================================
--- projects/clang360-import/lib/libc/gen/_spinlock_stub.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/lib/libc/gen/_spinlock_stub.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -33,51 +33,48 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 
 #include "spinlock.h"
+#include "libc_private.h"
 
 long _atomic_lock_stub(volatile long *);
 void _spinlock_stub(spinlock_t *);
 void _spinunlock_stub(spinlock_t *);
 void _spinlock_debug_stub(spinlock_t *, char *, int);
 
-/*
- * Declare weak definitions in case the application is not linked
- * with libpthread.
- */
 __weak_reference(_atomic_lock_stub, _atomic_lock);
-__weak_reference(_spinlock_stub, _spinlock);
-__weak_reference(_spinunlock_stub, _spinunlock);
-__weak_reference(_spinlock_debug_stub, _spinlock_debug);
-
-/*
- * This function is a stub for the _atomic_lock function in libpthread.
- */
+
 long
 _atomic_lock_stub(volatile long *lck __unused)
 {
 	return (0L);
 }
 
+__weak_reference(_spinlock, _spinlock_debug);
+#pragma weak _spinlock
+void
+_spinlock(spinlock_t *lck)
+{
+
+	((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinlock])
+	    (lck);
 
-/*
- * This function is a stub for the spinlock function in libpthread.
- */
+}
+
+#pragma weak _spinlock
 void
-_spinlock_stub(spinlock_t *lck __unused)
+_spinunlock(spinlock_t *lck)
 {
+
+	((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinunlock])
+	    (lck);
+
 }
 
-/*
- * This function is a stub for the spinunlock function in libpthread.
- */
 void
-_spinunlock_stub(spinlock_t *lck __unused)
+__libc_spinlock_stub(spinlock_t *lck __unused)
 {
 }
 
-/*
- * This function is a stub for the debug spinlock function in libpthread.
- */
 void
-_spinlock_debug_stub(spinlock_t *lck __unused, char *fname __unused, int lineno __unused)
+__libc_spinunlock_stub(spinlock_t *lck __unused)
 {
 }

Modified: projects/clang360-import/lib/libc/include/libc_private.h
==============================================================================
--- projects/clang360-import/lib/libc/include/libc_private.h	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/lib/libc/include/libc_private.h	Sat Feb 14 13:12:03 2015	(r278756)
@@ -95,6 +95,9 @@ do {							\
 		_SPINUNLOCK(&__stdio_thread_lock);	\
 } while (0)
 
+void		__libc_spinlock_stub(struct _spinlock *);
+void		__libc_spinunlock_stub(struct _spinlock *);
+
 /*
  * Indexes into the pthread jump table.
  *
@@ -216,6 +219,8 @@ enum {
 	INTERPOS_write,
 	INTERPOS_writev,
 	INTERPOS__pthread_mutex_init_calloc_cb,
+	INTERPOS_spinlock,
+	INTERPOS_spinunlock,
 	INTERPOS_MAX
 };
 

Modified: projects/clang360-import/lib/libc/nls/msgcat.c
==============================================================================
--- projects/clang360-import/lib/libc/nls/msgcat.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/lib/libc/nls/msgcat.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$");
 				  	np->name = strdup(n);			\
 					np->path = NULL;			\
 					np->catd = NLERR;			\
+					np->refcount = 0;			\
 					np->lang = (l == NULL) ? NULL :		\
 					    strdup(l);				\
 					np->caterrno = e;			\

Modified: projects/clang360-import/lib/libc/regex/regcomp.c
==============================================================================
--- projects/clang360-import/lib/libc/regex/regcomp.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/lib/libc/regex/regcomp.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -192,6 +192,7 @@ regcomp(regex_t * __restrict preg,
 	struct parse *p = &pa;
 	int i;
 	size_t len;
+	size_t maxlen;
 #ifdef REDEBUG
 #	define	GOODFLAGS(f)	(f)
 #else
@@ -213,7 +214,23 @@ regcomp(regex_t * __restrict preg,
 	g = (struct re_guts *)malloc(sizeof(struct re_guts));
 	if (g == NULL)
 		return(REG_ESPACE);
+	/*
+	 * Limit the pattern space to avoid a 32-bit overflow on buffer
+	 * extension.  Also avoid any signed overflow in case of conversion
+	 * so make the real limit based on a 31-bit overflow.
+	 *
+	 * Likely not applicable on 64-bit systems but handle the case
+	 * generically (who are we to stop people from using ~715MB+
+	 * patterns?).
+	 */
+	maxlen = ((size_t)-1 >> 1) / sizeof(sop) * 2 / 3;
+	if (len >= maxlen) {
+		free((char *)g);
+		return(REG_ESPACE);
+	}
 	p->ssize = len/(size_t)2*(size_t)3 + (size_t)1;	/* ugh */
+	assert(p->ssize >= len);
+
 	p->strip = (sop *)malloc(p->ssize * sizeof(sop));
 	p->slen = 0;
 	if (p->strip == NULL) {

Modified: projects/clang360-import/lib/libc/sys/interposing_table.c
==============================================================================
--- projects/clang360-import/lib/libc/sys/interposing_table.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/lib/libc/sys/interposing_table.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -73,6 +73,8 @@ interpos_func_t __libc_interposing[INTER
 	SLOT(write, __sys_write),
 	SLOT(writev, __sys_writev),
 	SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub),
+	SLOT(spinlock, __libc_spinlock_stub),
+	SLOT(spinunlock, __libc_spinunlock_stub),
 };
 #undef SLOT
 

Modified: projects/clang360-import/lib/libproc/proc_bkpt.c
==============================================================================
--- projects/clang360-import/lib/libproc/proc_bkpt.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/lib/libproc/proc_bkpt.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -51,6 +51,9 @@ __FBSDID("$FreeBSD$");
 #elif defined(__powerpc__)
 #define BREAKPOINT_INSTR	0x7fe00008	/* trap */
 #define BREAKPOINT_INSTR_SZ 4
+#elif defined(__arm__)
+#define BREAKPOINT_INSTR	0xe7ffffff	/* bkpt */
+#define BREAKPOINT_INSTR_SZ	4
 #else
 #error "Add support for your architecture"
 #endif

Modified: projects/clang360-import/lib/libproc/proc_regs.c
==============================================================================
--- projects/clang360-import/lib/libproc/proc_regs.c	Sat Feb 14 12:19:35 2015	(r278755)
+++ projects/clang360-import/lib/libproc/proc_regs.c	Sat Feb 14 13:12:03 2015	(r278756)
@@ -56,6 +56,8 @@ proc_regget(struct proc_handle *phdl, pr
 	case REG_PC:
 #if defined(__amd64__)
 		*regvalue = regs.r_rip;
+#elif defined(__arm__)
+		*regvalue = regs.r_pc;
 #elif defined(__i386__)
 		*regvalue = regs.r_eip;
 #elif defined(__mips__)
@@ -67,6 +69,8 @@ proc_regget(struct proc_handle *phdl, pr
 	case REG_SP:
 #if defined(__amd64__)
 		*regvalue = regs.r_rsp;
+#elif defined(__arm__)
+		*regvalue = regs.r_sp;
 #elif defined(__i386__)
 		*regvalue = regs.r_esp;
 #elif defined(__mips__)
@@ -99,6 +103,8 @@ proc_regset(struct proc_handle *phdl, pr
 	case REG_PC:
 #if defined(__amd64__)
 		regs.r_rip = regvalue;
+#elif defined(__arm__)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502141312.t1EDC4RF051076>