[illumos-gate merge]

commit d0b89bad7e1fdc02b67434ccc5d1c0e983e25583
    12743 man page spelling mistakes
commit 7e95e8d94bf4ccccc742a5e7a1370afe0d890ae3
    12728 emlxs: symbol 'emlxs_prog_type_t' is multiply-defined
commit bd025ac2b6fbfbc59dfc0bd50a0e56dd56de9229
    12739 gld module missing dep on mac after 12671
commit 4c87aefe8930bd07275b8dd2e96ea5f24d93a52e
    12665 want modern bhyve
commit a68aefedafdc78f1f25e9c888f61357d59c87311
    12540 mdb: build with gcore

	Conflicts:
	exception_lists/check_rtime
	exception_lists/copyright
	exception_lists/cstyle
	exception_lists/hdrchk
	exception_lists/packaging
	exception_lists/wscheck
	usr/src/cmd/bhyve/Makefile
	usr/src/cmd/bhyve/acpi.c
	usr/src/cmd/bhyve/bhyverun.c
	usr/src/cmd/bhyve/block_if.c
	usr/src/cmd/bhyve/gdb.c
	usr/src/cmd/bhyve/mevent.c
	usr/src/cmd/bhyve/pci_e82545.c
	usr/src/cmd/bhyve/pci_emul.c
	usr/src/cmd/bhyve/pci_emul.h
	usr/src/cmd/bhyve/pci_fbuf.c
	usr/src/cmd/bhyve/pci_nvme.c
	usr/src/cmd/bhyve/pci_passthru.c
	usr/src/cmd/bhyve/pci_virtio_block.c
	usr/src/cmd/bhyve/pci_virtio_console.c
	usr/src/cmd/bhyve/pci_virtio_net.c
	usr/src/cmd/bhyve/pci_virtio_scsi.c
	usr/src/cmd/bhyve/pci_virtio_viona.c
	usr/src/cmd/bhyve/pci_xhci.c
	usr/src/cmd/bhyve/rfb.c
	usr/src/cmd/bhyve/test/Makefile.com
	usr/src/cmd/bhyve/test/tst/mevent/lists.delete.c
	usr/src/cmd/bhyve/test/tst/mevent/testlib.c
	usr/src/cmd/bhyve/test/tst/mevent/testlib.h
	usr/src/cmd/bhyve/uart_emul.c
	usr/src/cmd/bhyve/virtio.c
	usr/src/cmd/bhyve/virtio.h
	usr/src/cmd/bhyvectl/Makefile
	usr/src/cmd/bhyvectl/bhyvectl.c
	usr/src/cmd/devfsadm/i386/misc_link_i386.c
	usr/src/compat/freebsd/amd64/machine/specialreg.h
	usr/src/compat/freebsd/sys/callout.h
	usr/src/compat/freebsd/sys/param.h
	usr/src/lib/Makefile
	usr/src/lib/libvmmapi/common/mapfile-vers
	usr/src/lib/libvmmapi/common/vmmapi.c
	usr/src/lib/libvmmapi/common/vmmapi.h
	usr/src/pkg/manifests/system-bhyve.mf
	usr/src/pkg/manifests/system-library-bhyve.mf
	usr/src/uts/i86pc/Makefile.files
	usr/src/uts/i86pc/io/vmm/README.sync
	usr/src/uts/i86pc/io/vmm/amd/svm.c
	usr/src/uts/i86pc/io/vmm/intel/vmx.c
	usr/src/uts/i86pc/io/vmm/intel/vtd.c
	usr/src/uts/i86pc/io/vmm/io/ppt.h
	usr/src/uts/i86pc/io/vmm/io/vatpit.c
	usr/src/uts/i86pc/io/vmm/io/vlapic.c
	usr/src/uts/i86pc/io/vmm/vm/vm_map.h
	usr/src/uts/i86pc/io/vmm/vm/vm_page.h
	usr/src/uts/i86pc/io/vmm/vmm.c
	usr/src/uts/i86pc/io/vmm/vmm_host.h
	usr/src/uts/i86pc/io/vmm/vmm_instruction_emul.c
	usr/src/uts/i86pc/io/vmm/vmm_sol_dev.c
	usr/src/uts/i86pc/io/vmm/vmm_sol_glue.c
	usr/src/uts/i86pc/io/vmm/vmm_sol_vm.c
	usr/src/uts/i86pc/sys/viona_io.h
	usr/src/uts/i86pc/sys/vmm.h
	usr/src/uts/i86pc/sys/vmm_dev.h
	usr/src/uts/i86pc/sys/vmm_drv.h
	usr/src/uts/i86pc/viona/Makefile
	usr/src/uts/i86pc/vmm/Makefile

1 files changed, 0 insertions, 31 deletions

diff --git a/usr/src/tools/scripts/gensetdefs.pl b/usr/src/tools/scripts/gensetdefs.pl
deleted file mode 100644
index 8ca5782feb..0000000000
--- a/usr/src/tools/scripts/gensetdefs.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl -w
-#
-# COPYRIGHT 2013 Pluribus Networks Inc.
-#
-# All rights reserved. This copyright notice is Copyright Management
-# Information under 17 USC 1202 and is included to protect this work and
-# deter copyright infringement.  Removal or alteration of this Copyright
-# Management Information without the express written permission from
-# Pluribus Networks Inc is prohibited, and any such unauthorized removal
-# or alteration will be a violation of federal law.
-
-use strict;
-
-my @Sections = split(/\n/, `elfedit -r -e \'shdr:sh_name -osimple\' $ARGV[0] 2>&1`);
-
-foreach my $Section (@Sections) {
-	if ($Section =~ "^set_") {
-		print "\tfixing $Section\n";
-
-		chomp(my $SectionAddr = `elfedit -r -e \'shdr:sh_addr -onum $Section\' $ARGV[0] 2>&1`);
-		chomp(my $SectionSize = `elfedit -r -e \'shdr:sh_size -onum $Section\' $ARGV[0] 2>&1`);
-		my $SectionEnd = hex($SectionAddr) + hex($SectionSize);
-
-		`elfedit -e \'sym:st_bind __start_$Section global\' $ARGV[0] 2>&1`;
-		`elfedit -e \'sym:st_value __start_$Section $SectionAddr\' $ARGV[0] 2>&1`;
-		`elfedit -e \'sym:st_shndx __start_$Section $Section\' $ARGV[0] 2>&1`;
-		`elfedit -e \'sym:st_bind __stop_$Section global\' $ARGV[0] 2>&1`;
-		`elfedit -e \'sym:st_value __stop_$Section $SectionEnd\' $ARGV[0] 2>&1`;
-		`elfedit -e \'sym:st_shndx __stop_$Section $Section\' $ARGV[0] 2>&1`;
-	}
-}