Bug 961314 - Make hazard mozconfig avoid the stuff that breaks the analysis, r=glandium
authorSteve Fink <sfink@mozilla.com>
Wed, 12 Feb 2014 22:38:26 -0800
changeset 169678 3afcb38ad9477603f4cea52f46a9290ddd85d609
parent 169677 458f8189525bcff67848ccb51c84aa2f36aba39d
child 169679 0b1c1795142e05a94f2b3ceec21bec859c7c38ea
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersglandium
bugs961314
milestone30.0a1
Bug 961314 - Make hazard mozconfig avoid the stuff that breaks the analysis, r=glandium DONTBUILD because nothing uses it yet. I will land a mozharness change later that will enable it.
browser/config/mozconfigs/hazards
browser/config/mozconfigs/linux64/hazards
rename from browser/config/mozconfigs/hazards
rename to browser/config/mozconfigs/linux64/hazards
--- a/browser/config/mozconfigs/hazards
+++ b/browser/config/mozconfigs/linux64/hazards
@@ -1,13 +1,24 @@
 # This mozconfig is used when compiling the browser for the SM(Hf) rooting
 # hazard analysis build, see
 # https://wiki.mozilla.org/Javascript:SpiderMonkey:ExactStackRooting
 
-. "$topsrcdir/build/unix/mozconfig.linux"
+# Do NOT include build/unix/mozconfig.linux because it points directly at the
+# tooltool-installed gcc, and the analysis works by wrapping the gcc invocation
+# with a script that invokes the real gcc with -fplugin and its configuration
+# directives. Instead, duplicate the contents of that mozconfig here:
+
+. "$topsrcdir/build/mozconfig.common"
+ac_add_options --enable-elf-hack
+ac_add_options --enable-stdcxx-compat
+
+# The objdir must be at a known location so its path can be stripped from the
+# filenames stored by the analysis
+mk_add_options MOZ_OBJDIR=obj-analyzed
 
 # The configuration options are chosen to compile the most code
 # (--enable-debug, --enable-tests) in the trickiest way possible
 # (--enable-optimize) to maximize the chance of seeing tricky static orderings.
 ac_add_options --enable-debug
 ac_add_options --enable-tests
 ac_add_options --enable-optimize