Merge v8globals.h and globals.h

BUG=none
R=mstarzinger@chromium.org
LOG=n

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21482 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

BUILD.gn

@@ -627,7 +627,6 @@ source_set("v8_base") {
     "src/v8.cc",
     "src/v8.h",
     "src/v8checks.h",
-    "src/v8globals.h",
     "src/v8memory.h",
     "src/v8threads.cc",
     "src/v8threads.h",

src/accessors.h

@@ -6,7 +6,7 @@
 #define V8_ACCESSORS_H_
 
 #include "allocation.h"
-#include "v8globals.h"
+#include "globals.h"
 
 namespace v8 {
 namespace internal {

src/arm/macro-assembler-arm.h

@@ -7,7 +7,7 @@
 
 #include "assembler.h"
 #include "frames.h"
-#include "v8globals.h"
+#include "globals.h"
 
 namespace v8 {
 namespace internal {

src/arm64/macro-assembler-arm64-inl.h

@@ -7,7 +7,6 @@
 
 #include <ctype.h>
 
-#include "v8globals.h"
 #include "globals.h"
 
 #include "arm64/assembler-arm64.h"

src/arm64/macro-assembler-arm64.h

@@ -7,7 +7,6 @@
 
 #include <vector>
 
-#include "v8globals.h"
 #include "globals.h"
 
 #include "arm64/assembler-arm64-inl.h"

src/circular-queue.h

@@ -6,7 +6,7 @@
 #define V8_CIRCULAR_QUEUE_H_
 
 #include "atomicops.h"
-#include "v8globals.h"
+#include "globals.h"
 
 namespace v8 {
 namespace internal {

src/counters.h

@@ -7,9 +7,9 @@
 
 #include "../include/v8.h"
 #include "allocation.h"
+#include "globals.h"
 #include "objects.h"
 #include "platform/elapsed-timer.h"
-#include "v8globals.h"
 
 namespace v8 {
 namespace internal {

src/heap.h

@@ -18,7 +18,6 @@
 #include "spaces.h"
 #include "splay-tree-inl.h"
 #include "store-buffer.h"
-#include "v8globals.h"
 
 namespace v8 {
 namespace internal {

src/ia32/macro-assembler-ia32.h

@@ -7,7 +7,7 @@
 
 #include "assembler.h"
 #include "frames.h"
-#include "v8globals.h"
+#include "globals.h"
 
 namespace v8 {
 namespace internal {

src/mips/macro-assembler-mips.h

@@ -7,7 +7,7 @@
 
 #include "assembler.h"
 #include "mips/assembler-mips.h"
-#include "v8globals.h"
+#include "globals.h"
 
 namespace v8 {
 namespace internal {

src/platform.h

@@ -25,8 +25,8 @@
 
 #include "platform/mutex.h"
 #include "platform/semaphore.h"
+#include "globals.h"
 #include "vector.h"
-#include "v8globals.h"
 
 #ifdef __sun
 # ifndef signbit

src/sampler.h

@@ -7,7 +7,7 @@
 
 #include "atomicops.h"
 #include "frames.h"
-#include "v8globals.h"
+#include "globals.h"
 
 namespace v8 {
 namespace internal {

src/small-pointer-list.h

@@ -6,7 +6,7 @@
 #define V8_SMALL_POINTER_LIST_H_
 
 #include "checks.h"
-#include "v8globals.h"
+#include "globals.h"
 #include "zone.h"
 
 namespace v8 {

src/store-buffer.h

@@ -9,7 +9,6 @@
 #include "checks.h"
 #include "globals.h"
 #include "platform.h"
-#include "v8globals.h"
 
 namespace v8 {
 namespace internal {

src/v8.h

@@ -28,12 +28,12 @@
 // Basic includes
 #include "../include/v8.h"
 #include "../include/v8-platform.h"
-#include "v8globals.h"
 #include "v8checks.h"
 #include "allocation.h"
 #include "assert-scope.h"
 #include "utils.h"
 #include "flags.h"
+#include "globals.h"
 
 // Objects & heap
 #include "objects-inl.h"

src/x64/macro-assembler-x64.h

@@ -7,7 +7,7 @@
 
 #include "assembler.h"
 #include "frames.h"
-#include "v8globals.h"
+#include "globals.h"
 
 namespace v8 {
 namespace internal {

src/x87/macro-assembler-x87.h

@@ -7,7 +7,7 @@
 
 #include "assembler.h"
 #include "frames.h"
-#include "v8globals.h"
+#include "globals.h"
 
 namespace v8 {
 namespace internal {

tools/gyp/v8.gyp

@@ -586,7 +586,6 @@
         '../../src/v8.cc',
         '../../src/v8.h',
         '../../src/v8checks.h',
-        '../../src/v8globals.h',
         '../../src/v8memory.h',
         '../../src/v8threads.cc',
         '../../src/v8threads.h',