From 5d00c8d2dc542f8349ba5f1ebe7184ce984c0481 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Sun, 12 May 2019 22:53:12 +0000
Subject: [PATCH] ld: ship also as /usr/bin/ld.sun

---
 share/man/man1/Makefile                   | 2 +-
 share/man/man1/{ld.1 => ld.sun.1}         | 0
 usr/src/.gitignore                        | 4 ++--
 usr/src/cmd/sgs/ld/Makefile.com           | 2 +-
 usr/src/lib/libdtrace/common/dt_open.c    | 2 +-
 usr/src/pkg/manifests/developer-linker.mf | 8 +++++---
 6 files changed, 10 insertions(+), 8 deletions(-)
 rename share/man/man1/{ld.1 => ld.sun.1} (100%)

diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index fb339e6aed..0e9ee0c6ef 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -105,7 +105,7 @@ MAN = acctcom.1 \
       lari.1 \
       last.1 \
       lastcomm.1 \
-      ld.1 \
+      ld.sun.1 \
       ldap.1 \
       ldapdelete.1 \
       ldaplist.1 \
diff --git a/share/man/man1/ld.1 b/share/man/man1/ld.sun.1
similarity index 100%
rename from share/man/man1/ld.1
rename to share/man/man1/ld.sun.1
diff --git a/usr/src/.gitignore b/usr/src/.gitignore
index 919c2d6cf0..37352be811 100644
--- a/usr/src/.gitignore
+++ b/usr/src/.gitignore
@@ -2163,10 +2163,10 @@ cmd/sgs/elfwrap/i386/msg.h
 cmd/sgs/error/i386/error
 cmd/sgs/gprof/i386/gprof
 cmd/sgs/lari/lari
-cmd/sgs/ld/amd64/ld
+cmd/sgs/ld/amd64/ld.sun
 cmd/sgs/ld/amd64/msg.c
 cmd/sgs/ld/amd64/msg.h
-cmd/sgs/ld/i386/ld
+cmd/sgs/ld/i386/ld.sun
 cmd/sgs/ld/i386/msg.c
 cmd/sgs/ld/i386/msg.h
 cmd/sgs/ldd/amd64/ldd
diff --git a/usr/src/cmd/sgs/ld/Makefile.com b/usr/src/cmd/sgs/ld/Makefile.com
index b1a850d554..e5b381790e 100644
--- a/usr/src/cmd/sgs/ld/Makefile.com
+++ b/usr/src/cmd/sgs/ld/Makefile.com
@@ -24,7 +24,7 @@
 # Copyright 2016 RackTop Systems.
 #
 
-PROG =		ld
+PROG =		ld.sun
 
 include 	$(SRC)/cmd/Makefile.cmd
 include 	$(SRC)/cmd/sgs/Makefile.com
diff --git a/usr/src/lib/libdtrace/common/dt_open.c b/usr/src/lib/libdtrace/common/dt_open.c
index 78935c3cc3..6e4c1dbf96 100644
--- a/usr/src/lib/libdtrace/common/dt_open.c
+++ b/usr/src/lib/libdtrace/common/dt_open.c
@@ -686,7 +686,7 @@ const dtrace_pattr_t _dtrace_prvdesc = {
 };
 
 const char *_dtrace_defcpp = "/opt/gcc/4.4.4/bin/cpp"; /* default cpp(1) to invoke */
-const char *_dtrace_defld = "/usr/bin/ld";   /* default ld(1) to invoke */
+const char *_dtrace_defld = "/usr/bin/ld.sun";   /* default ld(1) to invoke */
 
 const char *_dtrace_libdir = "/usr/lib/dtrace"; /* default library directory */
 const char *_dtrace_provdir = "/dev/dtrace/provider"; /* provider directory */
diff --git a/usr/src/pkg/manifests/developer-linker.mf b/usr/src/pkg/manifests/developer-linker.mf
index 5a3c8f3ffb..2dee422d8e 100644
--- a/usr/src/pkg/manifests/developer-linker.mf
+++ b/usr/src/pkg/manifests/developer-linker.mf
@@ -50,7 +50,7 @@ file path=usr/bin/$(ARCH32)/strings mode=0555
 file path=usr/bin/$(ARCH32)/truss mode=0555
 file path=usr/bin/$(ARCH64)/elfwrap mode=0555
 file path=usr/bin/$(ARCH64)/gcore mode=0555
-file path=usr/bin/$(ARCH64)/ld mode=0755
+file path=usr/bin/$(ARCH64)/ld.sun mode=0755
 file path=usr/bin/$(ARCH64)/ldd mode=0555
 file path=usr/bin/$(ARCH64)/plimit mode=0555
 file path=usr/bin/$(ARCH64)/pvs mode=0555
@@ -59,7 +59,7 @@ file path=usr/bin/$(ARCH64)/truss mode=0555
 file path=usr/bin/elfsign mode=0555
 file path=usr/bin/elfwrap mode=0555
 file path=usr/bin/exstr mode=0555
-file path=usr/bin/ld mode=0755
+file path=usr/bin/ld.sun mode=0755
 file path=usr/bin/ldd mode=0555
 file path=usr/bin/od mode=0555
 file path=usr/bin/pvs mode=0555
@@ -85,7 +85,7 @@ file path=usr/share/man/man1/elfsign.1
 file path=usr/share/man/man1/elfwrap.1
 file path=usr/share/man/man1/exstr.1
 file path=usr/share/man/man1/gcore.1
-file path=usr/share/man/man1/ld.1
+file path=usr/share/man/man1/ld.sun.1
 file path=usr/share/man/man1/ldd.1
 file path=usr/share/man/man1/od.1
 file path=usr/share/man/man1/plimit.1
@@ -94,6 +94,8 @@ file path=usr/share/man/man1/regcmp.1
 file path=usr/share/man/man1/strings.1
 file path=usr/share/man/man1/truss.1
 file path=usr/share/man/man4/a.out.4
+link path=usr/bin/$(ARCH64)/ld target=ld.sun
+link path=usr/bin/ld target=ld.sun
 hardlink path=usr/bin/gcore target=../../usr/lib/isaexec
 hardlink path=usr/bin/plimit target=../../usr/lib/isaexec
 hardlink path=usr/bin/strings target=../../usr/lib/isaexec
-- 
2.11.4.GIT