[NOT TO COMMIT!] r109: Diff of the current tcmalloc from the original google-perftools r109.

third_party/tcmalloc/chromium/src/base/vdso_support.cc

 // Copyright (c) 2008, Google Inc.
 // 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
@@ skipping 22 matching lines @@
 // Allow dynamic symbol lookup in the kernel VDSO page.
 //
 // VDSOSupport -- a class representing kernel VDSO (if present).
 //
 
 #include "base/vdso_support.h"
 
 #ifdef HAVE_VDSO_SUPPORT     // defined in vdso_support.h
 
 #include <fcntl.h>
-#include <stddef.h>   // for ptrdiff_t
+#include <stddef.h>   // for std::ptrdiff_t
 
 #include "base/atomicops.h"  // for MemoryBarrier
+#include "base/logging.h"
 #include "base/linux_syscall_support.h"
-#include "base/logging.h"
 #include "base/dynamic_annotations.h"
 #include "base/basictypes.h"  // for COMPILE_ASSERT
 
 using base::subtle::MemoryBarrier;
 
 #ifndef AT_SYSINFO_EHDR
 #define AT_SYSINFO_EHDR 33
 #endif
 
 // From binutils/include/elf/common.h (this doesn't appear to be documented
@@ skipping 201 matching lines @@
         break;
     }
   }
   if (link_base_ == ~0L || !dynamic_program_header) {
     RAW_DCHECK(~0L != link_base_, "no PT_LOADs in VDSO");
     RAW_DCHECK(dynamic_program_header, "no PT_DYNAMIC in VDSO");
     // Mark this image as not present. Can not recur infinitely.
     Init(0);
     return;
   }
-  ptrdiff_t relocation =
+  std::ptrdiff_t relocation =
       base_as_char - reinterpret_cast<const char *>(link_base_);
   ElfW(Dyn) *dynamic_entry =
       reinterpret_cast<ElfW(Dyn) *>(dynamic_program_header->p_vaddr +
                                     relocation);
   for (; dynamic_entry->d_tag != DT_NULL; ++dynamic_entry) {
     ElfW(Xword) value = dynamic_entry->d_un.d_val;
     if (fake_vdso) {
       // A complication: in the real VDSO, dynamic entries are not relocated
       // (it wasn't loaded by a dynamic loader). But when testing with a
       // "fake" dlopen()ed vdso library, the loader relocates some (but
@@ skipping 274 matching lines @@
 // ensure it here, with a global constructor of our own.  This
 // is an allowed exception to the normal rule against non-trivial
 // global constructors.
 static class VDSOInitHelper {
  public:
   VDSOInitHelper() { VDSOSupport::Init(); }
 } vdso_init_helper;
 }
 
 #endif  // HAVE_VDSO_SUPPORT