diff options
| author | Björn Gustavsson <[email protected]> | 2013-12-19 10:15:40 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-12-19 10:15:40 +0100 |
| commit | 7fcde0281c04170595d437dc0480f4cd690c6fde (patch) | |
| tree | 353cf81814416569c645236a20fa2f8daff6d94f /lib/compiler/src | |
| parent | 3ee4bd41cdebf355447571fc9cb10b4fe5132ad9 (diff) | |
| parent | 455c8238535d2754234cd68bbf7caba9960607d6 (diff) | |
| download | otp-7fcde0281c04170595d437dc0480f4cd690c6fde.tar.gz otp-7fcde0281c04170595d437dc0480f4cd690c6fde.tar.bz2 otp-7fcde0281c04170595d437dc0480f4cd690c6fde.zip | |
Merge branch 'ta/compiler/asm-core/OTP-11547'
* ta/compiler/asm-core/OTP-11547:
Officially support building core files
Officially support building assembler files
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/compile.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index 47d446273b..38a733751a 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -417,6 +417,10 @@ pass(from_core) -> pass(from_asm) -> {".S",[?pass(beam_consult_asm)|asm_passes()]}; pass(asm) -> + %% TODO: remove 'asm' in R18 + io:format("compile:file/2 option 'asm' has been deprecated and will be " + "removed in R18.~n" + "Use 'from_asm' instead.~n"), pass(from_asm); pass(from_beam) -> {".beam",[?pass(read_beam_file)|binary_passes()]}; @@ -1613,7 +1617,7 @@ compile_beam(File0, _OutFile, Opts) -> compile_asm(File0, _OutFile, Opts) -> File = shorten_filename(File0), - case file(File, [asm|make_erl_options(Opts)]) of + case file(File, [from_asm|make_erl_options(Opts)]) of {ok,_Mod} -> ok; Other -> Other end. |