[illumos-gate merge]

commit d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe
    11528 Makefile.noget can get gone
    11529 Use -Wno-maybe-initialized
commit c4ccc1f9004b70b07e4cdb57641c38ab607306c9
    11226 Remove NetraCT support
commit dcfeff93f67a1188722a358e0fbfcd604993e573
    11561 loader script needs to place .eh_frame after .text
commit a8ffe4975d219124d53dcd9de30126f3a595d28f
    11555 gptzfsboot: boot prompt is not refreshed on device change
commit 79940ff6ac581ff9431c474dcfa18c78f1cb7a50
    11556 ip_attr.c functions need to not dereference conn_ixa directly after lock drop
commit fe949611d4f0a0f42a6923a31cd3073e5b2bc97c
    10540 wsdiff much slower under python3 than python2
commit c1064fd7ce62fe763a4475e9988ffea3b22137de
    11541 allocation_classes feature must be enabled to add log device

	Conflicts:
	usr/src/uts/sparc/Makefile.sparc
	usr/src/uts/intel/dev/Makefile
	usr/src/uts/i86pc/pcie/Makefile
	usr/src/cmd/zoneadmd/Makefile

7 files changed, 21 insertions, 11 deletions

diff --git a/usr/src/tools/aw/Makefile b/usr/src/tools/aw/Makefile
index 746cdbcbe2..4944efcaf6 100644
--- a/usr/src/tools/aw/Makefile
+++ b/usr/src/tools/aw/Makefile
@@ -30,7 +30,7 @@ PROG	= aw
 include ../Makefile.tools
 
 CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
 
 # not linted
 SMATCH=off
diff --git a/usr/src/tools/cscope-fast/Makefile b/usr/src/tools/cscope-fast/Makefile
index 513534747f..1cf70de8f4 100644
--- a/usr/src/tools/cscope-fast/Makefile
+++ b/usr/src/tools/cscope-fast/Makefile
@@ -49,7 +49,7 @@ CFLAGS +=	-DPATLEN=$(PATLEN) -DSTMTMAX=$(STMTMAX) -DYYLMAX=$(YYLMAX)
 CERRWARN +=	-_gcc=-Wno-parentheses
 CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
 CERRWARN +=	-_gcc=-Wno-unused
-CERRWARN +=	-_gcc=-Wno-uninitialized
+CERRWARN +=	$(CNOWARN_UNINIT)
 
 # not linted
 SMATCH=off
diff --git a/usr/src/tools/ctf/ctfmerge/Makefile.com b/usr/src/tools/ctf/ctfmerge/Makefile.com
index 2702fa9d13..a073007cb4 100644
--- a/usr/src/tools/ctf/ctfmerge/Makefile.com
+++ b/usr/src/tools/ctf/ctfmerge/Makefile.com
@@ -23,7 +23,7 @@ LDFLAGS += \
 
 CPPFLAGS += -include ../../common/ctf_headers.h
 CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
 
 OBJS = $(SRCS:%.c=%.o)
 
diff --git a/usr/src/tools/ctf/cvt/Makefile.com b/usr/src/tools/ctf/cvt/Makefile.com
index df3696e633..f1f9460954 100644
--- a/usr/src/tools/ctf/cvt/Makefile.com
+++ b/usr/src/tools/ctf/cvt/Makefile.com
@@ -82,7 +82,7 @@ CFLAGS		+= $(CTF_FLAGS)
 LINTFLAGS	+= -mnux
 
 CERRWARN	+= -_gcc=-Wno-unused
-CERRWARN	+= -_gcc=-Wno-uninitialized
+CERRWARN	+= $(CNOWARN_UNINIT)
 CERRWARN	+= -_gcc=-Wno-switch
 
 CSTD		= $(CSTD_GNU99)
diff --git a/usr/src/tools/ctf/stabs/Makefile.com b/usr/src/tools/ctf/stabs/Makefile.com
index 6703c34f06..97d9cddb77 100644
--- a/usr/src/tools/ctf/stabs/Makefile.com
+++ b/usr/src/tools/ctf/stabs/Makefile.com
@@ -44,7 +44,7 @@ OBJS = $(SRCS:%.c=%.o)
 LINTFILES = $(SRCS:%.c=%.ln)
 
 LINTFLAGS = -mnux -L$(ROOT)/usr/lib
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
 CERRWARN += -_gcc=-Wno-unused
 
 .NO_PARALLEL:
diff --git a/usr/src/tools/ndrgen/Makefile b/usr/src/tools/ndrgen/Makefile
index 49d57e237a..22fe8f87e8 100644
--- a/usr/src/tools/ndrgen/Makefile
+++ b/usr/src/tools/ndrgen/Makefile
@@ -34,7 +34,7 @@ SRCS=	$(OBJS:%.o=%.c)
 include ../Makefile.tools
 
 CFLAGS += $(CCVERBOSE)
-CERRWARN += -_gcc=-Wno-uninitialized
+CERRWARN += $(CNOWARN_UNINIT)
 CERRWARN += -_gcc=-Wno-unused
 
 CLEANFILES += $(OBJS) y.tab.c y.tab.h
diff --git a/usr/src/tools/scripts/wsdiff.py b/usr/src/tools/scripts/wsdiff.py
index aaab371708..225ea21ce5 100644
--- a/usr/src/tools/scripts/wsdiff.py
+++ b/usr/src/tools/scripts/wsdiff.py
@@ -119,11 +119,21 @@ wsdiff_exceptions = [
 	"usr/perl5/5.6.1/lib/i86pc-solaris-64int/CORE/libperl.so.1"
 ]
 
-def getoutput(cmd):
-	if PY3:
-		return subprocess.getstatusoutput(cmd)
-	else:
-		return commands.getstatusoutput(cmd)
+if PY3:
+	def getoutput(cmd):
+		import shlex, tempfile
+		f, fpath = tempfile.mkstemp()
+		status = os.system("{ " + cmd + "; } >" +
+			shlex.quote(fpath) + " 2>&1")
+		returncode = os.WEXITSTATUS(status)
+		with os.fdopen(f, "r") as tfile:
+			output = tfile.read()
+		os.unlink(fpath)
+		if output[-1:] == '\n':
+			output = output[:-1]
+		return returncode, output
+else:
+	getoutput = commands.getstatusoutput
 
 #####
 # Logging routines