aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-10-19 20:37:26 +0200
committerBjörn Gustavsson <[email protected]>2011-01-17 15:23:37 +0100
commit27d18ae9bb1b17408fc2298c7e171593a8b2e8ca (patch)
treeb4c367b454caf818e017eb60d00b5f37e3e16472
parent12d221c867d057379933d1434cd422302ad1e5ac (diff)
downloadotp-27d18ae9bb1b17408fc2298c7e171593a8b2e8ca.tar.gz
otp-27d18ae9bb1b17408fc2298c7e171593a8b2e8ca.tar.bz2
otp-27d18ae9bb1b17408fc2298c7e171593a8b2e8ca.zip
beam_makeops: Allow -pack and -nonext to be combined
-rwxr-xr-xerts/emulator/utils/beam_makeops5
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index 5c242ce9c4..c2fb101846 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -919,7 +919,10 @@ sub basic_generator {
$var_decls .= "BeamInstr tmp_packed2;"
if $macro_code =~ /tmp_packed2/;
if ($flags =~ /-nonext/) {
- $code = "$macro_code\n";
+ $code = join("\n",
+ "{ $var_decls",
+ $macro_code,
+ "}");
} else {
$code = join("\n",
"{ $var_decls",