Make gcmole correctly handle 32 bit architectures.

tools/gcmole/gcmole.lua

 -- Copyright 2011 the V8 project authors. All rights reserved.
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions are
 -- met:
 --
 --     * Redistributions of source code must retain the above copyright
 --       notice, this list of conditions and the following disclaimer.
 --     * Redistributions in binary form must reproduce the above
 --       copyright notice, this list of conditions and the following
 --       disclaimer in the documentation and/or other materials provided
@@ skipping 72 matching lines @@
 local CLANG_PLUGINS = os.getenv "CLANG_PLUGINS"
 
 if not CLANG_BIN or CLANG_BIN == "" then
    error "CLANG_BIN not set"
 end
 
 if not CLANG_PLUGINS or CLANG_PLUGINS == "" then
    CLANG_PLUGINS = DIR
 end
 
-local function MakeClangCommandLine(plugin, plugin_args, triple, arch_define)
+local function MakeClangCommandLine(
+      plugin, plugin_args, triple, arch_define, clang_options)
    if plugin_args then
      for i = 1, #plugin_args do
         plugin_args[i] = "-Xclang -plugin-arg-" .. plugin
            .. " -Xclang " .. plugin_args[i]
      end
      plugin_args = " " .. table.concat(plugin_args, " ")
    end
    return CLANG_BIN .. "/clang++ -std=c++11 -c "
       .. " -Xclang -load -Xclang " .. CLANG_PLUGINS .. "/libgcmole.so"
       .. " -Xclang -plugin -Xclang "  .. plugin
       .. (plugin_args or "")
       .. " -Xclang -triple -Xclang " .. triple
       .. " -D" .. arch_define
       .. " -DENABLE_DEBUGGER_SUPPORT"
       .. " -DV8_I18N_SUPPORT"
       .. " -I./"
       .. " -Ithird_party/icu/source/common"
       .. " -Ithird_party/icu/source/i18n"
+      .. " " .. clang_options
 end
 
 function InvokeClangPluginForEachFile(filenames, cfg, func)
    local cmd_line = MakeClangCommandLine(cfg.plugin,
                                          cfg.plugin_args,
                                          cfg.triple,
-                                         cfg.arch_define)
+                                         cfg.arch_define,
+                                         cfg.clang_options)

[Michael Starzinger, 2015/02/18 09:41:54]

nit: Maybe call this "arch_options" instead? WDYT?

[Michael Achenbach, 2015/02/18 11:15:29]

Done.

    for _, filename in ipairs(filenames) do
       log("-- %s", filename)
       local action = cmd_line .. " " .. filename .. " 2>&1"
       if FLAGS.verbose then print('popen ', action) end
       local pipe = io.popen(action)
       func(filename, pipe:lines())
       local success = pipe:close()
       if not success then error("Failed to run: " .. action) end
    end
 end
@@ skipping 65 matching lines @@
 
 function mtConfig:extend(t)
    local e = {}
    for k, v in pairs(self) do e[k] = v end
    for k, v in pairs(t) do e[k] = v end
    return config(e)
 end
 
 local ARCHITECTURES = {
    ia32 = config { triple = "i586-unknown-linux",
-                   arch_define = "V8_TARGET_ARCH_IA32" },
+                   arch_define = "V8_TARGET_ARCH_IA32",
+                   clang_options = "-m32" },
    arm = config { triple = "i586-unknown-linux",
-                  arch_define = "V8_TARGET_ARCH_ARM" },
+                  arch_define = "V8_TARGET_ARCH_ARM",
+                  clang_options = "-m32" },
    x64 = config { triple = "x86_64-unknown-linux",
-                  arch_define = "V8_TARGET_ARCH_X64" },
+                  arch_define = "V8_TARGET_ARCH_X64",
+                  clang_options = "" },
    arm64 = config { triple = "x86_64-unknown-linux",
-                    arch_define = "V8_TARGET_ARCH_ARM64" },
+                    arch_define = "V8_TARGET_ARCH_ARM64",
+                    clang_options = "" },
 }
 
 -------------------------------------------------------------------------------
 -- GCSuspects Generation
 
 local gc, gc_caused, funcs
 
 local WHITELIST = {
    -- The following functions call CEntryStub which is always present.
    "MacroAssembler.*CallExternalReference",
@@ skipping 165 matching lines @@
 
 for _, arch in ipairs(ARCHS) do
    if not ARCHITECTURES[arch] then
       error ("Unknown arch: " .. arch)
    end
 
    errors = SafeCheckCorrectnessForArch(arch, report) or errors
 end
 
 os.exit(errors and 1 or 0)