aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/compile.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-11-20 10:33:30 +0100
committerLukas Larsson <[email protected]>2017-11-20 10:33:30 +0100
commita90b3712dcec20c96eeeecbabc2672ec67c7d89a (patch)
tree1f2e3f8d03324568d62412cbf1872d45b940b205 /lib/compiler/src/compile.erl
parentc08edb85c05f77c0c8c3b99361dfd373d24fccb5 (diff)
parent3b5fced77873fa6ee87a81a6162acf9d9f43c6de (diff)
downloadotp-a90b3712dcec20c96eeeecbabc2672ec67c7d89a.tar.gz
otp-a90b3712dcec20c96eeeecbabc2672ec67c7d89a.tar.bz2
otp-a90b3712dcec20c96eeeecbabc2672ec67c7d89a.zip
Merge branch 'maint'
Conflicts: lib/compiler/src/beam_listing.erl
Diffstat (limited to 'lib/compiler/src/compile.erl')
-rw-r--r--lib/compiler/src/compile.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index b0d0da0f66..f7beed430c 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -787,8 +787,10 @@ asm_passes() ->
| binary_passes()].
binary_passes() ->
- [{native_compile,fun test_native/1,fun native_compile/2},
- {unless,binary,?pass(save_binary,not_werror)}].
+ [{iff,'to_dis',{listing,"dis"}},
+ {native_compile,fun test_native/1,fun native_compile/2},
+ {unless,binary,?pass(save_binary,not_werror)}
+ ].
%%%
%%% Compiler passes.