aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-11-28 13:47:47 +0100
committerBjörn Gustavsson <[email protected]>2011-11-28 13:47:47 +0100
commit3bcf603c4790768d60f57fb2fdfb8efa47dad9a3 (patch)
treeee6c334352205dba71e31eb3f9ecd7a29a0dea8f /lib/compiler/src
parent4fee3925d969a42088af74dd02a791bb8e27fd9b (diff)
parent8abce7f45cd032bb20f004701e13cf641d32fef7 (diff)
downloadotp-3bcf603c4790768d60f57fb2fdfb8efa47dad9a3.tar.gz
otp-3bcf603c4790768d60f57fb2fdfb8efa47dad9a3.tar.bz2
otp-3bcf603c4790768d60f57fb2fdfb8efa47dad9a3.zip
Merge branch 'bjorn/major-release-cleanups'
* bjorn/major-release-cleanups: observer tests: Test compatibility with R13, not R12 emulator tests: Test compatibility with R13, not R12 Teach the compiler the 'r14' option erl_lint: The types introduced in R12B-5 are no longer "newly introduced" otp_internal: Stop warning for functions removed in R12 or earlier Conflicts: lib/stdlib/src/otp_internal.erl
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/compile.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index bfa7c6cedd..b4aa8f04bf 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -175,6 +175,8 @@ expand_opt(r12, Os) ->
[no_recv_opt,no_line_info|Os];
expand_opt(r13, Os) ->
[no_recv_opt,no_line_info|Os];
+expand_opt(r14, Os) ->
+ [no_line_info|Os];
expand_opt({debug_info_key,_}=O, Os) ->
[encrypt_debug_info,O|Os];
expand_opt(no_float_opt, Os) ->