Update makefiles after merge of Chromium at r219810

This commit was generated by merge_from_chromium.py.

Change-Id: Ieaf1cc0857ced31e0c0c9533ae9f0efae0cc9a8a
diff --git a/tools/gyp/v8_base.arm.host.darwin-arm.mk b/tools/gyp/v8_base.arm.host.darwin-arm.mk
index efcf480..c786746 100644
--- a/tools/gyp/v8_base.arm.host.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.host.darwin-arm.mk
@@ -37,7 +37,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -47,6 +46,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.arm.host.linux-arm.mk b/tools/gyp/v8_base.arm.host.linux-arm.mk
index 229082b..e557f83 100644
--- a/tools/gyp/v8_base.arm.host.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.host.linux-arm.mk
@@ -37,7 +37,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -47,6 +46,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.arm.target.darwin-arm.mk b/tools/gyp/v8_base.arm.target.darwin-arm.mk
index 10337ef..30592af 100644
--- a/tools/gyp/v8_base.arm.target.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.target.darwin-arm.mk
@@ -38,7 +38,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -48,6 +47,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.arm.target.linux-arm.mk b/tools/gyp/v8_base.arm.target.linux-arm.mk
index 780ad9e..7897a7f 100644
--- a/tools/gyp/v8_base.arm.target.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.target.linux-arm.mk
@@ -38,7 +38,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -48,6 +47,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.ia32.host.darwin-x86.mk b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
index 410d2c7..1d821a5 100644
--- a/tools/gyp/v8_base.ia32.host.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
@@ -37,7 +37,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -47,6 +46,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.ia32.host.linux-x86.mk b/tools/gyp/v8_base.ia32.host.linux-x86.mk
index 0fca226..747bcc3 100644
--- a/tools/gyp/v8_base.ia32.host.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.linux-x86.mk
@@ -37,7 +37,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -47,6 +46,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.ia32.target.darwin-x86.mk b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
index ff2ea84..68d8201 100644
--- a/tools/gyp/v8_base.ia32.target.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
@@ -38,7 +38,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -48,6 +47,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.ia32.target.linux-x86.mk b/tools/gyp/v8_base.ia32.target.linux-x86.mk
index 92b3e49..a4049b6 100644
--- a/tools/gyp/v8_base.ia32.target.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.linux-x86.mk
@@ -38,7 +38,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -48,6 +47,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
index 3bc8581..e5599a9 100644
--- a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
@@ -37,7 +37,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -47,6 +46,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.mipsel.host.linux-mips.mk b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
index 8259ad9..fb4a67b 100644
--- a/tools/gyp/v8_base.mipsel.host.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
@@ -37,7 +37,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -47,6 +46,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
index 2a29119..840ba0f 100644
--- a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
@@ -38,7 +38,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -48,6 +47,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \
diff --git a/tools/gyp/v8_base.mipsel.target.linux-mips.mk b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
index 36b5c35..bbb13b2 100644
--- a/tools/gyp/v8_base.mipsel.target.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
@@ -38,7 +38,6 @@
 	v8/src/builtins.cc \
 	v8/src/cached-powers.cc \
 	v8/src/checks.cc \
-	v8/src/circular-queue.cc \
 	v8/src/code-stubs.cc \
 	v8/src/code-stubs-hydrogen.cc \
 	v8/src/codegen.cc \
@@ -48,6 +47,7 @@
 	v8/src/conversions.cc \
 	v8/src/counters.cc \
 	v8/src/cpu-profiler.cc \
+	v8/src/cpu.cc \
 	v8/src/data-flow.cc \
 	v8/src/date.cc \
 	v8/src/dateparser.cc \