aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-10-20 12:14:27 +0200
committerBjörn Gustavsson <[email protected]>2014-10-20 12:14:27 +0200
commitc36765a19f48701c5216bc9eeb305aefe5031c71 (patch)
treee80485ce08826d6473d83860cb86a0e509ed4139
parent4a2fd35c20ec602a1dc8b28c0fe1906ac35a2b55 (diff)
parent9cb95b757c4f40c5b1ca1f0146ca98917d3f8668 (diff)
downloadotp-c36765a19f48701c5216bc9eeb305aefe5031c71.tar.gz
otp-c36765a19f48701c5216bc9eeb305aefe5031c71.tar.bz2
otp-c36765a19f48701c5216bc9eeb305aefe5031c71.zip
Merge branch 'tuncer/compiler/finalize-asm-deprecation/OTP-12100'
* tuncer/compiler/finalize-asm-deprecation/OTP-12100: compiler: finalize 18.x 'asm' deprecation
-rw-r--r--lib/compiler/src/compile.erl5
-rw-r--r--lib/compiler/test/compile_SUITE.erl2
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index c7d91070f6..f347438509 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -431,11 +431,6 @@ pass(from_core) ->
{".core",[?pass(parse_core)|core_passes()]};
pass(from_asm) ->
{".S",[?pass(beam_consult_asm)|asm_passes()]};
-pass(asm) ->
- %% TODO: remove 'asm' in 18.0
- io:format("compile:file/2 option 'asm' has been deprecated and will be~n"
- "removed in the 18.0 release. Use 'from_asm' instead.~n"),
- pass(from_asm);
pass(from_beam) ->
{".beam",[?pass(read_beam_file)|binary_passes()]};
pass(_) -> none.
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 8cb7d1b55b..128291dc67 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -365,7 +365,7 @@ listings_big(Config) when is_list(Config) ->
?line do_listing(Big, TargetDir, dkern, ".kernel"),
?line Target = filename:join(TargetDir, big),
- ?line {ok,big} = compile:file(Target, [asm,{outdir,TargetDir}]),
+ {ok,big} = compile:file(Target, [from_asm,{outdir,TargetDir}]),
%% Cleanup.
?line ok = file:delete(Target ++ ".beam"),