diff options
| author | dim <dim@FreeBSD.org> | 2015-09-24 21:48:04 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-24 21:48:04 +0000 |
| commit | 5c80b187639f9d0f9013ea4068039582c115f9f8 (patch) | |
| tree | 1bcad8efc17a77f9140e1a6bdc016fcf18546365 /usr.bin | |
| parent | 86e5497c676342d8d53c9f1035bc44653cab1fee (diff) | |
| parent | 47a49e1e6cd1f4b2d0c68abdf3186595a39423c1 (diff) | |
| download | FreeBSD-src-5c80b187639f9d0f9013ea4068039582c115f9f8.zip FreeBSD-src-5c80b187639f9d0f9013ea4068039582c115f9f8.tar.gz | |
Merge ^/head r288126 through r288196.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/bmake/Makefile.inc | 2 | ||||
| -rw-r--r-- | usr.bin/elfdump/elfdump.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index ad7faad..4fa3cf7 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -7,7 +7,9 @@ .export SRCTOP .endif +.if exists(${.CURDIR}/tests) PROG= make +.endif .if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= YES diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c index 33cc9c4..908c699 100644 --- a/usr.bin/elfdump/elfdump.c +++ b/usr.bin/elfdump/elfdump.c @@ -296,7 +296,7 @@ static const char *ei_data[] = { }; static const char *ei_abis[256] = { - "ELFOSABI_SYSV", "ELFOSABI_HPUX", "ELFOSABI_NETBSD", "ELFOSABI_LINUX", + "ELFOSABI_NONE", "ELFOSABI_HPUX", "ELFOSABI_NETBSD", "ELFOSABI_LINUX", "ELFOSABI_HURD", "ELFOSABI_86OPEN", "ELFOSABI_SOLARIS", "ELFOSABI_AIX", "ELFOSABI_IRIX", "ELFOSABI_FREEBSD", "ELFOSABI_TRU64", "ELFOSABI_MODESTO", "ELFOSABI_OPENBSD", @@ -379,6 +379,7 @@ sh_types(uint64_t machine, uint64_t sht) { break; case EM_MIPS: switch (sht) { + case SHT_MIPS_REGINFO: return "SHT_MIPS_REGINFO"; case SHT_MIPS_OPTIONS: return "SHT_MIPS_OPTIONS"; case SHT_MIPS_ABIFLAGS: return "SHT_MIPS_ABIFLAGS"; } |
