diff options
| author | Sverker Eriksson <[email protected]> | 2017-03-31 15:13:00 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-31 15:13:00 +0200 |
| commit | 6604585547b8e84d53aac174182cfb06289bbf73 (patch) | |
| tree | 2eda1d9e3fcd989d4861d797366b1d7b20d14890 | |
| parent | 50f8a40215cfb0dc519c511a6e942e4f2b3b0124 (diff) | |
| parent | 70bdb9e79429fb347c5437743d0e8f6851e0783d (diff) | |
| download | otp-6604585547b8e84d53aac174182cfb06289bbf73.tar.gz otp-6604585547b8e84d53aac174182cfb06289bbf73.tar.bz2 otp-6604585547b8e84d53aac174182cfb06289bbf73.zip | |
Merge PR-1390 from kostis/on_load-no_native OTP-14316
Add a no_native option to modules with an on_load
| -rw-r--r-- | lib/asn1/src/asn1rt_nif.erl | 1 | ||||
| -rw-r--r-- | lib/crypto/src/crypto.erl | 1 | ||||
| -rw-r--r-- | lib/runtime_tools/src/dyntrace.erl | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/asn1/src/asn1rt_nif.erl b/lib/asn1/src/asn1rt_nif.erl index ff464885f6..e540b9f50d 100644 --- a/lib/asn1/src/asn1rt_nif.erl +++ b/lib/asn1/src/asn1rt_nif.erl @@ -26,6 +26,7 @@ decode_ber_tlv/1, encode_ber_tlv/1]). +-compile(no_native). -on_load(load_nif/0). -define(ASN1_NIF_VSN,1). diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index ce8add6559..d322765dff 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -56,6 +56,7 @@ %%-type ec_curve() :: ec_named_curve() | ec_curve_spec(). %%-type ec_key() :: {Curve :: ec_curve(), PrivKey :: binary() | undefined, PubKey :: ec_point() | undefined}. +-compile(no_native). -on_load(on_load/0). -define(CRYPTO_NIF_VSN,302). diff --git a/lib/runtime_tools/src/dyntrace.erl b/lib/runtime_tools/src/dyntrace.erl index 58c5a773c3..5fe62a46f6 100644 --- a/lib/runtime_tools/src/dyntrace.erl +++ b/lib/runtime_tools/src/dyntrace.erl @@ -61,8 +61,8 @@ enabled_garbage_collection/3, enabled/3]). - -export([user_trace_i4s4/9]). % Know what you're doing! +-compile(no_native). -on_load(on_load/0). -type probe_arg() :: integer() | iolist(). |