[illumos-gate merge]

commit db2effc6fa1e364418090bfc0ca0cfd267792bea
    14200 refhash could be used outside of mpt_sas
commit da0001592ab4792956d927cb6a8dc2c02c7e6719
    14221 logname(1) should only be delivered once
commit 83c2c0baa22bd77bc77facf1e1ef091642673ce2
    13679 rdist: error() and fatal() only do work in server
commit 252adeb303174e992b64771bf9639e63a4d55418
    14155 ld(1) string table merging could be much faster
    14157 ld(1) string table merging should follow gABI more closely
commit c53c97f77356a767b8a3cec554ede591cf4074d9
    14189 want support for dd status=
    14190 dd could include a human byte size
commit 01aad2697e36a09a93fa18833b39bcc0486de567
    14197 Implement id_space as a library
commit 1e8d79d21400b4e47d64ce367181e7e5ce992649
    13707 remove C99LMODE cruft
    13708 remove lint cruft from Makefile.master
commit 6538c7b4c76e1d53fc801540cfe1dfe59d26bf29
    14121 loader: net_open() should not replace f->f_devdata
commit 4fd0933306bf532a1642c8821ccc6e886949df54
    14217 shbin and java exec modules do not work after 6826

Conflicts:

    usr/src/lib/libidspace/Makefile
    usr/src/lib/libidspace/Makefile.com
    usr/src/lib/libidspace/amd64/Makefile
    usr/src/lib/libidspace/common/mapfile-vers
    usr/src/lib/libidspace/i386/Makefile
    usr/src/uts/common/Makefile.files
    usr/src/uts/common/Makefile.rules
    usr/src/uts/common/sys/refhash.h

7 files changed, 5 insertions, 62 deletions

diff --git a/usr/src/lib/libidspace/Makefile b/usr/src/lib/libidspace/Makefile
index 44640eeddc..feeca43d3a 100644
--- a/usr/src/lib/libidspace/Makefile
+++ b/usr/src/lib/libidspace/Makefile
@@ -18,18 +18,17 @@ include ../Makefile.lib
 HDRS = libidspace.h
 HDRDIR = common
 
-SUBDIRS = $(MACH) 
+SUBDIRS = $(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all := TARGET = all
 clean := TARGET = clean
 clobber := TARGET = clobber
 install := TARGET = install
-lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 install: install_h $(SUBDIRS)
 
diff --git a/usr/src/lib/libidspace/Makefile.com b/usr/src/lib/libidspace/Makefile.com
index ef259c3d2f..8a0f0c402e 100644
--- a/usr/src/lib/libidspace/Makefile.com
+++ b/usr/src/lib/libidspace/Makefile.com
@@ -25,7 +25,7 @@ SRCDIR =	../common
 SRCS =		../../../common/idspace/id_space.c
 LIBS =		$(DYNLIB)
 
-LDLIBS += 	-lumem
+LDLIBS +=	-lumem
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libidspace/amd64/Makefile b/usr/src/lib/libidspace/amd64/Makefile
index 15d904c616..e03ee6aac6 100644
--- a/usr/src/lib/libidspace/amd64/Makefile
+++ b/usr/src/lib/libidspace/amd64/Makefile
@@ -16,4 +16,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/libidspace/common/llib-lidspace b/usr/src/lib/libidspace/common/llib-lidspace
deleted file mode 100644
index 39c628da47..0000000000
--- a/usr/src/lib/libidspace/common/llib-lidspace
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This file and its contents are supplied under the terms of the
- * Common Development and Distribution License ("CDDL"), version 1.0.
- * You may only use this file in accordance with the terms of version
- * 1.0 of the CDDL.
- *
- * A full copy of the text of the CDDL should have accompanied this
- * source.  A copy of the CDDL is also available via the Internet at
- * http://www.illumos.org/license/CDDL.
- */
-
-/*
- * Copyright (c) 2014 Joyent, Inc.  All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <libidspace.h>
diff --git a/usr/src/lib/libidspace/i386/Makefile b/usr/src/lib/libidspace/i386/Makefile
index 41e699e8f8..73fc6a2070 100644
--- a/usr/src/lib/libidspace/i386/Makefile
+++ b/usr/src/lib/libidspace/i386/Makefile
@@ -15,4 +15,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/libidspace/sparc/Makefile b/usr/src/lib/libidspace/sparc/Makefile
deleted file mode 100644
index 41e699e8f8..0000000000
--- a/usr/src/lib/libidspace/sparc/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright (c) 2014 Joyent, Inc.  All rights reserved.
-#
-
-include ../Makefile.com
-
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libidspace/sparcv9/Makefile b/usr/src/lib/libidspace/sparcv9/Makefile
deleted file mode 100644
index 15d904c616..0000000000
--- a/usr/src/lib/libidspace/sparcv9/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source.  A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright (c) 2014 Joyent, Inc.  All rights reserved.
-#
-
-include ../Makefile.com
-include ../../Makefile.lib.64
-
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)