Remove NaCl support.

Makefile

 # Copyright 2012 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 15 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 # Variable default definitions. Override them by exporting them in your shell.
 OUTDIR ?= out
 TESTJOBS ?=
 GYPFLAGS ?=
 TESTFLAGS ?=
 ANDROID_NDK_HOST_ARCH ?=
 ANDROID_V8 ?= /data/local/tmp/v8
-NACL_SDK_ROOT ?=
 
 # 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
@@ skipping 182 matching lines @@
 endif
 
 # ----------------- available targets: --------------------
 # - "grokdump": rebuilds heap constants lists used by grokdump
 # - any arch listed in ARCHES (see below)
 # - any mode listed in MODES
 # - every combination <arch>.<mode>, e.g. "ia32.release"
 # - "native": current host's architecture, release mode
 # - any of the above with .check appended, e.g. "ia32.release.check"
 # - "android": cross-compile for Android/ARM
-# - "nacl" : cross-compile for Native Client (ia32 and x64)
 # - default (no target specified): build all DEFAULT_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 arm64 mips mipsel mips64 mips64el x87 ppc ppc64 s390 \
          s390x
 ARCHES32 = ia32 arm mips mipsel x87 ppc s390
 DEFAULT_ARCHES = ia32 x64 arm
 MODES = release debug optdebug
 DEFAULT_MODES = release debug
 ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
                  android_mipsel android_x87
-NACL_ARCHES = nacl_ia32 nacl_x64
 
 # List of files that trigger Makefile regeneration:
 GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
            gypfiles/shim_headers.gypi gypfiles/features.gypi \
            gypfiles/standalone.gypi \
            gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \
            test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \
            test/unittests/unittests.gyp src/v8.gyp \
            tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
            buildtools/third_party/libc++abi/libc++abi.gyp \
            buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
            src/third_party/vtune/v8vtune.gyp src/d8.gyp
 
 # If vtunejit=on, the v8vtune.gyp will be appended.
 ifeq ($(vtunejit), on)
   GYPFILES += src/third_party/vtune/v8vtune.gyp
 endif
 # Generates all combinations of ARCHES and MODES, e.g. "ia32.release".
 BUILDS = $(foreach mode,$(MODES),$(addsuffix .$(mode),$(ARCHES)))
 ANDROID_BUILDS = $(foreach mode,$(MODES), \
                    $(addsuffix .$(mode),$(ANDROID_ARCHES)))
-NACL_BUILDS = $(foreach mode,$(MODES), \
-                   $(addsuffix .$(mode),$(NACL_ARCHES)))
 # Generates corresponding test targets, e.g. "ia32.release.check".
 CHECKS = $(addsuffix .check,$(BUILDS))
 QUICKCHECKS = $(addsuffix .quickcheck,$(BUILDS))
 ANDROID_CHECKS = $(addsuffix .check,$(ANDROID_BUILDS))
-NACL_CHECKS = $(addsuffix .check,$(NACL_BUILDS))
 # File where previously used GYPFLAGS are stored.
 ENVFILE = $(OUTDIR)/environment
 
 .PHONY: all check clean builddeps dependencies $(ENVFILE).new native \
         qc quickcheck $(QUICKCHECKS) turbocheck \
         $(addsuffix .quickcheck,$(MODES)) $(addsuffix .quickcheck,$(ARCHES)) \
         $(ARCHES) $(MODES) $(BUILDS) $(CHECKS) $(addsuffix .clean,$(ARCHES)) \
         $(addsuffix .check,$(MODES)) $(addsuffix .check,$(ARCHES)) \
-        $(ANDROID_ARCHES) $(ANDROID_BUILDS) $(ANDROID_CHECKS) \
-        $(NACL_ARCHES) $(NACL_BUILDS) $(NACL_CHECKS) \
-        must-set-NACL_SDK_ROOT
+        $(ANDROID_ARCHES) $(ANDROID_BUILDS) $(ANDROID_CHECKS)
 
 # Target definitions. "all" is the default.
 all: $(DEFAULT_MODES)
 
 # Special target for the buildbots to use. Depends on $(OUTDIR)/Makefile
 # having been created before.
 buildbot:
         $(MAKE) -C "$(OUTDIR)" BUILDTYPE=$(BUILDTYPE) \
                 builddir="$(abspath $(OUTDIR))/$(BUILDTYPE)"
 
@@ skipping 18 matching lines @@
 
 $(ANDROID_ARCHES): $(addprefix $$@.,$(MODES))
 
 $(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) Makefile.android
         @$(MAKE) -f Makefile.android $@ \
                 ARCH="$(basename $@)" \
                 MODE="$(subst .,,$(suffix $@))" \
                 OUTDIR="$(OUTDIR)" \
                 GYPFLAGS="$(GYPFLAGS)"
 
-$(NACL_ARCHES): $(addprefix $$@.,$(MODES))
-
-$(NACL_BUILDS): $(GYPFILES) $(ENVFILE) \
-                   Makefile.nacl must-set-NACL_SDK_ROOT
-        @$(MAKE) -f Makefile.nacl $@ \
-                ARCH="$(basename $@)" \
-                MODE="$(subst .,,$(suffix $@))" \
-                OUTDIR="$(OUTDIR)" \
-                GYPFLAGS="$(GYPFLAGS)"
-
 # Test targets.
 check: all
         @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch=$(shell echo $(DEFAULT_ARCHES) | sed -e 's/ /,/g') \
             $(TESTFLAGS)
 
 $(addsuffix .check,$(MODES)): $$(basename $$@)
         @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --mode=$(basename $@) $(TESTFLAGS)
 
@@ skipping 23 matching lines @@
 
 $(addsuffix .check, $(ANDROID_BUILDS)): $$(basename $$@).sync
         @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
              --arch-and-mode=$(basename $@) \
              --timeout=600 \
              --command-prefix="tools/android-run.py" $(TESTFLAGS)
 
 $(addsuffix .check, $(ANDROID_ARCHES)): \
                 $(addprefix $$(basename $$@).,$(MODES)).check
 
-$(addsuffix .check, $(NACL_BUILDS)): $$(basename $$@)
-        @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
-             --arch-and-mode=$(basename $@) \
-             --timeout=600 --noi18n \
-             --command-prefix="tools/nacl-run.py"
-
-$(addsuffix .check, $(NACL_ARCHES)): \
-                $(addprefix $$(basename $$@).,$(MODES)).check
-
 native.check: native
         @tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR)/native \
             --arch-and-mode=. $(TESTFLAGS)
 
 SUPERFASTTESTMODES = ia32.release
 FASTTESTMODES = $(SUPERFASTTESTMODES),x64.release,ia32.optdebug,x64.optdebug,arm.optdebug,arm64.release
 FASTCOMPILEMODES = $(FASTTESTMODES),arm64.optdebug
 
 COMMA = ,
 EMPTY =
 SPACE = $(EMPTY) $(EMPTY)
 quickcheck: $(subst $(COMMA),$(SPACE),$(FASTCOMPILEMODES))
         tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch-and-mode=$(SUPERFASTTESTMODES) $(TESTFLAGS) --quickcheck \
             --download-data mozilla webkit
         tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch-and-mode=$(FASTTESTMODES) $(TESTFLAGS) --quickcheck
 qc: quickcheck
 
 turbocheck: $(subst $(COMMA),$(SPACE),$(FASTCOMPILEMODES))
         tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch-and-mode=$(SUPERFASTTESTMODES) $(TESTFLAGS) \
             --quickcheck --variants=turbofan --download-data mozilla webkit
         tools/run-tests.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch-and-mode=$(FASTTESTMODES) $(TESTFLAGS) \
             --quickcheck --variants=turbofan
 tc: turbocheck
 
 # Clean targets. You can clean each architecture individually, or everything.
-$(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)):
+$(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES)):
         rm -f $(OUTDIR)/Makefile.$(basename $@)*
         rm -rf $(OUTDIR)/$(basename $@).release
         rm -rf $(OUTDIR)/$(basename $@).debug
         rm -rf $(OUTDIR)/$(basename $@).optdebug
         find $(OUTDIR) -regex '.*\(host\|target\)\.$(basename $@).*\.mk' -delete
 
 native.clean:
         rm -f $(OUTDIR)/Makefile.native
         rm -rf $(OUTDIR)/native
         find $(OUTDIR) -regex '.*\(host\|target\)\.native\.mk' -delete
 
-clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.clean gtags.clean tags.clean
+clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES)) native.clean gtags.clean tags.clean
 
 # GYP file generation targets.
 OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS))
 $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
         $(eval CXX_TARGET_ARCH:=$(shell $(CXX) -v 2>&1 | grep ^Target: | \
                 cut -f 2 -d " " | cut -f 1 -d "-" ))
         $(eval CXX_TARGET_ARCH:=$(subst aarch64,arm64,$(CXX_TARGET_ARCH)))
         $(eval CXX_TARGET_ARCH:=$(subst x86_64,x64,$(CXX_TARGET_ARCH)))
         $(eval CXX_TARGET_ARCH:=$(subst s390x,s390,$(CXX_TARGET_ARCH)))
         $(eval CXX_TARGET_ARCH:=$(subst powerpc,ppc,$(CXX_TARGET_ARCH)))
@@ skipping 11 matching lines @@
                           -Dtarget_arch=ia32,)) \
                       $(if $(findstring optdebug,$@),-Dv8_optimized_debug=1,) \
                       -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS)
 
 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
         PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/gypfiles:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \
         GYP_GENERATORS=make \
         tools/gyp/gyp --generator-output="$(OUTDIR)" gypfiles/all.gyp \
                       -Igypfiles/standalone.gypi --depth=. -S.native $(GYPFLAGS)
 
-# Note that NACL_SDK_ROOT must be set to point to an appropriate
-# Native Client SDK before using this makefile. You can download
-# an SDK here:
-#   https://developers.google.com/native-client/sdk/download
-# The path indicated by NACL_SDK_ROOT will typically end with
-# a folder for a pepper version such as "pepper_25" that should
-# have "tools" and "toolchain" subdirectories.
-must-set-NACL_SDK_ROOT:
-ifndef NACL_SDK_ROOT
-          $(error NACL_SDK_ROOT must be set)
-endif
-
 # 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:
         $(eval CXX_TARGET_ARCH:=$(shell $(CXX) -v 2>&1 | grep ^Target: | \
@@ skipping 25 matching lines @@
 tags: gtags.files $(wildcard $(shell cat gtags.files 2> /dev/null))
         @(ctags --version | grep 'Exuberant Ctags' >/dev/null) || \
                 (echo "Please install Exuberant Ctags (check 'ctags --version')" >&2; false)
         ctags --fields=+l -L $<
 
 tags.clean:
         rm -r tags
 
 dependencies builddeps:
         $(error Use 'gclient sync' instead)