[illumos-gate merge]release-20190718

commit 270832fa1e63c01a4a8ecb6dc23eb148a4d54831
    11394 iconv_modules build could be much more parallel
commit 899e9c20aee1ed62e7c103b3cffd0aaa17e8e679
    11472 fix libdemangle rust changes

13 files changed, 32 insertions, 14 deletions

diff --git a/usr/src/lib/iconv_modules/Makefile b/usr/src/lib/iconv_modules/Makefile
index a881735665..e8ec6dc252 100644
--- a/usr/src/lib/iconv_modules/Makefile
+++ b/usr/src/lib/iconv_modules/Makefile
@@ -35,6 +35,8 @@ clobber		:=	TARGET = clobber
 
 all install lint clean clobber: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	cd $@; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/common/Makefile b/usr/src/lib/iconv_modules/common/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/common/Makefile
+++ b/usr/src/lib/iconv_modules/common/Makefile
@@ -39,6 +39,8 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/euro/Makefile b/usr/src/lib/iconv_modules/euro/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/euro/Makefile
+++ b/usr/src/lib/iconv_modules/euro/Makefile
@@ -39,6 +39,8 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/euro/Makefile.com b/usr/src/lib/iconv_modules/euro/Makefile.com
index 444be97b64..c51372dcad 100644
--- a/usr/src/lib/iconv_modules/euro/Makefile.com
+++ b/usr/src/lib/iconv_modules/euro/Makefile.com
@@ -44,18 +44,18 @@ include $(SRC)/lib/iconv_modules/Makefile.iconv
 
 LDFLAGS = $(DYNFLAGS) $(LDLIBS)
 
-CFLAGS		+= $(INCLUDES) $(XREGSFLAG) -D_REENTRANT
+CFLAGS		+= $(XREGSFLAG) -D_REENTRANT
 
-CLEANFILES +=	core ../common/tbl.h
+CLEANFILES +=	tbl.h
 
-$(ALL_SOS): ../common/euro.h ../common/euro.c ../common/tbl.h
+$(ALL_SOS): ../common/euro.h ../common/euro.c tbl.h
 	TABLE=`echo $@ | $(TR) -d "-" | sed -e s:%:_:g | /usr/bin/cut -d. -f1` ; \
-	$(CC) $(CFLAGS) -DT_$$TABLE ../common/euro.c -c -o $@.o ; \
+	$(CC) $(CFLAGS) $(CPPFLAGS) -DT_$$TABLE ../common/euro.c -c -o $@.o ; \
 	$(LD) $(LDFLAGS) -o $@ $@.o $(LDLIBS)
 	$(POST_PROCESS_SO)
 
-../common/tbl.h: ../genincl $(TABLES:%=../tbls/%)
-	cd ..; ./genincl > common/tbl.h
+tbl.h: ../genincl $(TABLES:%=../tbls/%)
+	(cd ..; ./genincl) > $@
 
 $(CREATE_LINKS):  $(ICONV_LINK_TARGETS)
 	$(SYMLINK) -f 646%8859-1.so $(ICONV_DIR)/646%8859-15.so
diff --git a/usr/src/lib/iconv_modules/hi_IN/Makefile b/usr/src/lib/iconv_modules/hi_IN/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/hi_IN/Makefile
+++ b/usr/src/lib/iconv_modules/hi_IN/Makefile
@@ -39,6 +39,8 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/ja/Makefile b/usr/src/lib/iconv_modules/ja/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/ja/Makefile
+++ b/usr/src/lib/iconv_modules/ja/Makefile
@@ -39,6 +39,8 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/ko/Makefile b/usr/src/lib/iconv_modules/ko/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/ko/Makefile
+++ b/usr/src/lib/iconv_modules/ko/Makefile
@@ -39,6 +39,8 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/th_TH/Makefile b/usr/src/lib/iconv_modules/th_TH/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/th_TH/Makefile
+++ b/usr/src/lib/iconv_modules/th_TH/Makefile
@@ -39,6 +39,8 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile b/usr/src/lib/iconv_modules/utf-8/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile
@@ -39,6 +39,8 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile.com b/usr/src/lib/iconv_modules/utf-8/Makefile.com
index 2136e0ea66..34e767dc71 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile.com
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile.com
@@ -38,7 +38,7 @@ GENI_SRCS		= ../common/binarytables/srcs
 include $(SRC)/lib/iconv_modules/Makefile.iconv
 include $(SRC)/lib/iconv_modules/utf-8/Makefile.iconv
 
-CLEANFILES =    *.o *.so core *.bt
+CLEANFILES =    *.o *.so *.bt
 
 .NO_PARALLEL:
 
diff --git a/usr/src/lib/iconv_modules/vi/Makefile b/usr/src/lib/iconv_modules/vi/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/vi/Makefile
+++ b/usr/src/lib/iconv_modules/vi/Makefile
@@ -39,6 +39,8 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/iconv_modules/zh/Makefile b/usr/src/lib/iconv_modules/zh/Makefile
index da26c3adf1..eaa4f5a9f1 100644
--- a/usr/src/lib/iconv_modules/zh/Makefile
+++ b/usr/src/lib/iconv_modules/zh/Makefile
@@ -39,6 +39,8 @@ echo :=         TARGET = echo
 
 all clean clobber install lint echo: $(SUBDIRS)
 
+.PARALLEL: $(SUBDIRS)
+
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/libdemangle/common/rust.c b/usr/src/lib/libdemangle/common/rust.c
index ec5e07b354..b3aeb3a2a1 100644
--- a/usr/src/lib/libdemangle/common/rust.c
+++ b/usr/src/lib/libdemangle/common/rust.c
@@ -239,7 +239,7 @@ rustdem_parse_name_segment(rustdem_state_t *st, strview_t *svp, boolean_t first)
 
 	rem = sv_remaining(&sv);
 
-	if (rem < len || len == SIZE_MAX) {
+	if (rem < len) {
 		st->rds_error = EINVAL;
 		return (B_FALSE);
 	}
@@ -384,13 +384,11 @@ rustdem_parse_hash(rustdem_state_t *st, strview_t *svp)
 }
 
 /*
- * A 10 digit value would imply a name 1Gb or larger in size.  It seems
- * unlikely to the point of absurdity any such value could every possibly
- * be valid (or even have compiled properly).  This also prevents the
- * uint64_t conversion from possibly overflowing since the value must always
- * be below 10 * UINT32_MAX.
+ * We have to pick an arbitrary limit here; 999,999,999 fits comfortably
+ * within an int32_t, so let's go with that, as it seems unlikely we'd
+ * ever see a larger value in context.
  */
-#define	MAX_DIGITS 10
+#define	MAX_DIGITS 9
 
 static boolean_t
 rustdem_parse_num(rustdem_state_t *restrict st, strview_t *restrict svp,