[illumos-gate merge]

commit 27bb9688e4a8143e7fb6e5a968c192a7b594b32b
    14911 ldd should be 64bit only
commit 80b8dac6b3f2dc1f25951b319091df750a4e7d81
    14906 AMD CPU microcode files should not be flagged with 'preserve'

Conflicts:
    manifest

10 files changed, 40 insertions, 119 deletions

diff --git a/usr/src/cmd/sgs/ldd/Makefile b/usr/src/cmd/sgs/ldd/Makefile
index 3fb5c9663e..51aa02ad48 100644
--- a/usr/src/cmd/sgs/ldd/Makefile
+++ b/usr/src/cmd/sgs/ldd/Makefile
@@ -20,9 +20,9 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1996 by Sun Microsystems, Inc.
 # All rights reserved.
 
+BUILD32 = $(POUND_SIGN)
+
 include		$(SRC)/cmd/sgs/Makefile.sub
diff --git a/usr/src/cmd/sgs/ldd/Makefile.com b/usr/src/cmd/sgs/ldd/Makefile.com
index ec6f5a04c7..2b6e966984 100644
--- a/usr/src/cmd/sgs/ldd/Makefile.com
+++ b/usr/src/cmd/sgs/ldd/Makefile.com
@@ -44,10 +44,8 @@ MAPOPTS=	$(MAPFILE:%=-Wl,-M%)
 CPPFLAGS +=	-I. -I../../include -I../../include/$(MACH) \
 		-I$(SRC)/uts/$(ARCH)/sys \
 		$(CPPFLAGS.master)
-LLDFLAGS =	'-R$$ORIGIN/../../lib'
-LLDFLAGS64 =	'-R$$ORIGIN/../../../lib/$(MACH64)'
-LDFLAGS +=	$(VERSREF) $(MAPOPTS) $(LLDFLAGS)
-LDLIBS +=	$(CONVLIBDIR) -lconv -lelf
+LDFLAGS +=	$(VERSREF) $(MAPOPTS) '-R$$ORIGIN/../../lib/$(MACH64)'
+LDLIBS +=	$(CONVLIBDIR64) -lconv $(ELFLIBDIR64) -lelf
 
 SMOFF += or_vs_and
 
diff --git a/usr/src/cmd/sgs/ldd/amd64/Makefile b/usr/src/cmd/sgs/ldd/amd64/Makefile
index 4950df4904..ea4abd8248 100644
--- a/usr/src/cmd/sgs/ldd/amd64/Makefile
+++ b/usr/src/cmd/sgs/ldd/amd64/Makefile
@@ -28,10 +28,10 @@ include		../Makefile.com
 
 .KEEP_STATE:
 
-CONVLIBDIR =	$(CONVLIBDIR64)
-LLDFLAGS =	$(LLDFLAGS64)
-
-ROOTPROG =	$(ROOTPROG64)
-
 include		../Makefile.targ
 include		$(SRC)/Makefile.master.64
+
+install:	$(ROOTPROG) $(ROOTPROG64)
+
+$(ROOTBIN64)/ldd:
+	$(RM) $@; $(SYMLINK) ../../bin/ldd $@
diff --git a/usr/src/cmd/sgs/ldd/common/ldd.c b/usr/src/cmd/sgs/ldd/common/ldd.c
index 8680d95ea0..069048ae18 100644
--- a/usr/src/cmd/sgs/ldd/common/ldd.c
+++ b/usr/src/cmd/sgs/ldd/common/ldd.c
@@ -163,16 +163,6 @@ main(int argc, char **argv, char **envp)
 	Aliste	idx;
 
 	/*
-	 * If we're on a 64-bit kernel, try to exec a full 64-bit version of
-	 * the binary.  If successful, conv_check_native() won't return.
-	 *
-	 * This is done to ensure that ldd can handle objects >2GB.
-	 * ldd uses libelf, which is not large file capable. The
-	 * 64-bit ldd can handle any sized object.
-	 */
-	(void) conv_check_native(argv, envp);
-
-	/*
 	 * Establish locale.
 	 */
 	(void) setlocale(LC_MESSAGES, MSG_ORIG(MSG_STR_EMPTY));
diff --git a/usr/src/cmd/sgs/ldd/i386/Makefile b/usr/src/cmd/sgs/ldd/i386/Makefile
deleted file mode 100644
index ddafdb6d57..0000000000
--- a/usr/src/cmd/sgs/ldd/i386/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
-#
-
-include		../Makefile.com
-
-.KEEP_STATE:
-
-install:	$(ROOTPROG)
-
-include		../Makefile.targ
diff --git a/usr/src/cmd/sgs/ldd/sparc/Makefile b/usr/src/cmd/sgs/ldd/sparc/Makefile
deleted file mode 100644
index ddafdb6d57..0000000000
--- a/usr/src/cmd/sgs/ldd/sparc/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
-#
-
-include		../Makefile.com
-
-.KEEP_STATE:
-
-install:	$(ROOTPROG)
-
-include		../Makefile.targ
diff --git a/usr/src/cmd/sgs/ldd/sparcv9/Makefile b/usr/src/cmd/sgs/ldd/sparcv9/Makefile
index 4950df4904..ea4abd8248 100644
--- a/usr/src/cmd/sgs/ldd/sparcv9/Makefile
+++ b/usr/src/cmd/sgs/ldd/sparcv9/Makefile
@@ -28,10 +28,10 @@ include		../Makefile.com
 
 .KEEP_STATE:
 
-CONVLIBDIR =	$(CONVLIBDIR64)
-LLDFLAGS =	$(LLDFLAGS64)
-
-ROOTPROG =	$(ROOTPROG64)
-
 include		../Makefile.targ
 include		$(SRC)/Makefile.master.64
+
+install:	$(ROOTPROG) $(ROOTPROG64)
+
+$(ROOTBIN64)/ldd:
+	$(RM) $@; $(SYMLINK) ../../bin/ldd $@
diff --git a/usr/src/data/ucode/update.amd b/usr/src/data/ucode/update.amd
index 132832ca22..55a2894211 100755
--- a/usr/src/data/ucode/update.amd
+++ b/usr/src/data/ucode/update.amd
@@ -141,8 +141,7 @@ rm -f $mf.tmp
 for f in amd/*; do
 	bf=${f##*/}
 	[[ $bf = THIRDPARTYLICENSE* ]] && continue
-	echo "file path=$FW/$bf group=sys mode=0444"\
-	    "reboot-needed=true preserve=true" >> $mf
+	echo "file path=$FW/$bf group=sys mode=0444 reboot-needed=true" >> $mf
 done
 
 sed -i "/pkg.fmri.*microcode\/amd@/s/@[0-9]*/@$ver/" $mf
diff --git a/usr/src/pkg/manifests/developer-linker.p5m b/usr/src/pkg/manifests/developer-linker.p5m
index d1ba314819..a827118d39 100644
--- a/usr/src/pkg/manifests/developer-linker.p5m
+++ b/usr/src/pkg/manifests/developer-linker.p5m
@@ -41,7 +41,7 @@ dir  path=usr/bin/$(ARCH64)
 file path=usr/bin/$(ARCH64)/elfwrap mode=0555
 file path=usr/bin/$(ARCH64)/gcore mode=0555
 link path=usr/bin/$(ARCH64)/ld target=../../bin/ld
-file path=usr/bin/$(ARCH64)/ldd mode=0555
+link path=usr/bin/$(ARCH64)/ldd target=../../bin/ldd
 file path=usr/bin/$(ARCH64)/plimit mode=0555
 file path=usr/bin/$(ARCH64)/pvs mode=0555
 file path=usr/bin/$(ARCH64)/strings mode=0555
diff --git a/usr/src/pkg/manifests/system-microcode-amd.p5m b/usr/src/pkg/manifests/system-microcode-amd.p5m
index a3d8fb95eb..a79641cbc4 100644
--- a/usr/src/pkg/manifests/system-microcode-amd.p5m
+++ b/usr/src/pkg/manifests/system-microcode-amd.p5m
@@ -46,53 +46,53 @@ dir  path=platform/i86pc group=sys
 dir  path=platform/i86pc/ucode group=sys
 dir  path=platform/i86pc/ucode/AuthenticAMD group=sys
 file path=platform/i86pc/ucode/AuthenticAMD/1020-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1022-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1041-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1043-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1062-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1080-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/1081-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/10A0-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/2031-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/3010-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/5010-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/5020-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/6012-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/6020-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/6101-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/7001-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/8012-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/8082-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/8310-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/A010-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/A011-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/A012-00 group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/container group=sys mode=0444 \
-    preserve=true reboot-needed=true
+    reboot-needed=true
 file path=platform/i86pc/ucode/AuthenticAMD/equivalence-table group=sys \
-    mode=0444 preserve=true reboot-needed=true
+    mode=0444 reboot-needed=true
 license lic_CDDL license=lic_CDDL
 license usr/src/data/ucode/amd/THIRDPARTYLICENSE \
     license=usr/src/data/ucode/amd/THIRDPARTYLICENSE