From 27d18ae9bb1b17408fc2298c7e171593a8b2e8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 19 Oct 2010 20:37:26 +0200
Subject: beam_makeops: Allow -pack and -nonext to be combined

---
 erts/emulator/utils/beam_makeops | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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",
-- 
cgit v1.2.3