diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2018-12-09 11:39:45 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2018-12-09 11:39:45 +0000 |
commit | 67350cb56a69468c118bd4ccf6e361b7ebfa9eb4 (patch) | |
tree | 093815c5d75ba2f601c6ba4d487fff29ab62f3ad /usr.bin | |
parent | 0b9890fcbf4bd3cb118afc215675503889b63fb9 (diff) | |
parent | 25b4f9ad69e65a688f77df35062c81ac65a71f8d (diff) | |
download | src-67350cb56a69468c118bd4ccf6e361b7ebfa9eb4.tar.gz src-67350cb56a69468c118bd4ccf6e361b7ebfa9eb4.zip |
Merge ^/head r340918 through r341763.
Notes
Notes:
svn path=/projects/clang700-import/; revision=341764
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/bmake/Makefile.config | 6 | ||||
-rw-r--r-- | usr.bin/bmake/unit-tests/Makefile | 5 | ||||
-rw-r--r-- | usr.bin/clang/llvm-objdump/Makefile | 1 | ||||
-rw-r--r-- | usr.bin/clang/llvm-objdump/llvm-objdump.1 | 197 | ||||
-rw-r--r-- | usr.bin/fstat/fstat.c | 2 | ||||
-rw-r--r-- | usr.bin/procstat/procstat_files.c | 5 | ||||
-rwxr-xr-x | usr.bin/procstat/tests/procstat_test.sh | 4 | ||||
-rw-r--r-- | usr.bin/top/top.c | 9 | ||||
-rw-r--r-- | usr.bin/truss/powerpc64-freebsd.c | 11 | ||||
-rw-r--r-- | usr.bin/truss/riscv-freebsd.c (renamed from usr.bin/truss/riscv64-freebsd.c) | 16 |
10 files changed, 242 insertions, 14 deletions
diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index 1b4fa796e722..cb7cb2350674 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -7,7 +7,7 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION=20180512 +_MAKE_VERSION?=20180919 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake @@ -17,8 +17,8 @@ DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk CPPFLAGS+= CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H LDFLAGS+= -LIBOBJS= ${LIBOBJDIR}stresep$U.o -LDADD= +LIBOBJS+= ${LIBOBJDIR}stresep$U.o +LDADD+= USE_META= yes FILEMON_H?= /usr/include/dev/filemon/filemon.h BMAKE_PATH_MAX?= 1024 diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index ced3aeb69ab0..9b8297dfe77a 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -5,9 +5,9 @@ SRCTOP?= ${.CURDIR:H:H:H} -# $Id: Makefile.in,v 1.48 2015/12/07 04:06:29 sjg Exp $ +# $Id: Makefile.in,v 1.49 2018/09/21 21:39:05 sjg Exp $ # -# $NetBSD: Makefile,v 1.52 2015/05/05 21:51:09 sjg Exp $ +# $NetBSD: Makefile,v 1.53 2018/05/24 00:25:44 christos Exp $ # # Unit tests for make(1) # The main targets are: @@ -61,6 +61,7 @@ TESTNAMES= \ unexport-env \ varcmd \ varmisc \ + varquote \ varshell # these tests were broken by referting POSIX chanegs diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index be3412a7db6c..43d1fe8d357a 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG_CXX= llvm-objdump -MAN= SRCDIR= tools/llvm-objdump SRCS+= COFFDump.cpp diff --git a/usr.bin/clang/llvm-objdump/llvm-objdump.1 b/usr.bin/clang/llvm-objdump/llvm-objdump.1 new file mode 100644 index 000000000000..3860443fd785 --- /dev/null +++ b/usr.bin/clang/llvm-objdump/llvm-objdump.1 @@ -0,0 +1,197 @@ +.\" This file is distributed under the University of Illinois Open Source +.\" License. +.\" +.Dd November 27, 2018 +.Dt LLVM-OBJDUMP 1 +.Os +.Sh NAME +.Nm llvm-objdump +.Nd LLVM object file dumper +.Sh SYNOPSIS +.Nm llvm-objdump +.Op Ar options +.Ar objfile ... +.Sh DESCRIPTION +.Nm +prints the contents of object files and final linked images named on the +command line. +If no file name is specified, +.Nm +will attempt to read from +.Pa a.out . +If +.Pa - +is used as a file name, +.Nm +will process a file on its standard input stream. +.Nm +accepts many of the same command line arguments as GNU objdump. +.Sh OPTIONS +.Ss General Options +.Bl -tag -width indent +.It Fl -aarch64-neon-syntax Ns = Ns Ar value +Choose style of NEON code to emit from AArch64 backend. +.Ar value +may be one of: +.Bl -tag -width indent +.It generic +Generic NEON assembly +.It apple +Apple-style NEON assembly +.El +.It Fl -arch Ns = Ns Ar value +Choose architecture(s) from a Mach-O file to dump +.It Fl -arch-name Ns = Ns ar arch +Target arch to disassemble for. +See +.Fl -version +for available targets. +.It Fl -bind +Display mach-o binding info. +.It Fl -color +Use colored syntax highlighting. +Default autodetect. +.It Fl -disassemble +Display assembler mnemonics for machine instructions. +.It Fl -disassemble-all +Display assembler mnemonics for the machine instruction in all sections. +.It Fl -dsym Ns = Ns Ar file +Use +.Ar file +for debug info. +.It Fl -dwarf Ns = Ns Ar sections +Dump of dwarf debug sections. +.Bl -tag -width indent +.It frames +.Dv .debug_frame +.El +.It Fl -exports-trie +Display mach-o exported symbols. +.It Fl -fault-map-section +Display contents of faultmap section. +.It Fl -filter-print-funcs Ns = Ns Ar functions +Only print IR for functions whose name match +.Ar functions +for all print-[before|after][-all] options. +.It Fl -full-leading-addr +Print full leading address. +.It Fl g +Print line information from debug info if available. +.It Fl h , -headers , -section-headers +Display summaries of the headers for each section. +.It Fl -help +Display available options. +Use +.Fl -help-hidden +for more. +.It Fl -lazy-bind +Display mach-o lazy binding info. +.It Fl -line-numbers +Display source line numbers with disassembly. +Implies disassemble object. +.It Fl -macho +Use MachO specific object file parser. +.It Fl -mattr Ns = Ns Ar attribute ... +Target specific attributes. +.It Fl -mcpu Ns = Ns Ar CPU +Target a specific cpu type. +Use +.Fl mcpu Ns = Ns help +for details. +.It Fl -no-leading-addr +Print no leading address. +.It Fl -no-leading-headers +Print no leading headers. +.It Fl -no-show-raw-insn +When disassembling instructions, do not print the instruction bytes. +.It Fl -print-imm-hex +Use hex format for immediate values. +.It Fl -private-header +Display only the first format specific file header. +.It Fl -private-headers +Display format specific file headers. +.It Fl r +Display the relocation entries in the file. +.It Fl -raw-clang-ast +Dump the raw binary contents of the clang AST section. +.It Fl -rebase +Display mach-o rebasing info. +.It Fl -reverse-iterate +Reverse iterate. +.It Fl s +Display the content of each section. +.It Fl -section Ns = Ns Ar section +Operate on the specified sections only. +With +.Fl -macho +dump segment,section. +.It Fl -source +Display source inline with disassembly. +Implies disassmble object. +.It Fl -start-address Ns = Ns Ar address +Disassemble beginning at +.Ar address . +.It Fl -stop-address Ns = Ns Ar address +Stop disassembly at +.Ar address . +.It Fl t +Display the symbol table. +.It Fl -triple Ns = Ns Ar triple +Target triple to disassemble for. +See +.Fl -version +for available targets. +.It Fl -unwind-info +Display unwind information. +.It Fl -version +Display the version of this program. +.It Fl -weak-bind +Display mach-o weak binding info. +.It Fl -x86-asm-syntax Ns = Ns Ar syntax +Choose style of code to emit from X86 backend. +.Bl -tag -width indent +.It att +Emit AT&T-style assembly. +.It intel +Emit Intel-style assembly. +.El +.El +.Ss Mach-O Options +There are a number of options specific to the Mach-O format. +These are used in combination with the +.Fl -macho +option. +.Bl -tag -width indent +.It Fl -archive-headers +Print archive headers for Mach-O archives. +.It Fl -archive-member-offsets +Print the offset to each archive member for Mach-O archives. +Requires +.Fl -macho +and +.Fl -archive-headers . +.It Fl -data-in-code +Print the data in code table for Mach-O objects. +.It Fl -dis-symname Ns = Ns Ar symbol +Disassemble just +.Ar symbol 's +instructions. +.It Fl -dylib-id +Print the shared library's id for the dylib Mach-O file. +.It Fl -dylibs-used +Print the shared libraries used for linked Mach-O files. +.It Fl -indirect-symbols +Print indirect symbol table for Mach-O objects. +.It Fl -info-plist +Print the info plist section as strings for Mach-O objects. +.It Fl -link-opt-hints +Print the linker optimization hints for Mach-O objects. +.It Fl -no-symbolic-operands +do not symbolic operands when disassembling. +.It Fl -non-verbose +Print the info for Mach-O objects in non-verbose or numeric form. +.It Fl -objc-meta-data +Print the Objective-C runtime meta data for Mach-O files. +.It Fl -universal-headers +Print Mach-O universal headers. +.El diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index 2c81ffd08e25..f4d8c25708c1 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -301,6 +301,8 @@ print_file_info(struct procstat *procstat, struct filestat *fst, case PS_FST_TYPE_SEM: print_sem_info(procstat, fst); break; + case PS_FST_TYPE_DEV: + break; default: if (vflg) fprintf(stderr, diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c index ad1e1ca866d4..7a55659abcb5 100644 --- a/usr.bin/procstat/procstat_files.c +++ b/usr.bin/procstat/procstat_files.c @@ -408,6 +408,11 @@ procstat_files(struct procstat *procstat, struct kinfo_proc *kipp) xo_emit("{eq:fd_type/procdesc}"); break; + case PS_FST_TYPE_DEV: + str = "D"; + xo_emit("{eq:fd_type/dev}"); + break; + case PS_FST_TYPE_NONE: str = "?"; xo_emit("{eq:fd_type/none}"); diff --git a/usr.bin/procstat/tests/procstat_test.sh b/usr.bin/procstat/tests/procstat_test.sh index 007fa6df8021..16c30d0b2000 100755 --- a/usr.bin/procstat/tests/procstat_test.sh +++ b/usr.bin/procstat/tests/procstat_test.sh @@ -79,6 +79,8 @@ command_line_arguments_head() } command_line_arguments_body() { + atf_skip "https://bugs.freebsd.org/233587" + arguments="my arguments" start_program $arguments @@ -103,6 +105,8 @@ environment_head() } environment_body() { + atf_skip "https://bugs.freebsd.org/233588" + var="MY_VARIABLE=foo" eval "export $var" diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c index 2279479409b1..a4bdb5013861 100644 --- a/usr.bin/top/top.c +++ b/usr.bin/top/top.c @@ -985,6 +985,9 @@ restart: break; case CMD_viewtog: displaymode = displaymode == DISP_IO ? DISP_CPU : DISP_IO; + new_message(MT_standout | MT_delayed, + " Displaying %s statistics.", + displaymode == DISP_IO ? "IO" : "CPU"); header_text = format_header(uname_field); display_header(true); d_header = i_header; @@ -992,9 +995,15 @@ restart: break; case CMD_viewsys: ps.system = !ps.system; + new_message(MT_standout | MT_delayed, + " %sisplaying system processes.", + ps.system ? "D" : "Not d"); break; case CMD_showargs: fmt_flags ^= FMT_SHOWARGS; + new_message(MT_standout | MT_delayed, + " %sisplaying process arguments.", + fmt_flags & FMT_SHOWARGS ? "D" : "Not d"); break; case CMD_order: new_message(MT_standout, diff --git a/usr.bin/truss/powerpc64-freebsd.c b/usr.bin/truss/powerpc64-freebsd.c index ca2e108a2a82..e3504b3cf5e1 100644 --- a/usr.bin/truss/powerpc64-freebsd.c +++ b/usr.bin/truss/powerpc64-freebsd.c @@ -117,3 +117,14 @@ static struct procabi powerpc64_freebsd = { }; PROCABI(powerpc64_freebsd); + +static struct procabi powerpc64_freebsd_elfv2 = { + "FreeBSD ELF64 V2", + SYSDECODE_ABI_FREEBSD, + powerpc64_fetch_args, + powerpc64_fetch_retval, + STAILQ_HEAD_INITIALIZER(powerpc64_freebsd_elfv2.extra_syscalls), + { NULL } +}; + +PROCABI(powerpc64_freebsd_elfv2); diff --git a/usr.bin/truss/riscv64-freebsd.c b/usr.bin/truss/riscv-freebsd.c index 758496a423eb..063372077b9a 100644 --- a/usr.bin/truss/riscv64-freebsd.c +++ b/usr.bin/truss/riscv-freebsd.c @@ -26,7 +26,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -/* FreeBSD/riscv64-specific system call handling. */ +/* FreeBSD/riscv-specific system call handling. */ #include <sys/ptrace.h> #include <sys/syscall.h> @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include "truss.h" static int -riscv64_fetch_args(struct trussinfo *trussinfo, u_int narg) +riscv_fetch_args(struct trussinfo *trussinfo, u_int narg) { struct reg regs; struct current_syscall *cs; @@ -77,7 +77,7 @@ riscv64_fetch_args(struct trussinfo *trussinfo, u_int narg) } static int -riscv64_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp) +riscv_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp) { struct reg regs; lwpid_t tid; @@ -94,13 +94,13 @@ riscv64_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp) return (0); } -static struct procabi riscv64_freebsd = { +static struct procabi riscv_freebsd = { "FreeBSD ELF64", SYSDECODE_ABI_FREEBSD, - riscv64_fetch_args, - riscv64_fetch_retval, - STAILQ_HEAD_INITIALIZER(riscv64_freebsd.extra_syscalls), + riscv_fetch_args, + riscv_fetch_retval, + STAILQ_HEAD_INITIALIZER(riscv_freebsd.extra_syscalls), { NULL } }; -PROCABI(riscv64_freebsd); +PROCABI(riscv_freebsd); |