diff options
| author | Erlang/OTP <[email protected]> | 2010-03-25 14:23:21 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-03-25 14:23:21 +0000 |
| commit | 7ffd0736fa636a871b39412ab037d7fb1ed04cf1 (patch) | |
| tree | 9d57389bc0f41dcaaeaea445a059b4458f9bd797 /lib/compiler/src/compile.erl | |
| parent | 01d605fdb7c396b5c98a9151baf3882930d0c6af (diff) | |
| parent | d179c1522c73de550bce45c7f5d5055e04b93f32 (diff) | |
| download | otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.tar.gz otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.tar.bz2 otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.zip | |
Merge branch 'bg/compiler-remove-r11-support' into dev
* bg/compiler-remove-r11-support:
compiler: Don't support the no_binaries option
erts: Don't support the put_string/3 instruction
compiler: Don't support the no_constant_pool option
compiler: Don't support the r11 option
test_server: Don't support communication with R11 nodes
binary_SUITE: Don't test bit-level binary roundtrips with R11 nodes
erts: Test compatibility of funs with R12 instead of R11
OTP-8531 bg/compiler-remove-r11-support
Diffstat (limited to 'lib/compiler/src/compile.erl')
| -rw-r--r-- | lib/compiler/src/compile.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index b853800d73..5017fd2c23 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -162,13 +162,8 @@ expand_opt(report, Os) -> [report_errors,report_warnings|Os]; expand_opt(return, Os) -> [return_errors,return_warnings|Os]; -expand_opt(r11, Os) -> - [no_stack_trimming,no_binaries,no_constant_pool|Os]; expand_opt({debug_info_key,_}=O, Os) -> [encrypt_debug_info,O|Os]; -expand_opt(no_binaries=O, Os) -> - %%Turn off the entire type optimization pass. - [no_topt,O|Os]; expand_opt(no_float_opt, Os) -> %%Turn off the entire type optimization pass. [no_topt|Os]; @@ -590,7 +585,7 @@ core_passes() -> kernel_passes() -> %% Destructive setelement/3 optimization and core lint. - [{unless,no_constant_pool,?pass(core_dsetel_module)}, %Not safe without constant pool. + [?pass(core_dsetel_module), {iff,dsetel,{listing,"dsetel"}}, {iff,clint,?pass(core_lint_module)}, |