3 files changed, 17 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 0720796b53..8dcecd79f0 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -3892,6 +3892,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2)
     ErtsSysDdllError errdesc = ERTS_SYS_DDLL_ERROR_INIT;
     Eterm ret = am_ok;
     int veto;
+    int taint = 1;
     struct erl_module_nif* lib = NULL;
     struct erl_module_instance* this_mi;
     struct erl_module_instance* prev_mi;
@@ -3944,6 +3945,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2)
         if (sne != NULL) {
             init_func = sne->nif_init;
             handle = init_func;
+            taint = sne->taint;
         }
     }
     this_mi = &module_p->curr;
@@ -3982,7 +3984,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2)
 			      " function: '%s'", errdesc.str);
 	
     }
-    else if ((erts_add_taint(mod_atom),
+    else if ((taint ? erts_add_taint(mod_atom) : 0,
 	      (entry = erts_sys_ddll_call_nif_init(init_func)) == NULL)) {
 	ret = load_nif_error(BIF_P, bad_lib, "Library init-call unsuccessful");
     }
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index ae9fe0cc62..8a746ea4b1 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1181,6 +1181,7 @@ typedef void *(*ErtsStaticNifInitFPtr)(void);
 typedef struct ErtsStaticNifEntry_ {
     const char *nif_name;
     ErtsStaticNifInitFPtr nif_init;
+    int taint;
 } ErtsStaticNifEntry;
 ErtsStaticNifEntry* erts_static_nif_get_nif_init(const char *name, int len);
 int erts_is_static_nif(void *handle);
diff --git a/erts/emulator/utils/make_driver_tab b/erts/emulator/utils/make_driver_tab
index 6f28a21f81..cefb3e2504 100755
--- a/erts/emulator/utils/make_driver_tab
+++ b/erts/emulator/utils/make_driver_tab
@@ -30,6 +30,7 @@ use File::Basename;
 my $file = "";
 my $nif = "";
 my @emu_drivers = ();
+my @emu_nifs = ();
 my @static_drivers = ();
 my @static_nifs = ();
 my $mode = 1;
@@ -61,7 +62,7 @@ while (@ARGV) {
     } elsif ($mode == 2) {
         $d = basename $d;
         $d =~ s/_nif(\..*|)$//; # strip nif.* or just nif
-        push(@static_nifs, $d);
+        push(@emu_nifs, $d);
         next;
     }
     $d = basename $d;
@@ -116,6 +117,11 @@ foreach (@static_drivers) {
 print "}\n";
 
 # prototypes
+foreach (@emu_nifs) {
+    my $d = ${_};
+    $d =~ s/\.debug//; # strip .debug
+    print "void *".$d."_nif_init(void);\n";
+}
 foreach (@static_nifs) {
     my $d = ${_};
     $d =~ s/\.debug//; # strip .debug
@@ -125,10 +131,15 @@ foreach (@static_nifs) {
 # The array itself
 print "static ErtsStaticNifEntry static_nif_tab[] =\n{\n";
 
+foreach (@emu_nifs) {
+    my $d = ${_};
+    $d =~ s/\.debug//; # strip .debug
+    print "    {\"${_}\", &".$d."_nif_init, 0},\n";
+}
 foreach (@static_nifs) {
     my $d = ${_};
     $d =~ s/\.debug//; # strip .debug
-    print "    {\"${_}\",&".$d."_nif_init},\n";
+    print "    {\"${_}\", &".$d."_nif_init, 1},\n";
 }
 
 print "    {NULL,NULL}\n};\n";