Removed some leftover unnecessary code from the struct layout parser;

Removed an extra define in emmaken.py, previously added by mistake.

2 files changed, 4 insertions, 6 deletions

diff --git a/src/modules.js b/src/modules.js
index 982d1b8c..3c0972c4 100644
--- a/src/modules.js
+++ b/src/modules.js
@@ -22,7 +22,6 @@ var Debugging = {
     var structToMemberMeta = {};
     var memberMetaToStruct = {};
     var structMetaToStruct = {};
-    var structToSize = {};
     var memberMetaToMembers = {};
     var metadataToMember = {};
 
@@ -37,7 +36,7 @@ var Debugging = {
     var form4 = new RegExp(/^!llvm.dbg.[\w\.]+ = .*$/);
     var form5 = new RegExp(/^!(\d+) = metadata !{.*$/);
     var form6 = new RegExp(/^  (tail )?call void \@llvm.dbg.\w+\(metadata .*$/);
-    var formStruct = /^!(\d+) = metadata !\{i32 \d+, metadata !\d+, metadata !"([^"]+)", metadata !\d+, i32 \d+, i64 (\d+), [^,]*, [^,]*, [^,]*, [^,]*, metadata !(\d+), .*} ; \[ DW_TAG_(?:structure|class)_type \]$/;
+    var formStruct = /^!(\d+) = metadata !\{i32 \d+, metadata !\d+, metadata !"([^"]+)", metadata !\d+, i32 \d+, i64 \d+, [^,]*, [^,]*, [^,]*, [^,]*, metadata !(\d+), .*} ; \[ DW_TAG_(?:structure|class)_type \]$/;
     var formStructMembers = /^!(\d+) = metadata !\{(.*)\}$/;
     var formMember = /^!(\d+) = metadata !\{i32 \d+, metadata !\d+, metadata !"([^"]+)", metadata !\d+, i32 \d+, i64 \d+, i64 \d+, i64 \d+, .+?, metadata !(\d+)} ; \[ DW_TAG_member \]$/;
 
@@ -57,9 +56,8 @@ var Debugging = {
       calc = formStruct.exec(line);
       if (calc) {
         structMetaToStruct[calc[1]] = calc[2];
-        structToSize[calc[2]] = calc[3];
-        structToMemberMeta[calc[2]] = calc[4];
-        memberMetaToStruct[calc[4]] = calc[1];
+        structToMemberMeta[calc[2]] = calc[3];
+        memberMetaToStruct[calc[3]] = calc[1];
         skipLine = true;
       }
       calc = formStructMembers.exec(line);
diff --git a/tools/emmaken.py b/tools/emmaken.py
index c902bbdb..e6e33cb6 100755
--- a/tools/emmaken.py
+++ b/tools/emmaken.py
@@ -85,7 +85,7 @@ try:
     sys.argv = sys.argv[:-1]
 
   CC_ARG_SKIP = ['-O1', '-O2', '-O3']
-  CC_ADDITIONAL_ARGS = ['-m32', '-g', '-U__i386__', '-U__x86_64__', '-U__i386', '-U__x86_64', '-U__SSE__', '-U__SSE2__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87', '-D__USE_XOPEN2K8']
+  CC_ADDITIONAL_ARGS = ['-m32', '-g', '-U__i386__', '-U__x86_64__', '-U__i386', '-U__x86_64', '-U__SSE__', '-U__SSE2__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87']
   ALLOWED_LINK_ARGS = ['-f', '-help', '-o', '-print-after', '-print-after-all', '-print-before',
                        '-print-before-all', '-time-passes', '-v', '-verify-dom-info', '-version' ]  
   DISALLOWED_LINK_ARGS = []#['rc']