Merge branch 'lukas/erts/tracer-module-and-more/PR-1009/OTP-10268'

* lukas/erts/tracer-module-and-more/PR-1009/OTP-10268: (26 commits)
  erts: Don't trace on link events when port is dead
  erts: more logging in trace_bif_SUITE trace_bif_return
  erts: Make trace_delivered go via sys msg dispatcher again
  erts: Add comment about future trace optimizations
  erts: Optimize tracer reload test
  erts: Document erlang:match_spec_test/3
  runtime_tools: Make dbg work with erl_tracer modules
  runtime_rools: Allow new timestamp trace flags
  runtime_tools: Lots of dbg docs updates
  erts: Deallocate heap fragments from trace nif calls
  eprof: Fix tests after tracer module incompatabilities
  fprof: update to work with new spawned trace event
  erts: Add 'spawned' trace event to 'procs' trace flag
  erts: send and receive no longer need status lock
  erts: Do 'unregister' as "self-tracing"
  erts: Silence harmless valgrind warning in dec_term
  erts: Fix end_per_testcase crash in local_trace_SUITE
  observer: Update ttb to work with tracing on ports
  runtime_tools: Update dbg to work with tracing on ports
  erts: Add tracing examples in match spec docs
  ...

1 files changed, 9 insertions, 4 deletions

diff --git a/erts/emulator/utils/make_driver_tab b/erts/emulator/utils/make_driver_tab
index 646959e8b2..ffb5f58ebf 100755
--- a/erts/emulator/utils/make_driver_tab
+++ b/erts/emulator/utils/make_driver_tab
@@ -31,7 +31,7 @@ my $file = "";
 my $nif = "";
 my @emu_drivers = ();
 my @static_drivers = ();
-my @nifs = ();
+my @static_nifs = ();
 my $mode = 1;
 
 while (@ARGV) {
@@ -55,9 +55,14 @@ while (@ARGV) {
 	    push(@static_drivers, $d);
 	}
 	if ($mode == 2) {
-	    push(@nifs, $d);
+	    push(@static_nifs, $d);
 	}
 	next;
+    } elsif ($mode == 2) {
+        $d = basename $d;
+        $d =~ s/_nif(\..*|)$//; # strip nif.* or just nif
+        push(@static_nifs, $d);
+        next;
     }
     $d = basename $d;
     $d =~ s/drv(\..*|)$//;	# strip drv.* or just drv
@@ -120,7 +125,7 @@ typedef struct ErtsStaticNifEntry_ {
 EOF
 
 # prototypes
-foreach (@nifs) {
+foreach (@static_nifs) {
     my $d = ${_};
     $d =~ s/\.debug//; # strip .debug
     print "void *".$d."_nif_init(void);\n";
@@ -129,7 +134,7 @@ foreach (@nifs) {
 # The array itself
 print "static ErtsStaticNifEntry static_nif_tab[] =\n{\n";
 
-foreach (@nifs) {
+foreach (@static_nifs) {
     my $d = ${_};
     $d =~ s/\.debug//; # strip .debug
     print "{\"${_}\",&".$d."_nif_init},\n";