Merge bleeding edge up to 8774 into the GC branch.

src/platform-nullos.cc

 // Copyright 2006-2008 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 199 matching lines @@
   return NULL;
 }
 
 
 void OS::Free(void* buf, const size_t length) {
   // TODO(1240712): potential system call return value which is ignored here.
   UNIMPLEMENTED();
 }
 
 
-#ifdef ENABLE_HEAP_PROTECTION
-
-void OS::Protect(void* address, size_t size) {
+void OS::Guard(void* address, const size_t size) {
   UNIMPLEMENTED();
 }
 
 
-void OS::Unprotect(void* address, size_t size, bool is_executable) {
-  UNIMPLEMENTED();
-}
-
-#endif
-
-
 void OS::Sleep(int milliseconds) {
   UNIMPLEMENTED();
 }
 
 
 void OS::Abort() {
   // Minimalistic implementation for bootstrapping.
   abort();
 }
 
@@ skipping 186 matching lines @@
  private:
   void* data_;
 };
 
 
 Semaphore* OS::CreateSemaphore(int count) {
   UNIMPLEMENTED();
   return new NullSemaphore(count);
 }
 
-#ifdef ENABLE_LOGGING_AND_PROFILING
 
 class ProfileSampler::PlatformData  : public Malloced {
  public:
   PlatformData() {
     UNIMPLEMENTED();
   }
 };
 
 
 ProfileSampler::ProfileSampler(int interval) {
@@ skipping 14 matching lines @@
 
 void ProfileSampler::Start() {
   UNIMPLEMENTED();
 }
 
 
 void ProfileSampler::Stop() {
   UNIMPLEMENTED();
 }
 
-#endif  // ENABLE_LOGGING_AND_PROFILING
 
 } }  // namespace v8::internal