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

src/v8utils.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 19 matching lines @@
 
 #include "utils.h"
 #include "platform.h"  // For va_list on Solaris.
 
 namespace v8 {
 namespace internal {
 
 // ----------------------------------------------------------------------------
 // I/O support.
 
-#if V8_GNUC_PREREQ(4, 0)
+#if __GNUC__ >= 4
 // On gcc we can ask the compiler to check the types of %d-style format
 // specifiers and their associated arguments.  TODO(erikcorry) fix this
 // so it works on MacOSX.
-#if V8_OS_DARWIN
+#if defined(__MACH__) && defined(__APPLE__)
 #define PRINTF_CHECKING
 #define FPRINTF_CHECKING
 #else  // MacOsX.
 #define PRINTF_CHECKING __attribute__ ((format (printf, 1, 2)))
 #define FPRINTF_CHECKING __attribute__ ((format (printf, 2, 3)))
 #endif
 #else
 #define PRINTF_CHECKING
 #define FPRINTF_CHECKING
 #endif
@@ skipping 200 matching lines @@
   T* a = NULL;
   U* b = NULL;
   a = b;  // Fake assignment to check assignability.
   USE(a);
 #endif  // DEBUG
 #if V8_HOST_ARCH_IA32
 #define STOS "stosl"
 #elif V8_HOST_ARCH_X64
 #define STOS "stosq"
 #endif
-#if V8_OS_NACL
+#if defined(__native_client__)
   // This STOS sequence does not validate for x86_64 Native Client.
   // Here we #undef STOS to force use of the slower C version.
   // TODO(bradchen): Profile V8 and implement a faster REP STOS
   // here if the profile indicates it matters.
 #undef STOS
 #endif
 
-#if V8_CC_GNU && defined(STOS)
+#if defined(__GNUC__) && defined(STOS)
   asm volatile(
       "cld;"
       "rep ; " STOS
       : "+&c" (counter), "+&D" (dest)
       : "a" (value)
       : "memory", "cc");
 #else
   for (int i = 0; i < counter; i++) {
     dest[i] = value;
   }
@@ skipping 26 matching lines @@
                             bool verbose = true);
 Vector<const char> ReadFile(FILE* file,
                             bool* exists,
                             bool verbose = true);
 
 
 template <typename sourcechar, typename sinkchar>
 INLINE(static void CopyCharsUnsigned(sinkchar* dest,
                                      const sourcechar* src,
                                      int chars));
-#if V8_HOST_ARCH_ARM
+#if defined(V8_HOST_ARCH_ARM)
 INLINE(void CopyCharsUnsigned(uint8_t* dest, const uint8_t* src, int chars));
 INLINE(void CopyCharsUnsigned(uint16_t* dest, const uint8_t* src, int chars));
 INLINE(void CopyCharsUnsigned(uint16_t* dest, const uint16_t* src, int chars));
 #endif
 
 // Copy from ASCII/16bit chars to ASCII/16bit chars.
 template <typename sourcechar, typename sinkchar>
 INLINE(void CopyChars(sinkchar* dest, const sourcechar* src, int chars));
 
 template<typename sourcechar, typename sinkchar>
@@ skipping 42 matching lines @@
       src += kStepSize;
     }
   }
 #endif
   while (dest < limit) {
     *dest++ = static_cast<sinkchar>(*src++);
   }
 }
 
 
-#if V8_HOST_ARCH_ARM
+#if defined(V8_HOST_ARCH_ARM)
 void CopyCharsUnsigned(uint8_t* dest, const uint8_t* src, int chars) {
   switch (static_cast<unsigned>(chars)) {
     case 0:
       break;
     case 1:
       *dest = *src;
       break;
     case 2:
       memcpy(dest, src, 2);
       break;
@@ skipping 95 matching lines @@
 
   // Add formatted contents like printf based on a va_list.
   void AddFormattedList(const char* format, va_list list);
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(StringBuilder);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_V8UTILS_H_