aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2009-12-11 09:42:43 +0000
committerErlang/OTP <otp@erlang.org>2009-12-11 09:42:43 +0000
commita4d5f63b767793d33c06901760c0f35143ac6574 (patch)
tree13fe18e875c78fe10d17582f5dd04f5e4541655d
parent8ac319031230b354dcea105d94ef2a232a9d7afe (diff)
parent47bd30c0efd50af2f297c8f016ca80b08855592f (diff)
downloadotp-a4d5f63b767793d33c06901760c0f35143ac6574.tar.gz
otp-a4d5f63b767793d33c06901760c0f35143ac6574.tar.bz2
otp-a4d5f63b767793d33c06901760c0f35143ac6574.zip
Merge branch 'bg/slimmer-history' into ccase/r13b04_dev
* bg/slimmer-history: beam_makepos: Do not put any dates in generated files compiler: Teach 'slim' to omit compilation info
-rwxr-xr-xerts/emulator/utils/beam_makeops4
-rw-r--r--lib/compiler/src/beam_asm.erl2
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index 2b7e8a6dde..4a859c3094 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -753,8 +753,8 @@ sub comment {
print "$prefix$line\n";
}
} else {
- print "$prefix Warning: Do not edit this file. It was automatically\n";
- print "$prefix generated by '$prog' on ", (scalar localtime), ".\n";
+ print "$prefix Warning: Do not edit this file.\n";
+ print "$prefix Auto-generated by '$prog'.\n";
}
if ($lang eq 'C') {
print " */\n";
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl
index 90d25d87b2..497c4fa07b 100644
--- a/lib/compiler/src/beam_asm.erl
+++ b/lib/compiler/src/beam_asm.erl
@@ -150,7 +150,7 @@ build_file(Code, Attr, Dict, NumLabels, NumFuncs, Abst, SourceFile, Opts) ->
%% Create IFF chunk.
Chunks = case member(slim, Opts) of
- true -> [Essentials,AttrChunk,CompileChunk,AbstChunk];
+ true -> [Essentials,AttrChunk,AbstChunk];
false -> [Essentials,LocChunk,AttrChunk,CompileChunk,AbstChunk]
end,
build_form(<<"BEAM">>, Chunks).