| Index: Makefile
|
| diff --git a/Makefile b/Makefile
|
| index 8f21f7c6ddcd7eaf73febb9cb8d7b954ac225cae..4de6ff9d2ef91a9a4da1c4fd3989e5bf3b61d230 100644
|
| --- a/Makefile
|
| +++ b/Makefile
|
| @@ -133,6 +133,10 @@ ifeq ($(i18nsupport), off)
|
| GYPFLAGS += -Dv8_enable_i18n_support=0
|
| TESTFLAGS += --noi18n
|
| endif
|
| +#generated_lexer=on
|
| +ifeq ($(generated_lexer), on)
|
| + GYPFLAGS += -Dv8_use_generated_lexer=1
|
| +endif
|
| # deprecation_warnings=on
|
| ifeq ($(deprecationwarnings), on)
|
| GYPFLAGS += -Dv8_deprecation_warnings=1
|
| @@ -223,11 +227,11 @@ endif
|
|
|
| # Architectures and modes to be compiled. Consider these to be internal
|
| # variables, don't override them (use the targets instead).
|
| -ARCHES = ia32 x64 arm mipsel
|
| +ARCHES = ia32 x64 arm a64 mipsel
|
| DEFAULT_ARCHES = ia32 x64 arm
|
| MODES = release debug optdebug
|
| DEFAULT_MODES = release debug
|
| -ANDROID_ARCHES = android_ia32 android_arm android_mipsel
|
| +ANDROID_ARCHES = android_ia32 android_arm android_a64 android_mipsel
|
| NACL_ARCHES = nacl_ia32 nacl_x64
|
|
|
| # List of files that trigger Makefile regeneration:
|
| @@ -358,12 +362,13 @@ native.check: native
|
| @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR)/native \
|
| --arch-and-mode=. $(TESTFLAGS)
|
|
|
| -FASTTESTMODES = ia32.release,x64.release,ia32.optdebug,x64.optdebug,arm.optdebug
|
| +FASTTESTMODES = ia32.release,x64.release,ia32.optdebug,x64.optdebug,arm.optdebug,a64.release
|
| +FASTCOMPILEMODES = $(FASTTESTMODES),a64.optdebug
|
|
|
| COMMA = ,
|
| EMPTY =
|
| SPACE = $(EMPTY) $(EMPTY)
|
| -quickcheck: $(subst $(COMMA),$(SPACE),$(FASTTESTMODES))
|
| +quickcheck: $(subst $(COMMA),$(SPACE),$(FASTCOMPILEMODES))
|
| tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
|
| --arch-and-mode=$(FASTTESTMODES) $(TESTFLAGS) --quickcheck
|
| qc: quickcheck
|
| @@ -387,15 +392,17 @@ clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.cl
|
| OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS))
|
| $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
|
| PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
|
| + PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \
|
| GYP_GENERATORS=make \
|
| build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
|
| -Ibuild/standalone.gypi --depth=. \
|
| -Dv8_target_arch=$(subst .,,$(suffix $(basename $@))) \
|
| - -Dv8_optimized_debug=$(if $(findstring optdebug,$@),2,0) \
|
| + $(if $(findstring optdebug,$@),-Dv8_optimized_debug=2,) \
|
| -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS)
|
|
|
| $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
|
| PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
|
| + PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \
|
| GYP_GENERATORS=make \
|
| build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
|
| -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)
|
|
|