Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4.4.7 proposal #7395

Merged
merged 92 commits into from
Jun 28, 2016
Merged
Changes from 1 commit
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
aaeeec4
lib,test,tools: alignment on variable assignments
Trott Apr 16, 2016
cc3645c
tools: lint for alignment of variable assignments
Trott Apr 16, 2016
1c6809c
debugger: introduce exec method for debugger
JacksonTian Apr 21, 2015
e3f78eb
doc: improve rendering of v4.4.5 changelog entry
May 24, 2016
55319fe
stream_base: expose `bytesRead` getter
indutny Apr 19, 2016
b3acbc5
net: replace __defineGetter__ with defineProperty
indutny Apr 20, 2016
de00f91
deps: backport bc2e393 from v8 upstream
Nov 12, 2015
4c1eb5b
repl: create history file with mode 0600
XeCycle Oct 16, 2015
c98aaf5
http: speed up checkIsHttpToken
JacksonTian Jan 21, 2016
1d68bdb
test: fix error message checks in test-module-loading
jasnell Apr 1, 2016
0f6146c
tools: add tests for the doctool
iankronquist Apr 3, 2016
43ce6fc
build: fix DESTCPU detection for binary target
richardlau Apr 20, 2016
46ee7bb
doc: fix incorrect references in buffer docs
Amery2010 Apr 14, 2016
ae3eb24
doc: add addaleax to collaborators
addaleax Apr 15, 2016
3dbcc73
doc: add santigimeno to collaborators
santigimeno Apr 15, 2016
6dfc963
doc: add iWuzHere to collaborators
imran-iq Apr 15, 2016
7d8141d
doc: add stefanmb to collaborators
stefanmb Apr 15, 2016
93f2314
gitignore: ignore VS 2015 *.VC.opendb files
Apr 5, 2016
bac87d0
gitignore: adding .vs/ directory to .gitignore
Apr 13, 2016
10bd1a7
tools: fix license-builder.sh again for ICU
srl295 Apr 5, 2016
435cd56
doc: DCO anchor that doesn't change
williamkapke Apr 18, 2016
ac60d9c
doc: add estliberitas to collaborators
estliberitas Apr 26, 2016
b112fd1
doc: add ronkorving to collaborators
ronkorving Apr 26, 2016
83721c6
doc: add eljefedelrodeodeljefe to collaborators
eljefedelrodeodeljefe Apr 26, 2016
d7d54c8
doc: add Minqi Pan to collaborators
pmq20 Apr 26, 2016
0f3a94a
doc: add JacksonTian to collaborators
JacksonTian Apr 26, 2016
e28598b
doc: update authors
jasnell Apr 25, 2016
3d1a3e4
doc: change references to Stable to Current
Apr 21, 2016
feda15b
doc: update build instructions for OS X
Trott Apr 20, 2016
a6f45b4
doc: Remove extra space in REPL example
Apr 28, 2016
de20235
doc: remove all scrollbar styling
claudiorodriguez Apr 29, 2016
52d9e7b
doc: fix a typo in __dirname section
toyota790 Apr 29, 2016
2389006
debugger: display array contents in repl
cjihrig Apr 28, 2016
18ecc77
doc: ensure consistent grammar in node.1 file
justshiv Apr 27, 2016
21d02f4
doc: add missing underscore for markdown italics
May 2, 2016
d909c25
doc: fix the lint of an example in cluster.md
yorkie May 2, 2016
c9b144d
doc: linkify remaining references to fs.Stats object
Apr 30, 2016
97d1fc0
doc: improve onboarding-extras.md formatting
Fishrock123 May 9, 2016
ac6b921
doc: mention existence/purpose of module wrapper
mtharrison Apr 27, 2016
352496d
doc: move the readme newcomers section
Fishrock123 May 10, 2016
3d820e4
doc: "a" -> "an" in api/documentation.md
anchika May 11, 2016
847b29c
test: fix test-debugger-repl-term
Trott May 11, 2016
8b396e3
test: fix test-debugger-repl-break-in-module
Trott May 11, 2016
3e9288e
doc: fix exec example in child_process
evanlucas May 9, 2016
c654184
doc: remove link to Sign in crypto.md
fanatid May 17, 2016
401325f
doc: better example & synopsis
Fishrock123 Apr 12, 2016
107839c
doc: no Node.js(1)
Fishrock123 Apr 12, 2016
eadb7e5
doc: subdivide TOC, add auxiliary links
Fishrock123 Apr 12, 2016
4067cde
test: abstract skip functionality to common
Fishrock123 Jun 2, 2016
3b46187
doc: Backport ee.once doc clarifications to 4.x.
lance Jun 2, 2016
64fb7a1
build: update android-configure script for npm
robertchiras Apr 22, 2016
37606ca
build: don't compile with -B
bnoordhuis Apr 26, 2016
a01caa3
build: don't compile with -B, redux
bnoordhuis May 9, 2016
58ad451
benchmark: move string-decoder to its own category
AndreasMadsen Jun 2, 2016
c189eec
benchmark: fix configuation parameters
AndreasMadsen Feb 8, 2016
921e856
benchmark: move misc to categorized directories
AndreasMadsen Jan 29, 2016
87cdb83
benchmark: merge url.js with url-resolve.js
AndreasMadsen Jan 29, 2016
6dfe7ae
cares: Support malloc(0) scenarios for AIX
gireeshpunathil Apr 20, 2016
a31153c
tools: remove the minifying logic
thefourtheye May 8, 2016
037291e
src: make sure Utf8Value always zero-terminates
addaleax Jun 2, 2016
552e25c
lib,test: update in preparation for linter update
Trott May 1, 2016
6a76485
tools: update ESLint to 2.9.0
Trott May 1, 2016
3b94e31
test: robust handling of env for npm-test-install
May 17, 2016
1c4549a
test: fix flaky test-stdout-close-catch
santigimeno May 17, 2016
1549899
dgram,test: add addMembership/dropMembership tests
Trott May 16, 2016
2b0f40c
doc: add note for fs.watch virtualized env
eljefedelrodeodeljefe May 17, 2016
30ab6a8
doc: fix name to match git log
eljefedelrodeodeljefe May 19, 2016
4e38655
test: refactor test-tls-reuse-host-from-socket
Trott May 14, 2016
f23a9c3
doc: fix typo in Error.captureStackTrace
mekhtiari May 17, 2016
fbf95dd
doc: Update DCO to v1.1
williamkapke Apr 23, 2016
03db88e
doc: add bengl to collaborators
bengl May 21, 2016
5a1a0b5
doc: make the api doc print-friendly
bl4d32 May 16, 2016
2c3c4e5
doc: reference list of language-specific globals
addaleax May 20, 2016
22ca7b8
doc: add @othiym23 to list of collaborators
othiym23 May 24, 2016
a8391bc
doc: add jhamhader to collaborators
jhamhader May 24, 2016
e0dd476
doc: fix typos in timers topic to aid readability
May 21, 2016
c31eaad
doc: clarify buffer class
stevemao May 21, 2016
67863f1
doc: update licenses
MylesBorins Jun 3, 2016
ab50e82
test: fix test-process-exec-argv flakiness
santigimeno May 3, 2016
af41a63
src: replace ARRAY_SIZE with typesafe arraysize
bnoordhuis Mar 31, 2016
90306bb
src: use size_t for http parser array size fields
bnoordhuis Mar 31, 2016
7e739ae
test,tools: adjust function argument alignment
Trott Apr 26, 2016
216486c
tools: lint for function argument alignment
Trott Apr 19, 2016
be0bb5f
test: fix unreliable known_issues test
Trott May 3, 2016
98469ad
doc: correct args for cluster message event
cjihrig Jun 15, 2016
b73ec46
stream: reset awaitDrain after manual .resume()
addaleax Jun 5, 2016
a08a017
stream: ensure awaitDrain is increased once
davedoesdev Jun 14, 2016
0414d88
test: fix test-net-* error code check for getaddrinfo(3)
ncopa Feb 5, 2016
0ba3c2c
doc: fix layout problem in v4 changelog
Jun 23, 2016
49921e8
deps: backport 102e3e87e7 from V8 upstream
Jun 27, 2016
200b3ca
deps: upgrade npm in LTS to 2.15.8
iarna Jun 24, 2016
0974fc6
2016-06-28, Version 4.4.7 'Argon' (LTS)
Jun 24, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build: fix DESTCPU detection for binary target
`make binary` attempts to auto detect DESTCPU if not set, but was
assuming being on an Intel architecture.

PR-URL: #6310
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
  • Loading branch information
richardlau authored and Myles Borins committed Jun 23, 2016
commit 43ce6fc8d275bceaa682a6e49e106e46520d5d4d
31 changes: 30 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -264,11 +264,40 @@ RELEASE=$(shell sed -ne 's/\#define NODE_VERSION_IS_RELEASE \([01]\)/\1/p' src/n
PLATFORM=$(shell uname | tr '[:upper:]' '[:lower:]')
NPMVERSION=v$(shell cat deps/npm/package.json | grep '"version"' | sed 's/^[^:]*: "\([^"]*\)",.*/\1/')

ifeq ($(findstring x86_64,$(shell uname -m)),x86_64)
UNAME_M=$(shell uname -m)
ifeq ($(findstring x86_64,$(UNAME_M)),x86_64)
DESTCPU ?= x64
else
ifeq ($(findstring ppc64,$(UNAME_M)),ppc64)
DESTCPU ?= ppc64
else
ifeq ($(findstring ppc,$(UNAME_M)),ppc)
DESTCPU ?= ppc
else
ifeq ($(findstring s390x,$(UNAME_M)),s390x)
DESTCPU ?= s390x
else
ifeq ($(findstring s390,$(UNAME_M)),s390)
DESTCPU ?= s390
else
ifeq ($(findstring arm,$(UNAME_M)),arm)
DESTCPU ?= arm
else
ifeq ($(findstring aarch64,$(UNAME_M)),aarch64)
DESTCPU ?= aarch64
else
ifeq ($(findstring powerpc,$(shell uname -p)),powerpc)
DESTCPU ?= ppc64
else
DESTCPU ?= x86
endif
endif
endif
endif
endif
endif
endif
endif
ifeq ($(DESTCPU),x64)
ARCH=x64
else