Revert new OS and CC detection and related changes since r15923.

src/compiler-intrinsics.h

Index: src/compiler-intrinsics.h
diff --git a/src/compiler-intrinsics.h b/src/compiler-intrinsics.h
index 1dcc2d3d3c529c3d7426d526b9a17f5006ca6b8c..b73e8ac750d0747b95693c8481b1592c65bd03c5 100644
--- a/src/compiler-intrinsics.h
+++ b/src/compiler-intrinsics.h
@@ -28,8 +28,6 @@
 #ifndef V8_COMPILER_INTRINSICS_H_
 #define V8_COMPILER_INTRINSICS_H_
 
-#include "globals.h"
-
 namespace v8 {
 namespace internal {
 
@@ -47,8 +45,7 @@ class CompilerIntrinsics {
   INLINE(static int CountSetBits(uint32_t value));
 };
 
-#if V8_CC_GNU
-
+#ifdef __GNUC__
 int CompilerIntrinsics::CountTrailingZeros(uint32_t value) {
   return __builtin_ctz(value);
 }
@@ -61,7 +58,7 @@ int CompilerIntrinsics::CountSetBits(uint32_t value) {
   return __builtin_popcount(value);
 }
 
-#elif V8_CC_MSVC
+#elif defined(_MSC_VER)
 
 #pragma intrinsic(_BitScanForward)
 #pragma intrinsic(_BitScanReverse)