10908 Simplify SMAP relocations with krtld

@@ -21,10 +21,11 @@
 
 #
 # Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
 # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright (c) 2017 Joyent, Inc.
 #
 
 #       This Makefile defines the build rules for the directory uts/i86pc
 #       and its children. These are the source files which are i86pc
 #       "implementation architecture" dependent.

@@ -313,11 +314,12 @@
 #
 # dtrace stubs
 #
 
 $(OBJS_DIR)/dtracestubs.s:      $(UNIX_O) $(LIBS)
-        $(NM) -u $(UNIX_O) $(LIBS) | $(GREP) __dtrace_probe_ | $(SORT) | \
+        $(NM) -u $(UNIX_O) $(LIBS) | \
+        $(EGREP) '(__dtrace_probe_|smap_(disable|enable))' | $(SORT) | \
             $(UNIQ) | $(AWK) '{ \
             printf("\t.globl %s\n\t.type %s,@function\n%s:\n", \
             $$1, $$1, $$1); }' > $(OBJS_DIR)/dtracestubs.s
 
 $(DTRACESTUBS): $(DTRACESTUBS_O)