--- a/usr/src/cmd/mdb/Makefile.libstand	Fri Jul 03 18:48:16 2020 +0300
+++ b/usr/src/cmd/mdb/Makefile.libstand	Mon Apr 13 20:38:20 2020 +0300
@@ -29,7 +29,7 @@
 
 include ../../Makefile.libstand
 
-SRCS += \
+SRCS_COMMON += \
 	bcmp.c \
 	bcopy.c \
 	bsearch.c \
@@ -49,6 +49,11 @@
 	strtol.c \
 	strtoul.c
 
+sparcv9_SRCS= \
+	multi3.c
+
+SRCS += $(SRCS_COMMON) $($(MACH64)_SRCS)
+
 # We don't want thread-specific errno's in kmdb, as we're single-threaded.
 DTS_ERRNO=
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/common/util/THIRDPARTYLICENSE.multi3	Mon Apr 13 20:38:20 2020 +0300
@@ -0,0 +1,311 @@
+==============================================================================
+The LLVM Project is under the Apache License v2.0 with LLVM Exceptions:
+==============================================================================
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+    1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+    2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+    3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+    4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+    6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+    7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+    8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+    9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+    END OF TERMS AND CONDITIONS
+
+    APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+
+---- LLVM Exceptions to the Apache 2.0 License ----
+
+As an exception, if, as a result of your compiling your source code, portions
+of this Software are embedded into an Object form of such source code, you
+may redistribute such embedded portions in such Object form without complying
+with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+
+In addition, if you combine or link compiled forms of this Software with
+software that is licensed under the GPLv2 ("Combined Software") and if a
+court of competent jurisdiction determines that the patent provision (Section
+3), the indemnity provision (Section 9) or other Section of the License
+conflicts with the conditions of the GPLv2, you may retroactively and
+prospectively choose to deem waived or otherwise exclude such Section(s) of
+the License, but only in their entirety and only with respect to the Combined
+Software.
+
+==============================================================================
+Software from third parties included in the LLVM Project:
+==============================================================================
+The LLVM Project contains third party software which is under different license
+terms. All such code will be identified clearly using at least one of two
+mechanisms:
+1) It will be in a separate directory tree with its own `LICENSE.txt` or
+   `LICENSE` file at the top containing the specific license and restrictions
+   which apply to that software, or
+2) It will contain specific license and restriction terms at the top of every
+   file.
+
+==============================================================================
+Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy):
+==============================================================================
+
+The compiler_rt library is dual licensed under both the University of Illinois
+"BSD-Like" license and the MIT license.  As a user of this code you may choose
+to use it under either license.  As a contributor, you agree to allow your code
+to be used under both.
+
+Full text of the relevant licenses is included below.
+
+==============================================================================
+
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2009-2019 by the contributors listed in CREDITS.TXT
+
+All rights reserved.
+
+Developed by:
+
+    LLVM Team
+
+    University of Illinois at Urbana-Champaign
+
+    http://llvm.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+
+Copyright (c) 2009-2015 by the contributors listed in CREDITS.TXT
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/common/util/THIRDPARTYLICENSE.multi3.descrip	Mon Apr 13 20:38:20 2020 +0300
@@ -0,0 +1,1 @@
+__multi3

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/common/util/multi3.c	Mon Apr 13 20:38:20 2020 +0300
@@ -0,0 +1,63 @@
+/*
+ * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+ * See https://llvm.org/LICENSE.txt for license information.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ */
+
+#include <sys/byteorder.h>
+
+#define	CHAR_BIT 8
+
+typedef int		di_int __attribute__((mode(DI)));
+typedef unsigned int	du_int __attribute__((mode(DI)));
+typedef int		ti_int __attribute__((mode(TI)));
+
+typedef union {
+	ti_int all;
+	struct {
+#if _LITTLE_ENDIAN
+		du_int low;
+		di_int high;
+#else
+		di_int high;
+		du_int low;
+#endif /* _LITTLE_ENDIAN */
+	} s;
+} twords;
+
+/* Returns: a * b */
+static
+ti_int
+__mulddi3(du_int a, du_int b)
+{
+	twords r;
+	const int bits_in_dword_2 = (int)(sizeof (di_int) * CHAR_BIT) / 2;
+	const du_int lower_mask = (du_int)~0 >> bits_in_dword_2;
+	r.s.low = (a & lower_mask) * (b & lower_mask);
+	du_int t = r.s.low >> bits_in_dword_2;
+	r.s.low &= lower_mask;
+	t += (a >> bits_in_dword_2) * (b & lower_mask);
+	r.s.low += (t & lower_mask) << bits_in_dword_2;
+	r.s.high = t >> bits_in_dword_2;
+	t = r.s.low >> bits_in_dword_2;
+	r.s.low &= lower_mask;
+	t += (b >> bits_in_dword_2) * (a & lower_mask);
+	r.s.low += (t & lower_mask) << bits_in_dword_2;
+	r.s.high += t >> bits_in_dword_2;
+	r.s.high += (a >> bits_in_dword_2) * (b >> bits_in_dword_2);
+	return (r.all);
+}
+
+/* Returns: a * b */
+ti_int
+__multi3(ti_int a, ti_int b)
+{
+	twords x;
+	x.all = a;
+	twords y;
+	y.all = b;
+	twords r;
+	r.all = __mulddi3(x.s.low, y.s.low);
+	r.s.high += x.s.high * y.s.low + x.s.low * y.s.high;
+	return (r.all);
+}

--- a/usr/src/lib/libc/port/mapfile-vers	Fri Jul 03 18:48:16 2020 +0300
+++ b/usr/src/lib/libc/port/mapfile-vers	Mon Apr 13 20:38:20 2020 +0300
@@ -3360,6 +3360,10 @@
 	__ucmpdi2;
 $endif
 
+$if sparcv9
+	__multi3;
+$endif
+
 $if _x86
 	_D_cplx_lr_div;
 	_D_cplx_lr_div_ix;

--- a/usr/src/lib/libc/sparcv9/Makefile.com	Fri Jul 03 18:48:16 2020 +0300
+++ b/usr/src/lib/libc/sparcv9/Makefile.com	Mon Apr 13 20:38:20 2020 +0300
@@ -135,7 +135,8 @@
 	strtol.o		\
 	strtoul.o		\
 	strtoll.o		\
-	strtoull.o
+	strtoull.o		\
+	multi3.o
 
 GENOBJS=			\
 	_getsp.o		\

--- a/usr/src/pkg/manifests/system-library.mf	Fri Jul 03 18:48:16 2020 +0300
+++ b/usr/src/pkg/manifests/system-library.mf	Mon Apr 13 20:38:20 2020 +0300
@@ -587,6 +587,8 @@
     license=usr/src/common/crypto/sha2/amd64/THIRDPARTYLICENSE.sha256-ni
 license usr/src/common/mpi/THIRDPARTYLICENSE \
     license=usr/src/common/mpi/THIRDPARTYLICENSE
+license usr/src/common/util/THIRDPARTYLICENSE.multi3 \
+    license=usr/src/common/util/THIRDPARTYLICENSE.multi3
 license usr/src/lib/libast/THIRDPARTYLICENSE \
     license=usr/src/lib/libast/THIRDPARTYLICENSE
 license usr/src/lib/libbsdmalloc/THIRDPARTYLICENSE \

--- a/usr/src/stand/lib/sa/Makefile	Fri Jul 03 18:48:16 2020 +0300
+++ b/usr/src/stand/lib/sa/Makefile	Mon Apr 13 20:38:20 2020 +0300
@@ -21,7 +21,7 @@
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-# 
+#
 
 LIBRARY		= libsa.a
 LOCOBJS		= assert.o ctype.o errno.o libintl.o malloc.o memlist.o \
@@ -32,7 +32,7 @@
 sparc_CMNUTILOBJS = memchr.o memmove.o
 CMNUTILOBJS	= $($(MACH)_CMNUTILOBJS) \
 		  bsearch.o memcmp.o memcpy.o memset.o qsort.o \
-		  string.o strtol.o strtoul.o
+		  string.o strtol.o strtoul.o multi3.o
 
 i386_MACHOBJS	= get.o map_prog.o
 sparc_MACHOBJS	= prom_misc.o
@@ -49,8 +49,8 @@
 CMNDIR		= ../fs/common
 CMNUTILDIR	= $(TOPDIR)/common/util
 SRCS		= $(LOCOBJS:%.o=$(SRCDIR)/%.c) $(CMNOBJS:%.o=$(CMNDIR)/%.c) \
-	  	  $(CMNUTILOBJS:%.o=$(CMNUTILDIR)/%.c) \
-	  	  $($(MACH)_ASMOBJS:%.o=$(MACH)/%.s) \
+		  $(CMNUTILOBJS:%.o=$(CMNUTILDIR)/%.c) \
+		  $($(MACH)_ASMOBJS:%.o=$(MACH)/%.s) \
 		  $($(MACH)_OBJS:%.o=$(MACH)/%.c)
 
 LDLIBS += -lsock

--- a/usr/src/uts/sparc/Makefile.files	Fri Jul 03 18:48:16 2020 +0300
+++ b/usr/src/uts/sparc/Makefile.files	Mon Apr 13 20:38:20 2020 +0300
@@ -33,7 +33,8 @@
 
 CORE_OBJS +=	ddi_arch.o	\
 		polled_io.o	\
-		sparc_ddi.o
+		sparc_ddi.o	\
+		multi3.o
 
 #
 #	generic-unix module
@@ -84,9 +85,9 @@
 #			misc modules
 #
 KRTLD_OBJS +=		\
-	doreloc.o 	\
+	doreloc.o	\
 	kobj_convrelstr.o \
-	kobj_isa.o 	\
+	kobj_isa.o	\
 	kobj_reloc.o
 
 SWAPGENERIC_OBJS += swapgeneric.o