Date: Mon, 20 Apr 2015 20:03:08 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281784 - in projects/release-arm64: . bin/ed bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/cmd/dtrace contrib/llvm/lib/MC/MCParser contrib/llvm/patches etc/defaults etc/rc.d li... Message-ID: <201504202003.t3KK38sZ097644@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Apr 20 20:03:07 2015 New Revision: 281784 URL: https://svnweb.freebsd.org/changeset/base/281784 Log: MFH: r281668 through r281783 Sponsored by: The FreeBSD Foundation Added: projects/release-arm64/bin/sh/tests/builtins/trap15.0 - copied unchanged from r281783, head/bin/sh/tests/builtins/trap15.0 projects/release-arm64/bin/sh/tests/builtins/trap16.0 - copied unchanged from r281783, head/bin/sh/tests/builtins/trap16.0 projects/release-arm64/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff - copied unchanged from r281783, head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff projects/release-arm64/lib/libc/sys/ppoll.c - copied unchanged from r281783, head/lib/libc/sys/ppoll.c projects/release-arm64/lib/libc/sys/wait6.c - copied unchanged from r281783, head/lib/libc/sys/wait6.c projects/release-arm64/share/man/man4/dtrace-io.4 - copied unchanged from r281783, head/share/man/man4/dtrace-io.4 projects/release-arm64/share/man/man4/dtrace-ip.4 - copied unchanged from r281783, head/share/man/man4/dtrace-ip.4 projects/release-arm64/share/man/man4/dtrace-proc.4 - copied unchanged from r281783, head/share/man/man4/dtrace-proc.4 projects/release-arm64/share/man/man4/dtrace-sched.4 - copied unchanged from r281783, head/share/man/man4/dtrace-sched.4 projects/release-arm64/share/man/man4/dtrace-tcp.4 - copied unchanged from r281783, head/share/man/man4/dtrace-tcp.4 projects/release-arm64/share/man/man4/dtrace-udp.4 - copied unchanged from r281783, head/share/man/man4/dtrace-udp.4 projects/release-arm64/sys/arm/allwinner/files.allwinner - copied unchanged from r281783, head/sys/arm/allwinner/files.allwinner projects/release-arm64/sys/dev/hwpmc/hwpmc_e500.c - copied unchanged from r281783, head/sys/dev/hwpmc/hwpmc_e500.c projects/release-arm64/usr.sbin/bluetooth/hccontrol/le.c - copied unchanged from r281783, head/usr.sbin/bluetooth/hccontrol/le.c Deleted: projects/release-arm64/lib/libc/sys/ftruncate.c projects/release-arm64/lib/libc/sys/lseek.c projects/release-arm64/lib/libc/sys/mmap.c projects/release-arm64/lib/libc/sys/pread.c projects/release-arm64/lib/libc/sys/pwrite.c projects/release-arm64/lib/libc/sys/truncate.c projects/release-arm64/sys/fs/ext2fs/ext2_hash.c projects/release-arm64/sys/fs/ext2fs/ext2_htree.c projects/release-arm64/sys/netipsec/xform_ipip.c projects/release-arm64/tools/build/options/WITHOUT_SYSCALL_COMPAT Modified: projects/release-arm64/ObsoleteFiles.inc projects/release-arm64/README projects/release-arm64/bin/ed/glbl.c projects/release-arm64/bin/sh/sh.1 projects/release-arm64/bin/sh/tests/builtins/Makefile projects/release-arm64/bin/sh/trap.c projects/release-arm64/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 projects/release-arm64/contrib/llvm/lib/MC/MCParser/AsmParser.cpp projects/release-arm64/etc/defaults/rc.conf projects/release-arm64/etc/rc.d/mountd projects/release-arm64/etc/rc.d/nfsd projects/release-arm64/lib/libc/Makefile projects/release-arm64/lib/libc/amd64/sys/Makefile.inc projects/release-arm64/lib/libc/arm/sys/Makefile.inc projects/release-arm64/lib/libc/gen/setproctitle.c projects/release-arm64/lib/libc/gen/waitid.c projects/release-arm64/lib/libc/i386/sys/Makefile.inc projects/release-arm64/lib/libc/include/compat.h projects/release-arm64/lib/libc/include/libc_private.h projects/release-arm64/lib/libc/mips/sys/Makefile.inc projects/release-arm64/lib/libc/powerpc/sys/Makefile.inc projects/release-arm64/lib/libc/powerpc64/sys/Makefile.inc projects/release-arm64/lib/libc/sparc64/sys/Makefile.inc projects/release-arm64/lib/libc/sys/Makefile.inc projects/release-arm64/lib/libc/sys/fcntl.c projects/release-arm64/lib/libc/sys/interposing_table.c projects/release-arm64/lib/libpmc/libpmc.c projects/release-arm64/lib/libthr/Makefile projects/release-arm64/lib/libthr/thread/thr_syscalls.c projects/release-arm64/release/tools/vmimage.subr projects/release-arm64/sbin/ipfw/nat.c projects/release-arm64/sbin/mount/mount.8 projects/release-arm64/sbin/mount/mount.c projects/release-arm64/sbin/mount_nfs/Makefile projects/release-arm64/sbin/mount_nfs/mount_nfs.8 projects/release-arm64/share/man/man3/pthread_testcancel.3 projects/release-arm64/share/man/man3/queue.3 projects/release-arm64/share/man/man4/Makefile projects/release-arm64/share/man/man4/run.4 projects/release-arm64/share/man/man5/rc.conf.5 projects/release-arm64/share/man/man5/src.conf.5 projects/release-arm64/share/man/man9/SDT.9 projects/release-arm64/share/mk/src.opts.mk projects/release-arm64/sys/amd64/amd64/machdep.c projects/release-arm64/sys/amd64/amd64/pmap.c projects/release-arm64/sys/arm/allwinner/a10_clk.h projects/release-arm64/sys/arm/allwinner/a20/a20_mp.c projects/release-arm64/sys/arm/allwinner/a20/files.a20 projects/release-arm64/sys/arm/allwinner/a20/std.a20 projects/release-arm64/sys/arm/allwinner/files.a10 projects/release-arm64/sys/arm/allwinner/if_emac.c projects/release-arm64/sys/arm/allwinner/if_emacreg.h projects/release-arm64/sys/arm/allwinner/std.a10 projects/release-arm64/sys/compat/linux/linux_file.c projects/release-arm64/sys/conf/files projects/release-arm64/sys/conf/files.powerpc projects/release-arm64/sys/dev/acpica/acpi.c projects/release-arm64/sys/dev/acpica/acpivar.h projects/release-arm64/sys/dev/atkbdc/psm.c projects/release-arm64/sys/dev/etherswitch/miiproxy.c projects/release-arm64/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/release-arm64/sys/dev/hwpmc/hwpmc_powerpc.c projects/release-arm64/sys/dev/hwpmc/hwpmc_powerpc.h projects/release-arm64/sys/dev/hwpmc/hwpmc_ppc970.c projects/release-arm64/sys/dev/hwpmc/pmc_events.h projects/release-arm64/sys/dev/ixgbe/if_ix.c projects/release-arm64/sys/dev/usb/usbdevs projects/release-arm64/sys/dev/usb/wlan/if_run.c projects/release-arm64/sys/dev/virtio/block/virtio_blk.c projects/release-arm64/sys/dev/xen/netfront/netfront.c projects/release-arm64/sys/fs/ext2fs/ext2_dir.h projects/release-arm64/sys/fs/ext2fs/ext2_extern.h projects/release-arm64/sys/fs/ext2fs/ext2_lookup.c projects/release-arm64/sys/fs/ext2fs/ext2_vfsops.c projects/release-arm64/sys/fs/ext2fs/ext2fs.h projects/release-arm64/sys/fs/nfs/nfs_commonport.c projects/release-arm64/sys/fs/nfsclient/nfs_clrpcops.c projects/release-arm64/sys/fs/nfsclient/nfs_clvfsops.c projects/release-arm64/sys/fs/nfsserver/nfs_nfsdport.c projects/release-arm64/sys/geom/uncompress/g_uncompress.c projects/release-arm64/sys/i386/i386/apic_vector.s projects/release-arm64/sys/i386/i386/db_trace.c projects/release-arm64/sys/i386/i386/machdep.c projects/release-arm64/sys/i386/i386/mp_machdep.c projects/release-arm64/sys/i386/i386/pmap.c projects/release-arm64/sys/i386/i386/swtch.s projects/release-arm64/sys/i386/include/smp.h projects/release-arm64/sys/i386/xen/mp_machdep.c projects/release-arm64/sys/i386/xen/pmap.c projects/release-arm64/sys/kern/init_sysent.c projects/release-arm64/sys/kern/kern_synch.c projects/release-arm64/sys/kern/kern_thread.c projects/release-arm64/sys/kern/sys_generic.c projects/release-arm64/sys/kern/syscalls.c projects/release-arm64/sys/kern/syscalls.master projects/release-arm64/sys/kern/systrace_args.c projects/release-arm64/sys/kern/vfs_cache.c projects/release-arm64/sys/kern/vfs_syscalls.c projects/release-arm64/sys/modules/ext2fs/Makefile projects/release-arm64/sys/modules/hwpmc/Makefile projects/release-arm64/sys/net/bpf.c projects/release-arm64/sys/netgraph/bluetooth/include/ng_hci.h projects/release-arm64/sys/netipsec/ipsec.c projects/release-arm64/sys/netipsec/ipsec.h projects/release-arm64/sys/netipsec/ipsec_input.c projects/release-arm64/sys/netipsec/ipsec_output.c projects/release-arm64/sys/netipsec/key.c projects/release-arm64/sys/netipsec/xform.h projects/release-arm64/sys/netipsec/xform_ah.c projects/release-arm64/sys/netipsec/xform_esp.c projects/release-arm64/sys/netipsec/xform_ipcomp.c projects/release-arm64/sys/nfsclient/nfs.h projects/release-arm64/sys/powerpc/booke/interrupt.c projects/release-arm64/sys/powerpc/booke/locore.S projects/release-arm64/sys/powerpc/booke/machdep.c projects/release-arm64/sys/powerpc/booke/trap_subr.S projects/release-arm64/sys/powerpc/include/pmc_mdep.h projects/release-arm64/sys/sys/pmc.h projects/release-arm64/sys/sys/syscall.h projects/release-arm64/sys/sys/syscall.mk projects/release-arm64/sys/sys/sysproto.h projects/release-arm64/sys/vm/device_pager.c projects/release-arm64/sys/vm/uma_core.c projects/release-arm64/sys/vm/vm_mmap.c projects/release-arm64/sys/x86/x86/mca.c projects/release-arm64/sys/x86/xen/xen_apic.c projects/release-arm64/tools/tools/netmap/pkt-gen.c projects/release-arm64/usr.bin/calendar/io.c projects/release-arm64/usr.bin/find/find.1 projects/release-arm64/usr.bin/nfsstat/nfsstat.c projects/release-arm64/usr.bin/rpcgen/rpc_sample.c projects/release-arm64/usr.sbin/bhyve/block_if.c projects/release-arm64/usr.sbin/bhyve/block_if.h projects/release-arm64/usr.sbin/bhyve/pci_ahci.c projects/release-arm64/usr.sbin/bhyve/pci_virtio_block.c projects/release-arm64/usr.sbin/bhyve/pci_virtio_net.c projects/release-arm64/usr.sbin/bluetooth/hccontrol/Makefile projects/release-arm64/usr.sbin/bluetooth/hccontrol/hccontrol.c projects/release-arm64/usr.sbin/bluetooth/hccontrol/hccontrol.h projects/release-arm64/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c projects/release-arm64/usr.sbin/config/main.c projects/release-arm64/usr.sbin/crunch/crunchide/Makefile projects/release-arm64/usr.sbin/crunch/crunchide/exec_elf32.c projects/release-arm64/usr.sbin/inetd/inetd.c projects/release-arm64/usr.sbin/mountd/mountd.c projects/release-arm64/usr.sbin/nfsd/nfsd.8 projects/release-arm64/usr.sbin/sysrc/sysrc projects/release-arm64/usr.sbin/tzsetup/tzsetup.c projects/release-arm64/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: projects/release-arm64/ (props changed) projects/release-arm64/cddl/ (props changed) projects/release-arm64/cddl/contrib/opensolaris/ (props changed) projects/release-arm64/contrib/llvm/ (props changed) projects/release-arm64/etc/ (props changed) projects/release-arm64/lib/libc/ (props changed) projects/release-arm64/sbin/ (props changed) projects/release-arm64/sbin/ipfw/ (props changed) projects/release-arm64/share/ (props changed) projects/release-arm64/share/man/man4/ (props changed) projects/release-arm64/sys/ (props changed) projects/release-arm64/sys/conf/ (props changed) projects/release-arm64/usr.bin/calendar/ (props changed) projects/release-arm64/usr.sbin/bhyve/ (props changed) Modified: projects/release-arm64/ObsoleteFiles.inc ============================================================================== --- projects/release-arm64/ObsoleteFiles.inc Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/ObsoleteFiles.inc Mon Apr 20 20:03:07 2015 (r281784) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20150418 +OLD_FILES+=sbin/mount_oldnfs +OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz # 20150416: ALTQ moved to net/altq OLD_FILES+=usr/include/altq/altq_rmclass_debug.h OLD_FILES+=usr/include/altq/altq.h Modified: projects/release-arm64/README ============================================================================== --- projects/release-arm64/README Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/README Mon Apr 20 20:03:07 2015 (r281784) @@ -8,37 +8,32 @@ sources in this tree - please see the sp more information). The Makefile in this directory supports a number of targets for -building components (or all) of the FreeBSD source tree, the most -commonly used one being ``world'', which rebuilds and installs -everything in the FreeBSD system from the source tree except the -kernel, the kernel-modules and the contents of /etc. The ``world'' -target should only be used in cases where the source tree has not -changed from the currently running version. See: -http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html +building components (or all) of the FreeBSD source tree. See build(7) +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html for more information, including setting make(1) variables. -The ``buildkernel'' and ``installkernel'' targets build and install +The `buildkernel` and `installkernel` targets build and install the kernel and the modules (see below). Please see the top of the Makefile in this directory for more information on the standard build targets and compile-time flags. -Building a kernel is a somewhat more involved process, documentation -for which can be found at: - http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html -And in the config(8) man page. +Building a kernel is a somewhat more involved process. See build(7), config(8), +and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html +for more information. + Note: If you want to build and install the kernel with the -``buildkernel'' and ``installkernel'' targets, you might need to build +`buildkernel` and `installkernel` targets, you might need to build world before. More information is available in the handbook. -The sample kernel configuration files reside in the sys/<arch>/conf -sub-directory (assuming that you've installed the kernel sources), the -file named GENERIC being the one used to build your initial installation -kernel. The file NOTES contains entries and documentation for all possible +The kernel configuration files reside in the sys/<arch>/conf +sub-directory. GENERIC is the default configuration used in release builds. +NOTES contains entries and documentation for all possible devices, not just those commonly used. Source Roadmap: --------------- + bin System/user commands. cddl Various commands and libraries under the Common Development Modified: projects/release-arm64/bin/ed/glbl.c ============================================================================== --- projects/release-arm64/bin/ed/glbl.c Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/bin/ed/glbl.c Mon Apr 20 20:03:07 2015 (r281784) @@ -60,7 +60,7 @@ build_active_list(int isgcmd) return ERR; if (isbinary) NUL_TO_NEWLINE(s, lp->len); - if (!regexec(pat, s, 0, NULL, 0) == isgcmd && + if (!(regexec(pat, s, 0, NULL, 0) == isgcmd) && set_active_node(lp) < 0) return ERR; } @@ -153,7 +153,7 @@ set_active_node(line_t *lp) if (active_list != NULL) { #endif if ((ts = (line_t **) realloc(active_list, - (ti += MINBUFSZ) * sizeof(line_t **))) == NULL) { + (ti += MINBUFSZ) * sizeof(line_t *))) == NULL) { fprintf(stderr, "%s\n", strerror(errno)); errmsg = "out of memory"; SPL0(); Modified: projects/release-arm64/bin/sh/sh.1 ============================================================================== --- projects/release-arm64/bin/sh/sh.1 Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/bin/sh/sh.1 Mon Apr 20 20:03:07 2015 (r281784) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd February 22, 2015 +.Dd April 18, 2015 .Dt SH 1 .Os .Sh NAME @@ -2574,8 +2574,7 @@ the former causes the specified signal t and the latter causes the default action to be taken. Omitting the .Ar action -is another way to request the default action, for compatibility reasons this -usage is not recommended though. +and using only signal numbers is another way to request the default action. In a subshell or utility environment, the shell resets trapped (but not ignored) signals to the default action. The Modified: projects/release-arm64/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/release-arm64/bin/sh/tests/builtins/Makefile Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/bin/sh/tests/builtins/Makefile Mon Apr 20 20:03:07 2015 (r281784) @@ -137,6 +137,8 @@ FILES+= trap11.0 FILES+= trap12.0 FILES+= trap13.0 FILES+= trap14.0 +FILES+= trap15.0 +FILES+= trap16.0 FILES+= trap2.0 FILES+= trap3.0 FILES+= trap4.0 Copied: projects/release-arm64/bin/sh/tests/builtins/trap15.0 (from r281783, head/bin/sh/tests/builtins/trap15.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-arm64/bin/sh/tests/builtins/trap15.0 Mon Apr 20 20:03:07 2015 (r281784, copy of r281783, head/bin/sh/tests/builtins/trap15.0) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +(${SH} -c 'term(){ exit 5;}; trap term TERM; kill -TERM $$') & +wait >/dev/null 2>&1 $! +[ $? -eq 5 ] Copied: projects/release-arm64/bin/sh/tests/builtins/trap16.0 (from r281783, head/bin/sh/tests/builtins/trap16.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-arm64/bin/sh/tests/builtins/trap16.0 Mon Apr 20 20:03:07 2015 (r281784, copy of r281783, head/bin/sh/tests/builtins/trap16.0) @@ -0,0 +1,20 @@ +# $FreeBSD$ + +traps=$(${SH} -c 'trap "echo bad" 0; trap - 0; trap') +[ -z "$traps" ] || exit 1 +traps=$(${SH} -c 'trap "echo bad" 0; trap "" 0; trap') +expected_traps=$(${SH} -c 'trap "" EXIT; trap') +[ "$traps" = "$expected_traps" ] || exit 2 +traps=$(${SH} -c 'trap "echo bad" 0; trap 0; trap') +[ -z "$traps" ] || exit 3 +traps=$(${SH} -c 'trap "echo bad" 0; trap -- 0; trap') +[ -z "$traps" ] || exit 4 +traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap - 0 1 2; trap') +[ -z "$traps" ] || exit 5 +traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap "" 0 1 2; trap') +expected_traps=$(${SH} -c 'trap "" EXIT HUP INT; trap') +[ "$traps" = "$expected_traps" ] || exit 6 +traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap 0 1 2; trap') +[ -z "$traps" ] || exit 7 +traps=$(${SH} -c 'trap "echo bad" 0 1 2; trap -- 0 1 2; trap') +[ -z "$traps" ] || exit 8 Modified: projects/release-arm64/bin/sh/trap.c ============================================================================== --- projects/release-arm64/bin/sh/trap.c Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/bin/sh/trap.c Mon Apr 20 20:03:07 2015 (r281784) @@ -183,7 +183,7 @@ trapcmd(int argc __unused, char **argv) return 0; } action = NULL; - if (*argv && sigstring_to_signum(*argv) == -1) { + if (*argv && !is_number(*argv)) { if (strcmp(*argv, "-") == 0) argv++; else { Modified: projects/release-arm64/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 ============================================================================== --- projects/release-arm64/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 Mon Apr 20 20:03:07 2015 (r281784) @@ -21,7 +21,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 5, 2013 +.Dd April 18, 2015 .Dt DTRACE 1 .Os .Sh NAME @@ -670,7 +670,8 @@ Invalid command line options or argument .Sh SEE ALSO .Xr cpp 1 , .Xr dtruss 1 , -.Xr elf 5 +.Xr elf 5 , +.Xr SDT 9 .Rs .%T Solaris Dynamic Tracing Guide .Re Modified: projects/release-arm64/contrib/llvm/lib/MC/MCParser/AsmParser.cpp ============================================================================== --- projects/release-arm64/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Mon Apr 20 20:03:07 2015 (r281784) @@ -3636,21 +3636,27 @@ bool AsmParser::parseDirectiveSpace(Stri } /// parseDirectiveLEB128 -/// ::= (.sleb128 | .uleb128) expression +/// ::= (.sleb128 | .uleb128) [ expression (, expression)* ] bool AsmParser::parseDirectiveLEB128(bool Signed) { checkForValidSection(); const MCExpr *Value; - if (parseExpression(Value)) - return true; + for (;;) { + if (parseExpression(Value)) + return true; - if (getLexer().isNot(AsmToken::EndOfStatement)) - return TokError("unexpected token in directive"); + if (Signed) + getStreamer().EmitSLEB128Value(Value); + else + getStreamer().EmitULEB128Value(Value); - if (Signed) - getStreamer().EmitSLEB128Value(Value); - else - getStreamer().EmitULEB128Value(Value); + if (getLexer().is(AsmToken::EndOfStatement)) + break; + + if (getLexer().isNot(AsmToken::Comma)) + return TokError("unexpected token in directive"); + Lex(); + } return false; } Copied: projects/release-arm64/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff (from r281783, head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-arm64/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff Mon Apr 20 20:03:07 2015 (r281784, copy of r281783, head/contrib/llvm/patches/patch-13-llvm-r229911-uleb128-commas.diff) @@ -0,0 +1,77 @@ +Pull in r229911 from upstream llvm trunk (by Benjamin Kramer): + + MC: Allow multiple comma-separated expressions on the .uleb128 directive. + + For compatiblity with GNU as. Binutils documents this as + '.uleb128 expressions'. Subtle, isn't it? + +Introduced here: http://svnweb.freebsd.org/changeset/base/281775 + +Index: lib/MC/MCParser/AsmParser.cpp +=================================================================== +--- lib/MC/MCParser/AsmParser.cpp ++++ lib/MC/MCParser/AsmParser.cpp +@@ -3636,22 +3636,28 @@ bool AsmParser::parseDirectiveSpace(StringRef IDVa + } + + /// parseDirectiveLEB128 +-/// ::= (.sleb128 | .uleb128) expression ++/// ::= (.sleb128 | .uleb128) [ expression (, expression)* ] + bool AsmParser::parseDirectiveLEB128(bool Signed) { + checkForValidSection(); + const MCExpr *Value; + +- if (parseExpression(Value)) +- return true; ++ for (;;) { ++ if (parseExpression(Value)) ++ return true; + +- if (getLexer().isNot(AsmToken::EndOfStatement)) +- return TokError("unexpected token in directive"); ++ if (Signed) ++ getStreamer().EmitSLEB128Value(Value); ++ else ++ getStreamer().EmitULEB128Value(Value); + +- if (Signed) +- getStreamer().EmitSLEB128Value(Value); +- else +- getStreamer().EmitULEB128Value(Value); ++ if (getLexer().is(AsmToken::EndOfStatement)) ++ break; + ++ if (getLexer().isNot(AsmToken::Comma)) ++ return TokError("unexpected token in directive"); ++ Lex(); ++ } ++ + return false; + } + +Index: test/MC/ELF/uleb.s +=================================================================== +--- test/MC/ELF/uleb.s ++++ test/MC/ELF/uleb.s +@@ -11,16 +11,17 @@ foo: + .uleb128 128 + .uleb128 16383 + .uleb128 16384 ++ .uleb128 23, 42 + + // ELF_32: Name: .text + // ELF_32: SectionData ( +-// ELF_32: 0000: 00017F80 01FF7F80 8001 ++// ELF_32: 0000: 00017F80 01FF7F80 8001172A + // ELF_32: ) + // ELF_64: Name: .text + // ELF_64: SectionData ( +-// ELF_64: 0000: 00017F80 01FF7F80 8001 ++// ELF_64: 0000: 00017F80 01FF7F80 8001172A + // ELF_64: ) + // MACHO_32: ('section_name', '__text\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00') +-// MACHO_32: ('_section_data', '00017f80 01ff7f80 8001') ++// MACHO_32: ('_section_data', '00017f80 01ff7f80 8001172a') + // MACHO_64: ('section_name', '__text\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00') +-// MACHO_64: ('_section_data', '00017f80 01ff7f80 8001') ++// MACHO_64: ('_section_data', '00017f80 01ff7f80 8001172a') Modified: projects/release-arm64/etc/defaults/rc.conf ============================================================================== --- projects/release-arm64/etc/defaults/rc.conf Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/etc/defaults/rc.conf Mon Apr 20 20:03:07 2015 (r281784) @@ -88,7 +88,7 @@ fsck_y_enable="NO" # Set to YES to do fs fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems. +netfs_types="nfs:NFS smbfs:SMB" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). @@ -324,7 +324,6 @@ autounmountd_flags="" # Flags to autoun nfs_client_enable="NO" # This host is an NFS client (or NO). nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). -oldnfs_server_enable="NO" # Run the old NFS server (YES/NO). nfs_server_flags="-u -t" # Flags to nfsd (if enabled). mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r" # Flags to mountd (if NFS server enabled). Modified: projects/release-arm64/etc/rc.d/mountd ============================================================================== --- projects/release-arm64/etc/rc.d/mountd Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/etc/rc.d/mountd Mon Apr 20 20:03:07 2015 (r281784) @@ -33,12 +33,6 @@ mountd_precmd() fi fi - # If oldnfs_server_enable is yes, force use of the old NFS server - # - if checkyesno oldnfs_server_enable; then - rc_flags="-o ${rc_flags}" - fi - if checkyesno zfs_enable; then rc_flags="${rc_flags} /etc/exports /etc/zfs/exports" fi Modified: projects/release-arm64/etc/rc.d/nfsd ============================================================================== --- projects/release-arm64/etc/rc.d/nfsd Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/etc/rc.d/nfsd Mon Apr 20 20:03:07 2015 (r281784) @@ -19,40 +19,25 @@ sig_stop="USR1" nfsd_precmd() { - if checkyesno oldnfs_server_enable; then - rc_flags="-o ${nfs_server_flags}" + rc_flags="${nfs_server_flags}" - # Load the module now, so that the vfs.nfsrv sysctl - # oids are available. - load_kld nfsserver - - if checkyesno nfs_reserved_port_only; then - echo 'NFS on reserved port only=YES' - sysctl vfs.nfsrv.nfs_privport=1 > /dev/null - else - sysctl vfs.nfsrv.nfs_privport=0 > /dev/null - fi + # Load the modules now, so that the vfs.nfsd sysctl + # oids are available. + load_kld nfsd + + if checkyesno nfs_reserved_port_only; then + echo 'NFS on reserved port only=YES' + sysctl vfs.nfsd.nfs_privport=1 > /dev/null else - rc_flags="${nfs_server_flags}" + sysctl vfs.nfsd.nfs_privport=0 > /dev/null + fi - # Load the modules now, so that the vfs.nfsd sysctl - # oids are available. - load_kld nfsd - - if checkyesno nfs_reserved_port_only; then - echo 'NFS on reserved port only=YES' - sysctl vfs.nfsd.nfs_privport=1 > /dev/null - else - sysctl vfs.nfsd.nfs_privport=0 > /dev/null - fi - - if checkyesno nfsv4_server_enable; then - sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null - force_depend nfsuserd || err 1 "Cannot run nfsuserd" - else - echo 'NFSv4 is disabled' - sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null - fi + if checkyesno nfsv4_server_enable; then + sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null + force_depend nfsuserd || err 1 "Cannot run nfsuserd" + else + echo 'NFSv4 is disabled' + sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null fi force_depend rpcbind || return 1 Modified: projects/release-arm64/lib/libc/Makefile ============================================================================== --- projects/release-arm64/lib/libc/Makefile Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/Makefile Mon Apr 20 20:03:07 2015 (r281784) @@ -157,10 +157,6 @@ libkern.${LIBC_ARCH}:: ${KMSRCS} ${CP} ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH} .endif -.if ${MK_SYSCALL_COMPAT} != "no" -CFLAGS+=-DSYSCALL_COMPAT -.endif - .include <bsd.arch.inc.mk> .include <bsd.lib.mk> Modified: projects/release-arm64/lib/libc/amd64/sys/Makefile.inc ============================================================================== --- projects/release-arm64/lib/libc/amd64/sys/Makefile.inc Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/amd64/sys/Makefile.inc Mon Apr 20 20:03:07 2015 (r281784) @@ -11,6 +11,3 @@ MDASM= vfork.S brk.S cerror.S exect.S ge NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o PSEUDO= _getlogin.o _exit.o -.if ${MK_SYSCALL_COMPAT} != "no" -PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o -.endif Modified: projects/release-arm64/lib/libc/arm/sys/Makefile.inc ============================================================================== --- projects/release-arm64/lib/libc/arm/sys/Makefile.inc Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/arm/sys/Makefile.inc Mon Apr 20 20:03:07 2015 (r281784) @@ -8,6 +8,3 @@ MDASM= Ovfork.S brk.S cerror.S pipe.S pt NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o PSEUDO= _exit.o _getlogin.o -.if ${MK_SYSCALL_COMPAT} != "no" -PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o -.endif Modified: projects/release-arm64/lib/libc/gen/setproctitle.c ============================================================================== --- projects/release-arm64/lib/libc/gen/setproctitle.c Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/gen/setproctitle.c Mon Apr 20 20:03:07 2015 (r281784) @@ -42,9 +42,10 @@ __FBSDID("$FreeBSD$"); * 1: old_ps_strings at the very top of the stack. * 2: old_ps_strings at SPARE_USRSPACE below the top of the stack. * 3: ps_strings at the very top of the stack. - * This attempts to support a kernel built in the #2 and #3 era. - */ - + * We only support a kernel providing #3 style ps_strings. + * + * For historical purposes, a definition of the old ps_strings structure + * and location is preserved below: struct old_ps_strings { char *old_ps_argvstr; int old_ps_nargvstr; @@ -53,6 +54,7 @@ struct old_ps_strings { }; #define OLD_PS_STRINGS ((struct old_ps_strings *) \ (USRSTACK - SPARE_USRSPACE - sizeof(struct old_ps_strings))) + */ #include <stdarg.h> @@ -136,41 +138,38 @@ setproctitle(const char *fmt, ...) ps_strings = (struct ps_strings *)ul_ps_strings; } - /* PS_STRINGS points to zeroed memory on a style #2 kernel */ - if (ps_strings->ps_argvstr) { - /* style #3 */ - if (oargc == -1) { - /* Record our original args */ - oargc = ps_strings->ps_nargvstr; - oargv = ps_strings->ps_argvstr; - for (i = len = 0; i < oargc; i++) { - /* - * The program may have scribbled into its - * argv array, e.g., to remove some arguments. - * If that has happened, break out before - * trying to call strlen on a NULL pointer. - */ - if (oargv[i] == NULL) { - oargc = i; - break; - } - snprintf(obuf + len, SPT_BUFSIZE - len, "%s%s", - len ? " " : "", oargv[i]); - if (len) - len++; - len += strlen(oargv[i]); - if (len >= SPT_BUFSIZE) - break; + /* + * PS_STRINGS points to zeroed memory on a style #2 kernel. + * Should not happen. + */ + if (ps_strings->ps_argvstr == NULL) + return; + + /* style #3 */ + if (oargc == -1) { + /* Record our original args */ + oargc = ps_strings->ps_nargvstr; + oargv = ps_strings->ps_argvstr; + for (i = len = 0; i < oargc; i++) { + /* + * The program may have scribbled into its + * argv array, e.g., to remove some arguments. + * If that has happened, break out before + * trying to call strlen on a NULL pointer. + */ + if (oargv[i] == NULL) { + oargc = i; + break; } + snprintf(obuf + len, SPT_BUFSIZE - len, "%s%s", + len != 0 ? " " : "", oargv[i]); + if (len != 0) + len++; + len += strlen(oargv[i]); + if (len >= SPT_BUFSIZE) + break; } - ps_strings->ps_nargvstr = nargc; - ps_strings->ps_argvstr = nargvp; - } else { - /* style #2 - we can only restore our first arg :-( */ - if (*obuf == '\0') - strncpy(obuf, OLD_PS_STRINGS->old_ps_argvstr, - SPT_BUFSIZE - 1); - OLD_PS_STRINGS->old_ps_nargvstr = 1; - OLD_PS_STRINGS->old_ps_argvstr = nargvp[0]; } + ps_strings->ps_nargvstr = nargc; + ps_strings->ps_argvstr = nargvp; } Modified: projects/release-arm64/lib/libc/gen/waitid.c ============================================================================== --- projects/release-arm64/lib/libc/gen/waitid.c Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/gen/waitid.c Mon Apr 20 20:03:07 2015 (r281784) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include <signal.h> #include <errno.h> #include "un-namespace.h" +#include "libc_private.h" int __waitid(idtype_t idtype, id_t id, siginfo_t *info, int flags) @@ -44,7 +45,9 @@ __waitid(idtype_t idtype, id_t id, sigin int status; pid_t ret; - ret = _wait6(idtype, id, &status, flags, NULL, info); + ret = ((pid_t (*)(idtype_t, id_t, int *, int, struct __wrusage *, + siginfo_t *))__libc_interposing[INTERPOS_wait6])(idtype, id, + &status, flags, NULL, info); /* * According to SUSv4, waitid() shall not return a PID when a Modified: projects/release-arm64/lib/libc/i386/sys/Makefile.inc ============================================================================== --- projects/release-arm64/lib/libc/i386/sys/Makefile.inc Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/i386/sys/Makefile.inc Mon Apr 20 20:03:07 2015 (r281784) @@ -15,9 +15,6 @@ MDASM= Ovfork.S brk.S cerror.S exect.S g NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o PSEUDO= _getlogin.o _exit.o -.if ${MK_SYSCALL_COMPAT} != "no" -PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o -.endif MAN+= i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2 MAN+= i386_set_watch.3 Modified: projects/release-arm64/lib/libc/include/compat.h ============================================================================== --- projects/release-arm64/lib/libc/include/compat.h Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/include/compat.h Mon Apr 20 20:03:07 2015 (r281784) @@ -47,9 +47,7 @@ __sym_compat(shmctl, freebsd7_shmctl, FB #define __weak_reference(sym,alias) \ .weak alias;.equ alias,sym -#ifndef SYSCALL_COMPAT __weak_reference(__sys_fcntl,__fcntl_compat) -#endif #undef __weak_reference Modified: projects/release-arm64/lib/libc/include/libc_private.h ============================================================================== --- projects/release-arm64/lib/libc/include/libc_private.h Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/include/libc_private.h Mon Apr 20 20:03:07 2015 (r281784) @@ -222,6 +222,8 @@ enum { INTERPOS_spinlock, INTERPOS_spinunlock, INTERPOS_kevent, + INTERPOS_wait6, + INTERPOS_ppoll, INTERPOS_MAX }; @@ -276,21 +278,12 @@ extern void (*__cleanup)(void) __hidden; /* * Get kern.osreldate to detect ABI revisions. Explicitly - * ignores value of $OSVERSION and caches result. Prototypes - * for the wrapped "new" pad-less syscalls are here for now. + * ignores value of $OSVERSION and caches result. */ int __getosreldate(void); #include <sys/_types.h> #include <sys/_sigset.h> -/* With pad */ -__off_t __sys_freebsd6_lseek(int, int, __off_t, int); -int __sys_freebsd6_ftruncate(int, int, __off_t); -int __sys_freebsd6_truncate(const char *, int, __off_t); -__ssize_t __sys_freebsd6_pread(int, void *, __size_t, int, __off_t); -__ssize_t __sys_freebsd6_pwrite(int, const void *, __size_t, int, __off_t); -void * __sys_freebsd6_mmap(void *, __size_t, int, int, int, int, __off_t); - struct aiocb; struct fd_set; struct iovec; @@ -305,6 +298,8 @@ struct timeval; struct timezone; struct __siginfo; struct __ucontext; +struct __wrusage; +enum idtype; int __sys_aio_suspend(const struct aiocb * const[], int, const struct timespec *); int __sys_accept(int, struct sockaddr *, __socklen_t *); @@ -329,6 +324,8 @@ int __sys_pselect(int, struct fd_set *, struct fd_set *, const struct timespec *, const __sigset_t *); int __sys_poll(struct pollfd *, unsigned, int); +int __sys_ppoll(struct pollfd *, unsigned, const struct timespec *, + const __sigset_t *); __ssize_t __sys_pread(int, void *, __size_t, __off_t); __ssize_t __sys_pwrite(int, const void *, __size_t, __off_t); __ssize_t __sys_read(int, void *, __size_t); @@ -357,6 +354,8 @@ int __sys_thr_kill(long, int); int __sys_thr_self(long *); int __sys_truncate(const char *, __off_t); __pid_t __sys_wait4(__pid_t, int *, int, struct rusage *); +__pid_t __sys_wait6(enum idtype, __id_t, int *, int, + struct __wrusage *, struct __siginfo *); __ssize_t __sys_write(int, const void *, __size_t); __ssize_t __sys_writev(int, const struct iovec *, int); Modified: projects/release-arm64/lib/libc/mips/sys/Makefile.inc ============================================================================== --- projects/release-arm64/lib/libc/mips/sys/Makefile.inc Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/mips/sys/Makefile.inc Mon Apr 20 20:03:07 2015 (r281784) @@ -6,10 +6,6 @@ MDASM= Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S sbrk.S syscall.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o ftruncate.o getlogin.o lseek.o mmap.o \ - openbsd_poll.o pread.o pwrite.o sstk.o truncate.o vfork.o yield.o +NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o PSEUDO= _exit.o _getlogin.o -.if ${MK_SYSCALL_COMPAT} != "no" -PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o -.endif Modified: projects/release-arm64/lib/libc/powerpc/sys/Makefile.inc ============================================================================== --- projects/release-arm64/lib/libc/powerpc/sys/Makefile.inc Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/powerpc/sys/Makefile.inc Mon Apr 20 20:03:07 2015 (r281784) @@ -6,6 +6,3 @@ MDASM+= brk.S cerror.S exect.S pipe.S pt NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o PSEUDO= _getlogin.o _exit.o -.if ${MK_SYSCALL_COMPAT} != "no" -PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o -.endif Modified: projects/release-arm64/lib/libc/powerpc64/sys/Makefile.inc ============================================================================== --- projects/release-arm64/lib/libc/powerpc64/sys/Makefile.inc Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/powerpc64/sys/Makefile.inc Mon Apr 20 20:03:07 2015 (r281784) @@ -6,6 +6,3 @@ MDASM+= brk.S cerror.S exect.S pipe.S pt NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o PSEUDO= _getlogin.o _exit.o -.if ${MK_SYSCALL_COMPAT} != "no" -PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o -.endif Modified: projects/release-arm64/lib/libc/sparc64/sys/Makefile.inc ============================================================================== --- projects/release-arm64/lib/libc/sparc64/sys/Makefile.inc Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/sparc64/sys/Makefile.inc Mon Apr 20 20:03:07 2015 (r281784) @@ -18,6 +18,3 @@ MDASM+= brk.S cerror.S exect.S pipe.S pt NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o PSEUDO= _getlogin.o _exit.o -.if ${MK_SYSCALL_COMPAT} != "no" -PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o -.endif Modified: projects/release-arm64/lib/libc/sys/Makefile.inc ============================================================================== --- projects/release-arm64/lib/libc/sys/Makefile.inc Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/sys/Makefile.inc Mon Apr 20 20:03:07 2015 (r281784) @@ -26,18 +26,6 @@ SRCS+= \ __error.c \ interposing_table.c -.if ${MK_SYSCALL_COMPAT} != "no" -SYSCALL_COMPAT_SRCS= \ - ftruncate.c \ - lseek.c \ - mmap.c \ - pread.c \ - pwrite.c \ - truncate.c -SRCS+= ${SYSCALL_COMPAT_SRCS} -NOASM+= ${SYSCALL_COMPAT_SRCS:S/.c/.o/} -.endif - SRCS+= futimens.c utimensat.c NOASM+= futimens.o utimensat.o PSEUDO+= _futimens.o _utimensat.o @@ -57,6 +45,7 @@ INTERPOSED = \ open \ openat \ poll \ + ppoll \ pselect \ read \ readv \ @@ -73,6 +62,7 @@ INTERPOSED = \ sigwaitinfo \ swapcontext \ wait4 \ + wait6 \ write \ writev Modified: projects/release-arm64/lib/libc/sys/fcntl.c ============================================================================== --- projects/release-arm64/lib/libc/sys/fcntl.c Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/sys/fcntl.c Mon Apr 20 20:03:07 2015 (r281784) @@ -3,6 +3,12 @@ * Authors: Doug Rabson <dfr@rabson.org> * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org> * + * Copyright (c) 2014-2015 The FreeBSD Foundation. + * All rights reserved. + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -48,59 +54,3 @@ fcntl(int fd, int cmd, ...) return (((int (*)(int, int, ...)) __libc_interposing[INTERPOS_fcntl])(fd, cmd, arg)); } - -#ifdef SYSCALL_COMPAT -__weak_reference(__fcntl_compat, __fcntl); - -int -__fcntl_compat(int fd, int cmd, ...) -{ - va_list args; - long arg; - struct __oflock ofl; - struct flock *flp; - int res; - - va_start(args, cmd); - arg = va_arg(args, long); - va_end(args); - - if (__getosreldate() >= 800028) { - return (__sys_fcntl(fd, cmd, arg)); - } else { - if (cmd == F_GETLK || cmd == F_SETLK || cmd == F_SETLKW) { - /* - * Convert new-style struct flock (which - * includes l_sysid) to old-style. - */ - flp = (struct flock *) (uintptr_t) arg; - ofl.l_start = flp->l_start; - ofl.l_len = flp->l_len; - ofl.l_pid = flp->l_pid; - ofl.l_type = flp->l_type; - ofl.l_whence = flp->l_whence; - - switch (cmd) { - case F_GETLK: - res = __sys_fcntl(fd, F_OGETLK, &ofl); - if (res >= 0) { - flp->l_start = ofl.l_start; - flp->l_len = ofl.l_len; - flp->l_pid = ofl.l_pid; - flp->l_type = ofl.l_type; - flp->l_whence = ofl.l_whence; - flp->l_sysid = 0; - } - return (res); - - case F_SETLK: - return (__sys_fcntl(fd, F_OSETLK, &ofl)); - - case F_SETLKW: - return (__sys_fcntl(fd, F_OSETLKW, &ofl)); - } - } - return (__sys_fcntl(fd, cmd, arg)); - } -} -#endif Modified: projects/release-arm64/lib/libc/sys/interposing_table.c ============================================================================== --- projects/release-arm64/lib/libc/sys/interposing_table.c Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libc/sys/interposing_table.c Mon Apr 20 20:03:07 2015 (r281784) @@ -44,7 +44,7 @@ interpos_func_t __libc_interposing[INTER SLOT(aio_suspend, __sys_aio_suspend), SLOT(close, __sys_close), SLOT(connect, __sys_connect), - SLOT(fcntl, __fcntl_compat), + SLOT(fcntl, __sys_fcntl), SLOT(fsync, __sys_fsync), SLOT(fork, __sys_fork), SLOT(msync, __sys_msync), @@ -76,6 +76,8 @@ interpos_func_t __libc_interposing[INTER SLOT(spinlock, __libc_spinlock_stub), SLOT(spinunlock, __libc_spinunlock_stub), SLOT(kevent, __sys_kevent), + SLOT(wait6, __sys_wait6), + SLOT(ppoll, __sys_ppoll), }; #undef SLOT Copied: projects/release-arm64/lib/libc/sys/ppoll.c (from r281783, head/lib/libc/sys/ppoll.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-arm64/lib/libc/sys/ppoll.c Mon Apr 20 20:03:07 2015 (r281784, copy of r281783, head/lib/libc/sys/ppoll.c) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2015 The FreeBSD Foundation. + * All rights reserved. + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice(s), this list of conditions and the following disclaimer as + * the first lines of this file unmodified other than the possible + * addition of one or more copyright notices. + * 2. Redistributions in binary form must reproduce the above copyright + * notice(s), this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/poll.h> +#include "libc_private.h" + +__weak_reference(__sys_ppoll, __ppoll); + +#pragma weak ppoll +int +ppoll(struct pollfd pfd[], nfds_t nfds, const struct timespec *__restrict + timeout, const sigset_t *__restrict newsigmask) +{ + + return (((int (*)(struct pollfd *, nfds_t, const struct timespec *, + const sigset_t *)) __libc_interposing[INTERPOS_ppoll])(pfd, nfds, + timeout, newsigmask)); +} Copied: projects/release-arm64/lib/libc/sys/wait6.c (from r281783, head/lib/libc/sys/wait6.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-arm64/lib/libc/sys/wait6.c Mon Apr 20 20:03:07 2015 (r281784, copy of r281783, head/lib/libc/sys/wait6.c) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015 The FreeBSD Foundation. + * All rights reserved. + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice(s), this list of conditions and the following disclaimer as + * the first lines of this file unmodified other than the possible + * addition of one or more copyright notices. + * 2. Redistributions in binary form must reproduce the above copyright + * notice(s), this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/types.h> +#include <sys/wait.h> +#include <signal.h> +#include "libc_private.h" + +__weak_reference(__sys_wait6, __wait6); + +#pragma weak wait6 +pid_t +wait6(idtype_t idtype, id_t id, int *status, int options, struct __wrusage *ru, + siginfo_t *infop) +{ + + return (((pid_t (*)(idtype_t, id_t, int *, int, struct __wrusage *, + siginfo_t *))__libc_interposing[INTERPOS_wait6])(idtype, id, + status, options, ru, infop)); +} Modified: projects/release-arm64/lib/libpmc/libpmc.c ============================================================================== --- projects/release-arm64/lib/libpmc/libpmc.c Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libpmc/libpmc.c Mon Apr 20 20:03:07 2015 (r281784) @@ -164,6 +164,7 @@ PMC_CLASSDEP_TABLE(octeon, OCTEON); PMC_CLASSDEP_TABLE(ucf, UCF); PMC_CLASSDEP_TABLE(ppc7450, PPC7450); PMC_CLASSDEP_TABLE(ppc970, PPC970); +PMC_CLASSDEP_TABLE(e500, E500); static struct pmc_event_descr soft_event_table[PMC_EV_DYN_COUNT]; @@ -296,8 +297,9 @@ PMC_MDEP_TABLE(armv7, ARMV7, PMC_CLASS_S PMC_MDEP_TABLE(mips24k, MIPS24K, PMC_CLASS_SOFT, PMC_CLASS_MIPS24K); PMC_MDEP_TABLE(mips74k, MIPS74K, PMC_CLASS_SOFT, PMC_CLASS_MIPS74K); PMC_MDEP_TABLE(octeon, OCTEON, PMC_CLASS_SOFT, PMC_CLASS_OCTEON); -PMC_MDEP_TABLE(ppc7450, PPC7450, PMC_CLASS_SOFT, PMC_CLASS_PPC7450); -PMC_MDEP_TABLE(ppc970, PPC970, PMC_CLASS_SOFT, PMC_CLASS_PPC970); +PMC_MDEP_TABLE(ppc7450, PPC7450, PMC_CLASS_SOFT, PMC_CLASS_PPC7450, PMC_CLASS_TSC); +PMC_MDEP_TABLE(ppc970, PPC970, PMC_CLASS_SOFT, PMC_CLASS_PPC970, PMC_CLASS_TSC); +PMC_MDEP_TABLE(e500, E500, PMC_CLASS_SOFT, PMC_CLASS_E500, PMC_CLASS_TSC); PMC_MDEP_TABLE(generic, SOFT, PMC_CLASS_SOFT); static const struct pmc_event_descr tsc_event_table[] = @@ -368,6 +370,7 @@ PMC_CLASS_TABLE_DESC(octeon, OCTEON, oct #if defined(__powerpc__) PMC_CLASS_TABLE_DESC(ppc7450, PPC7450, ppc7450, powerpc); PMC_CLASS_TABLE_DESC(ppc970, PPC970, ppc970, powerpc); +PMC_CLASS_TABLE_DESC(e500, E500, e500, powerpc); #endif static struct pmc_class_descr soft_class_table_descr = @@ -2494,6 +2497,12 @@ static struct pmc_event_alias ppc970_ali EV_ALIAS(NULL, NULL) }; +static struct pmc_event_alias e500_aliases[] = { + EV_ALIAS("instructions", "INSTR_COMPLETED"), + EV_ALIAS("cycles", "CYCLES"), + EV_ALIAS(NULL, NULL) +}; + #define POWERPC_KW_OS "os" #define POWERPC_KW_USR "usr" #define POWERPC_KW_ANYTHREAD "anythread" @@ -2949,6 +2958,10 @@ pmc_event_names_of_class(enum pmc_class ev = ppc970_event_table; count = PMC_EVENT_TABLE_SIZE(ppc970); break; + case PMC_CLASS_E500: + ev = e500_event_table; + count = PMC_EVENT_TABLE_SIZE(e500); + break; case PMC_CLASS_SOFT: ev = soft_event_table; count = soft_event_info.pm_nevent; @@ -3245,6 +3258,10 @@ pmc_init(void) PMC_MDEP_INIT(ppc970); pmc_class_table[n] = &ppc970_class_table_descr; break; + case PMC_CPU_PPC_E500: + PMC_MDEP_INIT(e500); + pmc_class_table[n] = &e500_class_table_descr; + break; #endif default: /* @@ -3444,6 +3461,9 @@ _pmc_name_of_event(enum pmc_event pe, en } else if (pe >= PMC_EV_PPC970_FIRST && pe <= PMC_EV_PPC970_LAST) { ev = ppc970_event_table; evfence = ppc970_event_table + PMC_EVENT_TABLE_SIZE(ppc970); + } else if (pe >= PMC_EV_E500_FIRST && pe <= PMC_EV_E500_LAST) { + ev = e500_event_table; + evfence = e500_event_table + PMC_EVENT_TABLE_SIZE(e500); } else if (pe == PMC_EV_TSC_TSC) { ev = tsc_event_table; evfence = tsc_event_table + PMC_EVENT_TABLE_SIZE(tsc); Modified: projects/release-arm64/lib/libthr/Makefile ============================================================================== --- projects/release-arm64/lib/libthr/Makefile Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libthr/Makefile Mon Apr 20 20:03:07 2015 (r281784) @@ -61,10 +61,6 @@ SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthr SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a .endif -.if ${MK_SYSCALL_COMPAT} != "no" -CFLAGS+=-DSYSCALL_COMPAT -.endif - .include <bsd.arch.inc.mk> .include <bsd.lib.mk> Modified: projects/release-arm64/lib/libthr/thread/thr_syscalls.c ============================================================================== --- projects/release-arm64/lib/libthr/thread/thr_syscalls.c Mon Apr 20 19:54:54 2015 (r281783) +++ projects/release-arm64/lib/libthr/thread/thr_syscalls.c Mon Apr 20 20:03:07 2015 (r281784) @@ -95,10 +95,6 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "thr_private.h" *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504202003.t3KK38sZ097644>