Skip to content
This repository has been archived by the owner on Oct 16, 2021. It is now read-only.

Add s390/s390x Linux support to Node v6.x (v2) #60

Merged
merged 6 commits into from
May 6, 2016

Conversation

gibfahn
Copy link

@gibfahn gibfahn commented Apr 26, 2016

Since deps/v8 doesn't currently support s390/s390x, pick up deps/v8z instead.

Based on #58 (can't change base branch in PRs)

Based on afe84b8
modified: common.gypi
modified: configure
modified: lib/internal/v8_prof_processor.js
modified: node.gyp

@gibfahn gibfahn changed the title build: configuration changes to support s390/zLinux Add s390/s390x Linux support to Node v6.x (v2) Apr 26, 2016
@gibfahn gibfahn force-pushed the v6.0.0-proposal-port branch from f141442 to 72c6e98 Compare April 27, 2016 08:44
@gibfahn gibfahn force-pushed the v6.0.0-proposal-port branch from 72c6e98 to 8d9174e Compare April 27, 2016 09:05
v8_parent_path + '/tools/logreader',
v8_parent_path + '/tools/tickprocessor',
v8_parent_path + '/tools/SourceMap',
v8_parent_path + '/tools/tickprocessor-driver'

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, done.

Since deps/v8 doesn't currently support s390/s390x, pick up
deps/v8z instead.

Based on afe84b8
	modified:   common.gypi
	modified:   configure
	modified:   lib/internal/v8_prof_processor.js
	modified:   node.gyp
@gibfahn gibfahn force-pushed the v6.0.0-proposal-port branch 6 times, most recently from e618d9c to 8681767 Compare April 28, 2016 10:19
Import from ibmruntimes/v8z branch 5.0-s390 bcb22c907a
Node PR: nodejs#6111

Files removed from 5.0-s390:
CONTRIBUTING.md
.DEPS.git
.git

Also added deps/v8z/base/trace_event/common/trace_event_common.h
and removed /base from deps/v8z/.gitignore
@gibfahn gibfahn force-pushed the v6.0.0-proposal-port branch from 8681767 to c68da99 Compare April 28, 2016 10:20
@gibfahn gibfahn force-pushed the v6.0.0-proposal-port branch from 036de2a to 6e8bba4 Compare April 28, 2016 10:35
gibfahn added 2 commits April 28, 2016 11:39
V8z commit: da254cc29d5feb44fe14a431e7912ab95c12147c
@gibfahn gibfahn merged commit 2c33528 into v6.x-port May 6, 2016
jBarz pushed a commit that referenced this pull request May 11, 2017
Original commit message:
  Merged: [heap] Clear recorded slots for inobject properties when migrating fast object to slow mode.

  Revision: a814b8aeaf2b56635054c96435972dce90576f62

  BUG=chromium:666046
  LOG=N
  NOTRY=true
  NOPRESUBMIT=true
  NOTREECHECKS=true
  R=ulan@chromium.org

  Review URL: https://codereview.chromium.org/2549803002 .

  Cr-Commit-Position: refs/branch-heads/5.5@{#60}
  Cr-Branched-From: 3cbd5838bd8376103daa45d69dade929ee4e0092-refs/heads/5.5.372@{#1}
  Cr-Branched-From: b3c8b0ce2c9af0528837d8309625118d4096553b-refs/heads/master@{#40015}

PR-URL: nodejs/node#10733
Reviewed-By: Reviewed-By: jasnell - James M Snell <jasnell@gmail.com>
Reviewed-By: mhdawson - Michael Dawson <michael_dawson@ca.ibm.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants