diff options
author | Torne (Richard Coles) <torne@google.com> | 2015-03-12 15:25:15 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-12 15:25:15 +0000 |
commit | 17c39919b1543d0e48bc788605c4361e47d4d85a (patch) | |
tree | c2955c5d555c865a23aacd44f79fe05ed1bd8856 | |
parent | ece92cb15de52c87fd3187197b8d44a14c5be54a (diff) | |
parent | 7e52db7f3b253dcdc9bd697f22a4bc2ac2a5e32e (diff) | |
download | v8-17c39919b1543d0e48bc788605c4361e47d4d85a.tar.gz |
Merge "Regenerate V8 makefiles following cherrypicked changes."master-soong
-rw-r--r-- | tools/gyp/v8_base.host.darwin-x86_64.mk | 8 | ||||
-rw-r--r-- | tools/gyp/v8_base.host.linux-x86_64.mk | 8 | ||||
-rw-r--r-- | tools/gyp/v8_base.target.darwin-x86_64.mk | 8 | ||||
-rw-r--r-- | tools/gyp/v8_base.target.linux-x86_64.mk | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/tools/gyp/v8_base.host.darwin-x86_64.mk b/tools/gyp/v8_base.host.darwin-x86_64.mk index ef6560b28..29356711c 100644 --- a/tools/gyp/v8_base.host.darwin-x86_64.mk +++ b/tools/gyp/v8_base.host.darwin-x86_64.mk @@ -274,14 +274,14 @@ LOCAL_SRC_FILES := \ v8/src/x64/lithium-x64.cc \ v8/src/x64/macro-assembler-x64.cc \ v8/src/x64/regexp-macro-assembler-x64.cc \ + v8/src/compiler/x64/code-generator-x64.cc \ + v8/src/compiler/x64/instruction-selector-x64.cc \ + v8/src/compiler/x64/linkage-x64.cc \ v8/src/ic/x64/access-compiler-x64.cc \ v8/src/ic/x64/handler-compiler-x64.cc \ v8/src/ic/x64/ic-x64.cc \ v8/src/ic/x64/ic-compiler-x64.cc \ - v8/src/ic/x64/stub-cache-x64.cc \ - v8/src/compiler/x64/code-generator-x64.cc \ - v8/src/compiler/x64/instruction-selector-x64.cc \ - v8/src/compiler/x64/linkage-x64.cc + v8/src/ic/x64/stub-cache-x64.cc # Flags passed to both C and C++ files. diff --git a/tools/gyp/v8_base.host.linux-x86_64.mk b/tools/gyp/v8_base.host.linux-x86_64.mk index ef6560b28..29356711c 100644 --- a/tools/gyp/v8_base.host.linux-x86_64.mk +++ b/tools/gyp/v8_base.host.linux-x86_64.mk @@ -274,14 +274,14 @@ LOCAL_SRC_FILES := \ v8/src/x64/lithium-x64.cc \ v8/src/x64/macro-assembler-x64.cc \ v8/src/x64/regexp-macro-assembler-x64.cc \ + v8/src/compiler/x64/code-generator-x64.cc \ + v8/src/compiler/x64/instruction-selector-x64.cc \ + v8/src/compiler/x64/linkage-x64.cc \ v8/src/ic/x64/access-compiler-x64.cc \ v8/src/ic/x64/handler-compiler-x64.cc \ v8/src/ic/x64/ic-x64.cc \ v8/src/ic/x64/ic-compiler-x64.cc \ - v8/src/ic/x64/stub-cache-x64.cc \ - v8/src/compiler/x64/code-generator-x64.cc \ - v8/src/compiler/x64/instruction-selector-x64.cc \ - v8/src/compiler/x64/linkage-x64.cc + v8/src/ic/x64/stub-cache-x64.cc # Flags passed to both C and C++ files. diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk index 33f0352c1..daed6836c 100644 --- a/tools/gyp/v8_base.target.darwin-x86_64.mk +++ b/tools/gyp/v8_base.target.darwin-x86_64.mk @@ -274,14 +274,14 @@ LOCAL_SRC_FILES := \ v8/src/x64/lithium-x64.cc \ v8/src/x64/macro-assembler-x64.cc \ v8/src/x64/regexp-macro-assembler-x64.cc \ + v8/src/compiler/x64/code-generator-x64.cc \ + v8/src/compiler/x64/instruction-selector-x64.cc \ + v8/src/compiler/x64/linkage-x64.cc \ v8/src/ic/x64/access-compiler-x64.cc \ v8/src/ic/x64/handler-compiler-x64.cc \ v8/src/ic/x64/ic-x64.cc \ v8/src/ic/x64/ic-compiler-x64.cc \ - v8/src/ic/x64/stub-cache-x64.cc \ - v8/src/compiler/x64/code-generator-x64.cc \ - v8/src/compiler/x64/instruction-selector-x64.cc \ - v8/src/compiler/x64/linkage-x64.cc + v8/src/ic/x64/stub-cache-x64.cc # Flags passed to both C and C++ files. diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk index 33f0352c1..daed6836c 100644 --- a/tools/gyp/v8_base.target.linux-x86_64.mk +++ b/tools/gyp/v8_base.target.linux-x86_64.mk @@ -274,14 +274,14 @@ LOCAL_SRC_FILES := \ v8/src/x64/lithium-x64.cc \ v8/src/x64/macro-assembler-x64.cc \ v8/src/x64/regexp-macro-assembler-x64.cc \ + v8/src/compiler/x64/code-generator-x64.cc \ + v8/src/compiler/x64/instruction-selector-x64.cc \ + v8/src/compiler/x64/linkage-x64.cc \ v8/src/ic/x64/access-compiler-x64.cc \ v8/src/ic/x64/handler-compiler-x64.cc \ v8/src/ic/x64/ic-x64.cc \ v8/src/ic/x64/ic-compiler-x64.cc \ - v8/src/ic/x64/stub-cache-x64.cc \ - v8/src/compiler/x64/code-generator-x64.cc \ - v8/src/compiler/x64/instruction-selector-x64.cc \ - v8/src/compiler/x64/linkage-x64.cc + v8/src/ic/x64/stub-cache-x64.cc # Flags passed to both C and C++ files. |