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

third_party/tcmalloc/chromium/src/config_linux.h

Index: third_party/tcmalloc/chromium/src/config_linux.h
diff --git a/third_party/tcmalloc/chromium/src/config.h.in b/third_party/tcmalloc/chromium/src/config_linux.h
similarity index 72%
copy from third_party/tcmalloc/chromium/src/config.h.in
copy to third_party/tcmalloc/chromium/src/config_linux.h
index 9112951d8b41056a9be5e0f64a45792b78d35899..25c8da89e10afecef9a582f17e390503a3b61010 100644
--- a/third_party/tcmalloc/chromium/src/config.h.in
+++ b/third_party/tcmalloc/chromium/src/config_linux.h
@@ -1,249 +1,248 @@
+/* src/config.h.  Generated from config.h.in by configure.  */
 /* src/config.h.in.  Generated from configure.ac by autoheader.  */
 
-
-#ifndef GOOGLE_PERFTOOLS_CONFIG_H_
-#define GOOGLE_PERFTOOLS_CONFIG_H_
-
-
 /* Define to 1 if compiler supports __builtin_stack_pointer */
-#undef HAVE_BUILTIN_STACK_POINTER
+/* #undef HAVE_BUILTIN_STACK_POINTER */
 
 /* Define to 1 if you have the <conflict-signal.h> header file. */
-#undef HAVE_CONFLICT_SIGNAL_H
+/* #undef HAVE_CONFLICT_SIGNAL_H */
 
 /* Define to 1 if you have the <cygwin/signal.h> header file. */
 #undef HAVE_CYGWIN_SIGNAL_H
 
 /* Define to 1 if you have the declaration of `cfree', and to 0 if you don't.
    */
-#undef HAVE_DECL_CFREE
+#define HAVE_DECL_CFREE 1
 
 /* Define to 1 if you have the declaration of `memalign', and to 0 if you
    don't. */
-#undef HAVE_DECL_MEMALIGN
+#define HAVE_DECL_MEMALIGN 1
 
 /* Define to 1 if you have the declaration of `posix_memalign', and to 0 if
    you don't. */
-#undef HAVE_DECL_POSIX_MEMALIGN
+#define HAVE_DECL_POSIX_MEMALIGN 1
 
 /* Define to 1 if you have the declaration of `pvalloc', and to 0 if you
    don't. */
-#undef HAVE_DECL_PVALLOC
+#define HAVE_DECL_PVALLOC 1
 
 /* Define to 1 if you have the declaration of `uname', and to 0 if you don't.
    */
-#undef HAVE_DECL_UNAME
+#define HAVE_DECL_UNAME 1
 
 /* Define to 1 if you have the declaration of `valloc', and to 0 if you don't.
    */
-#undef HAVE_DECL_VALLOC
+#define HAVE_DECL_VALLOC 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
+#define HAVE_DLFCN_H 1
 
 /* Define to 1 if the system has the type `Elf32_Versym'. */
-#undef HAVE_ELF32_VERSYM
+#define HAVE_ELF32_VERSYM 1
 
 /* Define to 1 if you have the <execinfo.h> header file. */
-#undef HAVE_EXECINFO_H
+#define HAVE_EXECINFO_H 1
 
 /* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
+#define HAVE_FCNTL_H 1
 
 /* Define to 1 if you have the <features.h> header file. */
-#undef HAVE_FEATURES_H
+#define HAVE_FEATURES_H 1
 
 /* Define to 1 if you have the `geteuid' function. */
-#undef HAVE_GETEUID
+#define HAVE_GETEUID 1
 
 /* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
+#define HAVE_GETPAGESIZE 1
 
 /* Define to 1 if you have the <glob.h> header file. */
-#undef HAVE_GLOB_H
+#define HAVE_GLOB_H 1
 
 /* Define to 1 if you have the <grp.h> header file. */
-#undef HAVE_GRP_H
+#define HAVE_GRP_H 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
+#define HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the <libunwind.h> header file. */
-#undef HAVE_LIBUNWIND_H
+/* #undef HAVE_LIBUNWIND_H */
 
 /* Define to 1 if you have the <linux/ptrace.h> header file. */
-#undef HAVE_LINUX_PTRACE_H
+#define HAVE_LINUX_PTRACE_H 1
 
 /* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
+#define HAVE_MALLOC_H 1
 
 /* Define to 1 if you have the <malloc/malloc.h> header file. */
 #undef HAVE_MALLOC_MALLOC_H
 
 /* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+#define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
+#define HAVE_MMAP 1
 
 /* define if the compiler implements namespaces */
-#undef HAVE_NAMESPACES
+#define HAVE_NAMESPACES 1
 
 /* Define to 1 if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
+#define HAVE_POLL_H 1
 
 /* define if libc has program_invocation_name */
-#undef HAVE_PROGRAM_INVOCATION_NAME
+#define HAVE_PROGRAM_INVOCATION_NAME 1
 
 /* Define if you have POSIX threads libraries and header files. */
-#undef HAVE_PTHREAD
+#define HAVE_PTHREAD 1
 
 /* Define to 1 if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
+#define HAVE_PWD_H 1
 
 /* Define to 1 if you have the `sbrk' function. */
-#undef HAVE_SBRK
+#define HAVE_SBRK 1
 
 /* Define to 1 if you have the <sched.h> header file. */
-#undef HAVE_SCHED_H
+#define HAVE_SCHED_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
+#define HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
+#define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+#define HAVE_STRING_H 1
 
 /* Define to 1 if the system has the type `struct mallinfo'. */
-#undef HAVE_STRUCT_MALLINFO
+#define HAVE_STRUCT_MALLINFO 1
 
 /* Define to 1 if you have the <sys/cdefs.h> header file. */
-#undef HAVE_SYS_CDEFS_H
+#define HAVE_SYS_CDEFS_H 1
 
 /* Define to 1 if you have the <sys/malloc.h> header file. */
 #undef HAVE_SYS_MALLOC_H
 
 /* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
+#define HAVE_SYS_PARAM_H 1
 
 /* Define to 1 if you have the <sys/prctl.h> header file. */
-#undef HAVE_SYS_PRCTL_H
+#define HAVE_SYS_PRCTL_H 1
 
 /* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
+#define HAVE_SYS_RESOURCE_H 1
 
 /* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
+#define HAVE_SYS_SOCKET_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
+#define HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/syscall.h> header file. */
-#undef HAVE_SYS_SYSCALL_H
+#define HAVE_SYS_SYSCALL_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
+#define HAVE_SYS_TYPES_H 1
 
 /* <sys/ucontext.h> is broken on redhat 7 */
 #undef HAVE_SYS_UCONTEXT_H
 
 /* Define to 1 if you have the <sys/wait.h> header file. */
-#undef HAVE_SYS_WAIT_H
+#define HAVE_SYS_WAIT_H 1
 
 /* Define to 1 if compiler supports __thread */
-#undef HAVE_TLS
+#define HAVE_TLS 1
 
-/* Define to 1 if you have the <ucontext.h> header file. */
-#undef HAVE_UCONTEXT_H
+/* <sys/ucontext.h> is broken on redhat 7 */
+#define HAVE_UCONTEXT_H 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the <unwind.h> header file. */
-#undef HAVE_UNWIND_H
+#define HAVE_UNWIND_H 1
 
 /* Define to 1 if you have the <valgrind.h> header file. */
 #undef HAVE_VALGRIND_H
 
 /* define if your compiler has __attribute__ */
-#undef HAVE___ATTRIBUTE__
+#define HAVE___ATTRIBUTE__ 1
 
 /* Define to 1 if compiler supports __environ */
 #undef HAVE___ENVIRON
 
 /* Define to 1 if the system has the type `__int64'. */
-#undef HAVE___INT64
+/* #undef HAVE___INT64 */
 
 /* prefix where we look for installed files */
-#undef INSTALL_PREFIX
+#define INSTALL_PREFIX "/usr/local"
 
 /* Define to 1 if int32_t is equivalent to intptr_t */
-#undef INT32_EQUALS_INTPTR
+/* #undef INT32_EQUALS_INTPTR */
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR
 
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
+/* #undef NO_MINUS_C_MINUS_O */
 
 /* Name of package */
-#undef PACKAGE
+#define PACKAGE "google-perftools"
 
 /* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
+#define PACKAGE_BUGREPORT "opensource@google.com"
 
 /* Define to the full name of this package. */
-#undef PACKAGE_NAME
+#define PACKAGE_NAME "google-perftools"
 
 /* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
+#define PACKAGE_STRING "google-perftools 1.7"
 
 /* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
+#define PACKAGE_TARNAME "google-perftools"
 
 /* Define to the home page for this package. */
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#undef PACKAGE_VERSION
+#define PACKAGE_VERSION "1.7"
 
 /* How to access the PC from a struct ucontext */
-#undef PC_FROM_UCONTEXT
+#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
 
 /* Always the empty-string on non-windows systems. On windows, should be
    "__declspec(dllexport)". This way, when we compile the dll, we export our
    functions/classes. It's safe to define this here because config.h is only
    used internally, to compile the DLL, and every DLL source file #includes
    "config.h" before anything else. */
-#undef PERFTOOLS_DLL_DECL
+#define PERFTOOLS_DLL_DECL 
 
 /* printf format code for printing a size_t and ssize_t */
-#undef PRIdS
+#define PRIdS "zd"
 
 /* printf format code for printing a size_t and ssize_t */
-#undef PRIuS
+#define PRIuS "zu"
 
 /* printf format code for printing a size_t and ssize_t */
-#undef PRIxS
+#define PRIxS "zx"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
-#undef PTHREAD_CREATE_JOINABLE
+/* #undef PTHREAD_CREATE_JOINABLE */
 
 /* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
+#define STDC_HEADERS 1
 
 /* the namespace where STL code like vector<> is defined */
-#undef STL_NAMESPACE
+#define STL_NAMESPACE std
 
 /* Version number of package */
-#undef VERSION
+#define VERSION "1.7"
 
 /* C99 says: define this to get the PRI... macros from stdint.h */
 #ifndef __STDC_FORMAT_MACROS
@@ -253,13 +252,10 @@
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
-#undef inline
+/* #undef inline */
 #endif
 
 
 #ifdef __MINGW32__
 #include "windows/mingw.h"
 #endif
-
-#endif  /* #ifndef GOOGLE_PERFTOOLS_CONFIG_H_ */
-