diff options
| author | Emily Bernier <ember@google.com> | 2015-03-24 16:35:39 -0400 |
|---|---|---|
| committer | Emily Bernier <ember@google.com> | 2015-06-23 16:55:40 -0400 |
| commit | 958fae7ec3f466955f8e5b50fa5b8d38b9e91675 (patch) | |
| tree | a63ee37f93192ad427f88ed926743f6bb6014312 /Makefile.nacl | |
| parent | 57a14c9a8621270b0e6c697dce28a9c453ebe55f (diff) | |
| download | v8-958fae7ec3f466955f8e5b50fa5b8d38b9e91675.tar.gz | |
Update V8 to version 4.1.0.21
This is a cherry-pick of all commits up to and including the
4.1.0.21 cherry-pick in Chromium.
Original commit message:
Version 4.1.0.21 (cherry-pick)
Merged 206e9136bde0f2b5ae8cb77afbb1e7833e5bd412
Unlink pages from the space page list after evacuation.
BUG=430201
LOG=N
R=jkummerow@chromium.org
Review URL: https://codereview.chromium.org/953813002
Cr-Commit-Position: refs/branch-heads/4.1@{#22}
Cr-Branched-From: 2e08d2a7aa9d65d269d8c57aba82eb38a8cb0a18-refs/heads/candidates@{#25353}
---
Change-Id: I8c23c7bbb70772b4858fe8a47b64fa97ee0d1f8c
Diffstat (limited to 'Makefile.nacl')
| -rw-r--r-- | Makefile.nacl | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/Makefile.nacl b/Makefile.nacl index 34bd960f..3459c42c 100644 --- a/Makefile.nacl +++ b/Makefile.nacl @@ -36,41 +36,29 @@ NACL_BUILDS = $(foreach mode,$(MODES), \ $(addsuffix .$(mode),$(NACL_ARCHES))) HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/') -ifeq ($(HOST_OS), linux) - TOOLCHAIN_DIR = linux_x86_glibc -else - ifeq ($(HOST_OS), mac) - TOOLCHAIN_DIR = mac_x86_glibc - else - $(error Host platform "${HOST_OS}" is not supported) - endif -endif - TOOLCHAIN_PATH = $(realpath ${NACL_SDK_ROOT}/toolchain) -NACL_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR} +NACL_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/linux_pnacl + +ifeq ($(wildcard $(NACL_TOOLCHAIN)),) + $(error Cannot find Native Client toolchain in "${NACL_TOOLCHAIN}") +endif ifeq ($(ARCH), nacl_ia32) GYPENV = nacl_target_arch=nacl_ia32 v8_target_arch=arm v8_host_arch=ia32 - TOOLCHAIN_ARCH = x86-4.4 - NACL_CC = "$(NACL_TOOLCHAIN)/bin/i686-nacl-gcc" - NACL_CXX = "$(NACL_TOOLCHAIN)/bin/i686-nacl-g++" - NACL_LINK = "$(NACL_TOOLCHAIN)/bin/i686-nacl-g++" + NACL_CC = "$(NACL_TOOLCHAIN)/bin/pnacl-clang" + NACL_CXX = "$(NACL_TOOLCHAIN)/bin/pnacl-clang++" + NACL_LINK = "$(NACL_TOOLCHAIN)/bin/pnacl-clang++ --pnacl-allow-native -arch x86-32" else ifeq ($(ARCH), nacl_x64) GYPENV = nacl_target_arch=nacl_x64 v8_target_arch=arm v8_host_arch=ia32 - TOOLCHAIN_ARCH = x86-4.4 - NACL_CC = "$(NACL_TOOLCHAIN)/bin/x86_64-nacl-gcc" - NACL_CXX = "$(NACL_TOOLCHAIN)/bin/x86_64-nacl-g++" - NACL_LINK = "$(NACL_TOOLCHAIN)/bin/x86_64-nacl-g++" + NACL_CC = "$(NACL_TOOLCHAIN)/bin/pnacl-clang" + NACL_CXX = "$(NACL_TOOLCHAIN)/bin/pnacl-clang++" + NACL_LINK = "$(NACL_TOOLCHAIN)/bin/pnacl-clang++ --pnacl-allow-native -arch x86-64" else $(error Target architecture "${ARCH}" is not supported) endif endif -ifeq ($(wildcard $(NACL_TOOLCHAIN)),) - $(error Cannot find Native Client toolchain in "${NACL_TOOLCHAIN}") -endif - # For mksnapshot host generation. GYPENV += host_os=${HOST_OS} @@ -85,7 +73,11 @@ NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_BUILDS)) # For some reason the $$(basename $$@) expansion didn't work here... $(NACL_BUILDS): $(NACL_MAKEFILES) @$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \ + CC=${NACL_CC} \ CXX=${NACL_CXX} \ + AR="$(NACL_TOOLCHAIN)/bin/pnacl-ar" \ + RANLIB="$(NACL_TOOLCHAIN)/bin/pnacl-ranlib" \ + LD="$(NACL_TOOLCHAIN)/bin/pnacl-ld" \ LINK=${NACL_LINK} \ BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \ python -c "print raw_input().capitalize()") \ @@ -97,6 +89,7 @@ $(NACL_MAKEFILES): GYP_DEFINES="${GYPENV}" \ CC=${NACL_CC} \ CXX=${NACL_CXX} \ + LINK=${NACL_LINK} \ PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:$(PYTHONPATH)" \ build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ -Ibuild/standalone.gypi --depth=. \ |