Add a bunch of compile-time flags to the gyp build (and top-level Makefile)

Review URL: http://codereview.chromium.org/7748018

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9025 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/Makefile b/Makefile
index 489210f05b34c4f4c0454f3d5d044429ea057cbd..3008779bb34ecbd2b2080ac30021b40ddcc0d6e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,58 @@ CXX ?= "g++"  # For distcc: export CXX="distcc g++"
 LINK ?= "g++"
 OUTDIR ?= out
 TESTJOBS ?= -j16
-GYPFLAGS ?= -Dv8_can_use_vfp_instructions=true
-
-# Architectures and modes to be compiled.
+GYPFLAGS ?=
+
+# Special build flags. Use them like this: "make library=shared"
+
+# library=shared || component=shared_library
+ifeq ($(library), shared)
+  GYPFLAGS += -Dcomponent=shared_library
+endif
+ifdef component
+  GYPFLAGS += -Dcomponent=$(component)
+endif
+# console=readline
+ifdef console
+  GYPFLAGS += -Dconsole=$(console)
+endif
+# disassembler=on
+ifeq ($(disassembler), on)
+  GYPFLAGS += -Dv8_enable_disassembler=1
+endif
+# snapshot=off
+ifeq ($(snapshot), off)
+  GYPFLAGS += -Dv8_use_snapshot='false'
+endif
+# gdbjit=on
+ifeq ($(gdbjit), on)
+  GYPFLAGS += -Dv8_enable_gdbjit=1
+endif
+# liveobjectlist=on
+ifeq ($(liveobjectlist), on)
+  GYPFLAGS += -Dv8_use_liveobjectlist=true
+endif
+# vfp3=off
+ifeq ($(vfp3), off)
+  GYPFLAGS += -Dv8_can_use_vfp_instructions=false
+else
+  GYPFLAGS += -Dv8_can_use_vfp_instructions=true
+endif
+
+# ----------------- available targets: --------------------
+# - any arch listed in ARCHES (see below)
+# - any mode listed in MODES
+# - every combination <arch>.<mode>, e.g. "ia32.release"
+# - any of the above with .check appended, e.g. "ia32.release.check"
+# - default (no target specified): build all ARCHES and MODES
+# - "check": build all targets and run all tests
+# - "<arch>.clean" for any <arch> in ARCHES
+# - "clean": clean all ARCHES
+
+# ----------------- internal stuff ------------------------
+
+# Architectures and modes to be compiled. Consider these to be internal
+# variables, don't override them (use the targets instead).
 ARCHES = ia32 x64 arm
 MODES = release debug
 
@@ -44,27 +93,24 @@ GYPFILES = build/all.gyp build/common.gypi build/standalone.gypi \
 
 # Generates all combinations of ARCHES and MODES, e.g. "ia32.release".
 BUILDS = $(foreach mode,$(MODES),$(addsuffix .$(mode),$(ARCHES)))
-CHECKS = $(addsuffix .check,$(BUILDS))
 # Generates corresponding test targets, e.g. "ia32.release.check".
+CHECKS = $(addsuffix .check,$(BUILDS))
+# File where previously used GYPFLAGS are stored.
+ENVFILE = $(OUTDIR)/environment
 
-.PHONY: all release debug ia32 x64 arm $(BUILDS)
-
-# Target definitions. "all" is the default, you can specify any others on the
-# command line, e.g. "make ia32". Targets defined in $(BUILDS), e.g.
-# "ia32.debug", can also be specified.
-all: release debug
-
-release: $(addsuffix .release,$(ARCHES))
-
-debug: $(addsuffix .debug,$(ARCHES))
+.PHONY: all clean $(ENVFILE).new \
+        $(ARCHES) $(MODES) $(BUILDS) $(addsuffix .clean,$(ARCHES))
 
-ia32: $(addprefix ia32.,$(MODES))
+# Target definitions. "all" is the default.
+all: $(MODES)
 
-x64: $(addprefix x64.,$(MODES))
+# Compile targets. MODES and ARCHES are convenience targets.
+.SECONDEXPANSION:
+$(MODES): $(addsuffix .$$@,$(ARCHES))
 
-arm: $(addprefix arm.,$(MODES))
+$(ARCHES): $(addprefix $$@.,$(MODES))
 
-.SECONDEXPANSION:
+# Defines how to build a particular target (e.g. ia32.release).
 $(BUILDS): $(OUTDIR)/Makefile-$$(basename $$@)
        @$(MAKE) -C "$(OUTDIR)" -f Makefile-$(basename $@) \
                 CXX="$(CXX)" LINK="$(LINK)" \
@@ -77,13 +123,16 @@ check: all
        @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR)
 
 $(addsuffix .check,$(MODES)): $$(basename $$@)
-       @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) --mode=$(basename $@)
+       @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
+           --mode=$(basename $@)
 
 $(addsuffix .check,$(ARCHES)): $$(basename $$@)
-       @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) --arch=$(basename $@)
+       @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
+           --arch=$(basename $@)
 
 $(CHECKS): $$(basename $$@)
-       @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) --arch-and-mode=$(basename $@)
+       @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
+           --arch-and-mode=$(basename $@)
 
 # Clean targets. You can clean each architecture individually, or everything.
 $(addsuffix .clean,$(ARCHES)):
@@ -95,17 +144,28 @@ $(addsuffix .clean,$(ARCHES)):
 clean: $(addsuffix .clean,$(ARCHES))
 
 # GYP file generation targets.
-$(OUTDIR)/Makefile-ia32: $(GYPFILES)
+$(OUTDIR)/Makefile-ia32: $(GYPFILES) $(ENVFILE)
        build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-                     -Ibuild/standalone.gypi --depth=. -Dtarget_arch=ia32 -S-ia32 \
-                     $(GYPFLAGS)
+                     -Ibuild/standalone.gypi --depth=. -Dtarget_arch=ia32 \
+                     -S-ia32 $(GYPFLAGS)
 
-$(OUTDIR)/Makefile-x64: $(GYPFILES)
+$(OUTDIR)/Makefile-x64: $(GYPFILES) $(ENVFILE)
        build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-                     -Ibuild/standalone.gypi --depth=. -Dtarget_arch=x64 -S-x64 \
-                     $(GYPFLAGS)
+                     -Ibuild/standalone.gypi --depth=. -Dtarget_arch=x64 \
+                     -S-x64 $(GYPFLAGS)
 
-$(OUTDIR)/Makefile-arm: $(GYPFILES) build/armu.gypi
+$(OUTDIR)/Makefile-arm: $(GYPFILES) $(ENVFILE)
        build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
-                     -Ibuild/standalone.gypi --depth=. -Ibuild/armu.gypi -S-arm \
-                     $(GYPFLAGS)
+                     -Ibuild/standalone.gypi --depth=. -Ibuild/armu.gypi \
+                     -S-arm $(GYPFLAGS)
+
+# Replaces the old with the new environment file if they're different, which
+# will trigger GYP to regenerate Makefiles.
+$(ENVFILE): $(ENVFILE).new
+       @if test -r $(ENVFILE) && cmp $(ENVFILE).new $(ENVFILE) >/dev/null; \
+           then rm $(ENVFILE).new; \
+           else mv $(ENVFILE).new $(ENVFILE); fi
+
+# Stores current GYPFLAGS in a file.
+$(ENVFILE).new:
+       @mkdir -p $(OUTDIR); echo "GYPFLAGS=$(GYPFLAGS)" > $(ENVFILE).new;

diff --git a/build/common.gypi b/build/common.gypi
index 6d374a654a3b550930ea28a089066b5cbcf19279..834516ffd4b1a198d7de4528fa4182d25e7c8f72 100644 (file)
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -58,6 +58,13 @@
 
     'v8_enable_debugger_support%': 1,
 
+    'v8_enable_disassembler%': 0,
+
+    'v8_enable_gdbjit%': 0,
+
+    # Enable profiling support. Only required on Windows.
+    'v8_enable_prof%': 0,
+
     # Chrome needs this definition unconditionally. For standalone V8 builds,
     # it's handled in build/standalone.gypi.
     'want_separate_host_toolset%': 1,
@@ -69,9 +76,14 @@
   'target_defaults': {
     'conditions': [
       ['v8_enable_debugger_support==1', {
-          'defines': ['ENABLE_DEBUGGER_SUPPORT',],
-        },
-      ],
+        'defines': ['ENABLE_DEBUGGER_SUPPORT',],
+      }],
+      ['v8_enable_disassembler==1', {
+        'defines': ['ENABLE_DISASSEMBLER',],
+      }],
+      ['v8_enable_gdbjit==1', {
+        'defines': ['ENABLE_GDB_JIT_INTERFACE',],
+      }],
       ['OS!="mac"', {
         # TODO(mark): The OS!="mac" conditional is temporary. It can be
         # removed once the Mac Chromium build stops setting target_arch to
@@ -154,6 +166,13 @@
           'COMPRESS_STARTUP_DATA_BZ2',
         ],
       }],
+      ['OS=="win" and v8_enable_prof==1', {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'GenerateMapFile': 'true',
+          },
+        },
+      }],
     ],
     'configurations': {
       'Debug': {

diff --git a/build/standalone.gypi b/build/standalone.gypi
index 56b487bd00289bab4cdc8b67e798a69826b342e8..81909f19a865818cb6b4c6a17232ecdec091cbe3 100644 (file)
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -89,6 +89,9 @@
           [ 'visibility=="hidden"', {
             'cflags': [ '-fvisibility=hidden' ],
           }],
+          [ 'component=="shared_library"', {
+            'cflags': [ '-fPIC', ],
+          }],
         ],
       },
     }],  # 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"'