Revert 126715 - Update the tcmalloc vendor branch to r144 (gperftools 2.0).

third_party/tcmalloc/vendor/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
 # Note: for every library we create, we're explicit about what symbols
 # we export.  In order to avoid complications with C++ mangling, we always
 # use the regexp for of specifying symbols.
 
 # Make sure that when we re-make ./configure, we get the macros we need
 ACLOCAL_AMFLAGS = -I m4
 
-# This is so we can #include <gperftools/foo>
+# This is so we can #include <google/foo>
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
 if !WITH_STACK_TRACE
 AM_CPPFLAGS += -DNO_TCMALLOC_SAMPLES
 endif !WITH_STACK_TRACE
 
 # This is mostly based on configure options
 AM_CXXFLAGS =
 
 # These are good warnings to turn on by default.  We also tell gcc
 # that malloc, free, realloc, mmap, etc. are not builtins (these flags
 # are supported since gcc 3.1.1).  gcc doesn't think most of them are
 # builtins now in any case, but it's best to be explicit in case that
 # changes one day.  gcc ignores functions it doesn't understand.
 if GCC
 AM_CXXFLAGS += -Wall -Wwrite-strings -Woverloaded-virtual \
                -Wno-sign-compare \
                -fno-builtin-malloc -fno-builtin-free -fno-builtin-realloc \
                -fno-builtin-calloc -fno-builtin-cfree \
                -fno-builtin-memalign -fno-builtin-posix_memalign \
                -fno-builtin-valloc -fno-builtin-pvalloc
-# On i386, -mmmx is needed for the mmx-based instructions in
-# atomicops-internal-x86.h.
-if I386
-AM_CXXFLAGS += -mmmx
-endif I386
 endif GCC
 if HAVE_W_NO_UNUSED_RESULT
 AM_CXXFLAGS += -Wno-unused-result
 endif HAVE_W_NO_UNUSED_RESULT
 
 # The -no-undefined flag allows libtool to generate shared libraries for
 # Cygwin and MinGW.  LIBSTDCXX_LA_LINKER_FLAG is used to fix a Solaris bug.
 AM_LDFLAGS = -no-undefined $(LIBSTDCXX_LA_LINKER_FLAG)
 
 # We know our low-level code cannot trigger an exception.  On some
@@ skipping 45 matching lines @@
          -W _Znwm -W _ZnwmRKSt9nothrow_t -W _Znam -W _ZnamRKSt9nothrow_t \
          -W _ZdlPv -W _ZdaPv \
          -W __Znwm -W __ZnwmRKSt9nothrow_t -W __Znam -W __ZnamRKSt9nothrow_t \
          -W __ZdlPv -W __ZdaPv
 else
 WEAKEN = :
 endif !HAVE_OBJCOPY_WEAKEN
 
 LIBS_TO_WEAKEN =
 
-perftoolsincludedir = $(includedir)/gperftools
+googleincludedir = $(includedir)/google
 # The .h files you want to install (that is, .h files that people
 # who install this package can include in their own applications.)
 # We'll add to this later, on a library-by-library basis
-perftoolsinclude_HEADERS =
+googleinclude_HEADERS =
 # tcmalloc.h is a special case, because it's a .h.in file
-nodist_perftoolsinclude_HEADERS = src/gperftools/tcmalloc.h
-noinst_HEADERS = src/gperftools/tcmalloc.h.in
-
-# This is provided for backwards compatibility.  It is populated by
-# files that just forward to the canonical location in
-# perftoolsincludedir.
-googleincludedir = $(includedir)/google
-googleinclude_HEADERS =                         \
-   src/google/heap-checker.h                    \
-   src/google/heap-profiler.h                   \
-   src/google/malloc_extension.h                \
-   src/google/malloc_extension_c.h              \
-   src/google/malloc_hook.h                     \
-   src/google/malloc_hook_c.h                   \
-   src/google/profiler.h                        \
-   src/google/stacktrace.h                      \
-   src/google/tcmalloc.h                        \
-   src/windows/google/tcmalloc.h
+nodist_googleinclude_HEADERS = src/google/tcmalloc.h
+noinst_HEADERS = src/google/tcmalloc.h.in
 
 docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
 # This is for HTML and other documentation you want to install.
 # Add your documentation files (in doc/) in addition to these
 # top-level boilerplate files.  Also add a TODO file if you have one.
 # We'll add to this later, on a library-by-library basis
 dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt \
                 TODO
 
 # The libraries (.so's) you want to install
 # We'll add to this later, on a library-by-library basis
 lib_LTLIBRARIES =
 # This is for 'convenience libraries' -- basically just a container for sources
 noinst_LTLIBRARIES =
 ## The location of the windows project file for each binary we make
-WINDOWS_PROJECTS = gperftools.sln
+WINDOWS_PROJECTS = google-perftools.sln
 
 # unittests you want to run when people type 'make check'.
 # Note: tests cannot take any arguments!
 # In theory, unittests that are scripts should be added to check_SCRIPTS
 # instead.  But check_SCRIPTS is definitely a second-class testing mechanims:
 # it don't get TESTS_ENVIRONMENT, and it doesn't get success/failure counting
 # (in fact, a script failure aborts all the rest of the tests, even with -k).
 # So, for scripts, we add the script to tests, and also put in an empty
 # rule so automake doesn't try to build the script as a C binary.
 TESTS =
@@ skipping 83 matching lines @@
 libspinlock_la_SOURCES = src/base/spinlock.cc \
                          src/base/spinlock_internal.cc \
                          $(SPINLOCK_INCLUDES)
 
 LIBSPINLOCK = libwindows.la libspinlock.la libsysinfo.la liblogging.la
 
 # We also need to tell mingw that sysinfo.cc needs shlwapi.lib.
 # (We do this via a #pragma for msvc, but need to do it here for mingw).
 libsysinfo_la_LIBADD += -lshlwapi
 
-# There's a windows-specific unittest we can run.  Right now it's
-# win64-specific, and relies on masm, so we comment it out.
-## TESTS += preamble_patcher_test
-## preamble_patcher_test_SOURCES = src/windows/preamble_patcher_test.cc \
-##                                 src/windows/shortproc.asm \
-##                                 src/windows/auto_testing_hook.h \
-##                                 src/windows/preamble_patcher.h \
-##                                 src/base/basictypes.h \
-##                                 src/base/logging.h
-## preamble_patcher_test_LDFLAGS = $(TCMALLOC_FLAGS)
-## preamble_patcher_test_LDADD = $(LIBTCMALLOC_MINIMAL)
-
 # patch_functions.cc #includes tcmalloc.cc, so no need to link it in.
 TCMALLOC_CC =
 # windows has its own system for threads and system memory allocation.
 MAYBE_THREADS_CC =
 SYSTEM_ALLOC_CC =
 else !MINGW
 # spinlock is the only code that uses atomicops.
 SPINLOCK_INCLUDES = src/base/spinlock.h \
                     src/base/spinlock_internal.h \
                     src/base/atomicops.h \
                     src/base/atomicops-internals-macosx.h \
                     src/base/atomicops-internals-linuxppc.h \
                     src/base/atomicops-internals-windows.h \
                     src/base/atomicops-internals-x86.h
 
 noinst_LTLIBRARIES += libspinlock.la
 libspinlock_la_SOURCES = src/base/spinlock.cc \
                          src/base/spinlock_internal.cc \
                          src/base/atomicops-internals-x86.cc \
                          $(SPINLOCK_INCLUDES)
 libspinlock_la_LIBADD = $(NANOSLEEP_LIBS)
 # spinlock also needs NumCPUs, from libsysinfo, which in turn needs liblogging
 LIBSPINLOCK = libspinlock.la libsysinfo.la liblogging.la
 
 TCMALLOC_CC = src/tcmalloc.cc
 MAYBE_THREADS_CC = src/maybe_threads.cc
 SYSTEM_ALLOC_CC = src/system-alloc.cc
 endif !MINGW
 
-# Add this whether or not we're under MinGW, to keep the tarball complete.
-WINDOWS_PROJECTS += vsprojects/preamble_patcher_test/preamble_patcher_test.vcproj
-# Because we've commented out the test, above, we have to explicitly add
-# the test files to the tarball or automake will leave them out.
-WINDOWS_PROJECTS += src/windows/preamble_patcher_test.cc \
-                    src/windows/shortproc.asm \
-                    src/windows/auto_testing_hook.h
-
 ### Unittests
 TESTS += low_level_alloc_unittest
 WINDOWS_PROJECTS += vsprojects/low_level_alloc_unittest/low_level_alloc_unittest.vcproj
 LOW_LEVEL_ALLOC_UNITTEST_INCLUDES = src/base/low_level_alloc.h \
                                     src/base/basictypes.h \
-                                    src/gperftools/malloc_hook.h \
-                                    src/gperftools/malloc_hook_c.h \
+                                    src/google/malloc_hook.h \
+                                    src/google/malloc_hook_c.h \
                                     src/malloc_hook-inl.h \
                                     src/malloc_hook_mmap_linux.h \
                                     src/malloc_hook_mmap_freebsd.h \
                                     $(SPINLOCK_INCLUDES) \
                                     $(LOGGING_INCLUDES)
 low_level_alloc_unittest_SOURCES = src/base/low_level_alloc.cc \
                                    src/malloc_hook.cc \
                                    $(MAYBE_THREADS_CC) \
                                    src/tests/low_level_alloc_unittest.cc \
                                    $(LOW_LEVEL_ALLOC_UNITTEST_INCLUDES)
@@ skipping 14 matching lines @@
 
 
 ### ------- stack trace
 
 if WITH_STACK_TRACE
 
 ### The header files we use.  We divide into categories based on directory
 S_STACKTRACE_INCLUDES = src/stacktrace_config.h \
                         src/stacktrace_generic-inl.h \
                         src/stacktrace_libunwind-inl.h \
-                        src/stacktrace_arm-inl.h \
+                        src/stacktrace_nacl-inl.h \
                         src/stacktrace_powerpc-inl.h \
+                        src/stacktrace_x86_64-inl.h \
                         src/stacktrace_x86-inl.h \
                         src/stacktrace_win32-inl.h \
                         src/base/elf_mem_image.h \
                         src/base/vdso_support.h
 
-SG_STACKTRACE_INCLUDES = src/gperftools/stacktrace.h
+SG_STACKTRACE_INCLUDES = src/google/stacktrace.h
 STACKTRACE_INCLUDES = $(S_STACKTRACE_INCLUDES) $(SG_STACKTRACE_INCLUDES)
-perftoolsinclude_HEADERS += $(SG_STACKTRACE_INCLUDES)
+googleinclude_HEADERS += $(SG_STACKTRACE_INCLUDES)
 
 ### Making the library
 noinst_LTLIBRARIES += libstacktrace.la
 libstacktrace_la_SOURCES = src/stacktrace.cc \
                            src/base/elf_mem_image.cc \
                            src/base/vdso_support.cc \
                            $(STACKTRACE_INCLUDES)
 libstacktrace_la_LIBADD = $(UNWIND_LIBS) $(LIBSPINLOCK)
 STACKTRACE_SYMBOLS = '(GetStackTrace|GetStackFrames|GetStackTraceWithContext|GetStackFramesWithContext)'
 libstacktrace_la_LDFLAGS = -export-symbols-regex $(STACKTRACE_SYMBOLS)
 
 ### Unittests
 TESTS += stacktrace_unittest
-STACKTRACE_UNITTEST_INCLUDES = src/config_for_unittests.h \
+STACKTRACE_UNITTEST_INLCUDES = src/config_for_unittests.h \
                                src/base/commandlineflags.h \
                                $(STACKTRACE_INCLUDES) \
                                $(LOGGING_INCLUDES)
 stacktrace_unittest_SOURCES = src/tests/stacktrace_unittest.cc \
-                              $(STACKTRACE_UNITTEST_INCLUDES)
+                              $(STACKTRACE_UNITTEST_INLCUDES)
 stacktrace_unittest_LDADD = libstacktrace.la liblogging.la
 
 ### Documentation
 dist_doc_DATA +=
 
 endif WITH_STACK_TRACE
 
 ### ------- pprof
 
 # If we are not compiling with stacktrace support, pprof is worthless
@@ skipping 48 matching lines @@
                               src/span.h \
                               src/static_vars.h \
                               src/symbolize.h \
                               src/thread_cache.h \
                               src/stack_trace_table.h \
                               src/base/thread_annotations.h \
                               src/malloc_hook-inl.h \
                               src/malloc_hook_mmap_linux.h \
                               src/malloc_hook_mmap_freebsd.h \
                               src/maybe_threads.h
-SG_TCMALLOC_MINIMAL_INCLUDES = src/gperftools/malloc_hook.h \
-                               src/gperftools/malloc_hook_c.h \
-                               src/gperftools/malloc_extension.h \
-                               src/gperftools/malloc_extension_c.h \
-                               src/gperftools/stacktrace.h
+SG_TCMALLOC_MINIMAL_INCLUDES = src/google/malloc_hook.h \
+                               src/google/malloc_hook_c.h \
+                               src/google/malloc_extension.h \
+                               src/google/malloc_extension_c.h \
+                               src/google/stacktrace.h
 TCMALLOC_MINIMAL_INCLUDES = $(S_TCMALLOC_MINIMAL_INCLUDES) $(SG_TCMALLOC_MINIMAL_INCLUDES)
-perftoolsinclude_HEADERS += $(SG_TCMALLOC_MINIMAL_INCLUDES)
+googleinclude_HEADERS += $(SG_TCMALLOC_MINIMAL_INCLUDES)
 
 ### Making the library
 
 # As we describe at the top of this file, we want to turn off exceptions
 # for all files in this library -- except tcmalloc.cc which needs them
 # to fulfill its API.  Automake doesn't allow per-file CXXFLAGS, so we need
 # to separate into two libraries.
 noinst_LTLIBRARIES += libtcmalloc_minimal_internal.la
 libtcmalloc_minimal_internal_la_SOURCES = src/common.cc \
                                           src/internal_logging.cc \
@@ skipping 38 matching lines @@
 LIBTCMALLOC_MINIMAL = libtcmalloc_minimal.la
 endif !MINGW
 
 LIBS_TO_WEAKEN += libtcmalloc_minimal.la
 
 ### Unittests
 
 # Commented out for the moment because malloc(very_big_num) is broken in
 # standard libc!  At least, in some situations, some of the time.
 ## TESTS += malloc_unittest
-## MALLOC_UNITEST_INCLUDES = src/gperftools/malloc_extension.h \
-##                           src/gperftools/malloc_hook.h \
-##                           src/gperftools/malloc_hook_c.h \
+## MALLOC_UNITEST_INCLUDES = src/google/malloc_extension.h \
+##                           src/google/malloc_hook.h \
+##                           src/google/malloc_hook_c.h \
 ##                           src/malloc_hook-inl.h \
 ##                           src/malloc_hook_mmap_linux.h \
 ##                           src/malloc_hook_mmap_freebsd.h \
 ##                           src/base/basictypes.h \
 ##                           src/maybe_threads.h
 ## malloc_unittest_SOURCES = src/tests/tcmalloc_unittest.cc \
 ##                           src/malloc_hook.cc \
 ##                           src/malloc_extension.cc \
 ##                           $(MAYBE_THREADS_CC) \
 ##                           $(MALLOC_UNITTEST_INCLUDES)
@@ skipping 100 matching lines @@
                                        src/config_for_unittests.h
 current_allocated_bytes_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 current_allocated_bytes_test_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 current_allocated_bytes_test_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
 
 TESTS += malloc_hook_test
 WINDOWS_PROJECTS += vsprojects/malloc_hook_test/malloc_hook_test.vcproj
 malloc_hook_test_SOURCES = src/tests/malloc_hook_test.cc \
                            src/config_for_unittests.h \
                            src/base/logging.h \
-                           src/gperftools/malloc_hook.h \
+                           src/google/malloc_hook.h \
                            src/tests/testutil.h src/tests/testutil.cc
 malloc_hook_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 malloc_hook_test_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 malloc_hook_test_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
 
 TESTS += malloc_extension_test
 WINDOWS_PROJECTS += vsprojects/malloc_extension_test/malloc_extension_test.vcproj
 malloc_extension_test_SOURCES = src/tests/malloc_extension_test.cc \
                                 src/config_for_unittests.h \
                                 src/base/logging.h \
-                                src/gperftools/malloc_extension.h \
-                                src/gperftools/malloc_extension_c.h
+                                src/google/malloc_extension.h \
+                                src/google/malloc_extension_c.h
 malloc_extension_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 malloc_extension_test_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 malloc_extension_test_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
 
 # This doesn't work with static linkage, because libtcmalloc.a isn't
 # happy with C linkage (it misses the stdc++ library).  Likewise with
 # mingw, which links foo.a even though it doesn't set ENABLE_STATIC.
 # TODO(csilvers): set enable_static=true in configure.ac:36?
 if !MINGW
 if !ENABLE_STATIC
 TESTS += malloc_extension_c_test
 malloc_extension_c_test_SOURCES = src/tests/malloc_extension_c_test.c \
-                                  src/gperftools/malloc_extension.h \
-                                  src/gperftools/malloc_extension_c.h
+                                  src/google/malloc_extension.h \
+                                  src/google/malloc_extension_c.h
 malloc_extension_c_test_CFLAGS = $(PTHREAD_CFLAGS) $(AM_CFLAGS)
 # -ansi here is just to help ensure the code is bog-standard C.
 if GCC
 malloc_extension_c_test_CFLAGS += -ansi
 endif GCC
 malloc_extension_c_test_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 malloc_extension_c_test_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
 endif !ENABLE_STATIC
 endif !MINGW
 
@@ skipping 179 matching lines @@
                       src/raw_printer.h \
                       src/base/elfcore.h \
                       src/base/googleinit.h \
                       src/base/linux_syscall_support.h \
                       src/base/linuxthreads.h \
                       src/base/stl_allocator.h \
                       src/base/sysinfo.h \
                       src/base/thread_lister.h \
                       src/heap-profile-table.h
 SG_TCMALLOC_INCLUDES = $(SG_TCMALLOC_MINIMAL_INCLUDES) \
-                       src/gperftools/heap-profiler.h \
-                       src/gperftools/heap-checker.h
+                       src/google/heap-profiler.h \
+                       src/google/heap-checker.h
 TCMALLOC_INCLUDES = $(S_TCMALLOC_INCLUDES) $(SG_TCMALLOC_INCLUDES)
-perftoolsinclude_HEADERS += $(SG_TCMALLOC_INCLUDES)
+googleinclude_HEADERS += $(SG_TCMALLOC_INCLUDES)
 
 ### Making the library
 
 # As we describe at the top of this file, we want to turn off exceptions
 # for all files in this library -- except tcmalloc.cc which needs them
 # to fulfill its API.  Automake doesn't allow per-file CXXFLAGS, so we need
 # to separate into two libraries.
 noinst_LTLIBRARIES += libtcmalloc_internal.la
 libtcmalloc_internal_la_SOURCES = $(libtcmalloc_minimal_internal_la_SOURCES) \
                                   $(TCMALLOC_INCLUDES) \
@@ skipping 30 matching lines @@
 endif !WITH_HEAP_CHECKER
 
 LIBTCMALLOC = libtcmalloc.la
 
 LIBS_TO_WEAKEN += libtcmalloc.la
 
 ### Unittests
 
 TESTS += tcmalloc_unittest
 TCMALLOC_UNITTEST_INCLUDES = src/config_for_unittests.h \
-                             src/gperftools/malloc_extension.h
+                             src/google/malloc_extension.h
 tcmalloc_unittest_SOURCES = src/tests/tcmalloc_unittest.cc \
                             src/tcmalloc.h \
                             src/tests/testutil.h src/tests/testutil.cc \
                             $(TCMALLOC_UNITTEST_INCLUDES)
 tcmalloc_unittest_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 tcmalloc_unittest_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 # We want libtcmalloc last on the link line, but due to a bug in
 # libtool involving convenience libs, they need to come last on the
 # link line in order to get dependency ordering right.  This is ok:
 # convenience libraries are .a's, so tcmalloc is still the last .so.
@@ skipping 71 matching lines @@
 sampling_test.sh$(EXEEXT): $(top_srcdir)/$(sampling_test_sh_SOURCES) \
                            sampling_test
         rm -f $@
         cp -p $(top_srcdir)/$(sampling_test_sh_SOURCES) $@
 
 # This is the sub-program used by sampling_test.sh
 # The -g is so pprof can get symbol information.
 noinst_PROGRAMS += sampling_test
 SAMPLING_TEST_INCLUDES = src/config_for_unittests.h \
                          src/base/logging.h \
-                         src/gperftools/malloc_extension.h
+                         src/google/malloc_extension.h
 sampling_test_SOURCES = src/tests/sampling_test.cc \
                         $(SAMPLING_TEST_INCLUDES)
 sampling_test_CXXFLAGS = -g $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 sampling_test_LDFLAGS = -g $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 sampling_test_LDADD = $(LIBTCMALLOC) $(PTHREAD_LIBS)
 
 endif WITH_HEAP_PROFILER_OR_CHECKER
 
 if WITH_HEAP_PROFILER
 
 TESTS += heap-profiler_unittest.sh$(EXEEXT)
 heap_profiler_unittest_sh_SOURCES = src/tests/heap-profiler_unittest.sh
 noinst_SCRIPTS += $(heap_profiler_unittest_sh_SOURCES)
 heap-profiler_unittest.sh$(EXEEXT): $(top_srcdir)/$(heap_profiler_unittest_sh_SOURCES) \
                                     heap-profiler_unittest
         rm -f $@
         cp -p $(top_srcdir)/$(heap_profiler_unittest_sh_SOURCES) $@
 
 # These are sub-programs used by heap-profiler_unittest.sh
 noinst_PROGRAMS += heap-profiler_unittest
 HEAP_PROFILER_UNITTEST_INCLUDES = src/config_for_unittests.h \
-                                  src/gperftools/heap-profiler.h
+                                  src/google/heap-profiler.h
 heap_profiler_unittest_SOURCES = src/tests/heap-profiler_unittest.cc \
                                  $(HEAP_PROFILER_UNITTEST_INCLUDES)
 heap_profiler_unittest_CXXFLAGS = -g $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 heap_profiler_unittest_LDFLAGS = -g $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 heap_profiler_unittest_LDADD = $(LIBTCMALLOC) $(PTHREAD_LIBS)
 
-# Tests the compatibility include-headers in google/.  Requires a function
-# defined in the heap-profiler, which is why the test lives here.
-TESTS += simple_compat_test
-simple_compat_test_SOURCES = src/tests/simple_compat_test.cc \
-                             $(googleinclude_HEADERS)
-simple_compat_test_LDFLAGS = $(TCMALLOC_FLAGS)
-simple_compat_test_LDADD = $(LIBTCMALLOC)
-
 endif WITH_HEAP_PROFILER
 
 if WITH_HEAP_CHECKER
 
 TESTS += heap-checker_unittest.sh$(EXEEXT)
 heap_checker_unittest_sh_SOURCES = src/tests/heap-checker_unittest.sh
 noinst_SCRIPTS += $(heap_checker_unittest_sh_SOURCES)
 heap-checker_unittest.sh$(EXEEXT): $(top_srcdir)/$(heap_checker_unittest_sh_SOURCES) \
                                    heap-checker_unittest
         rm -f $@
         cp -p $(top_srcdir)/$(heap_checker_unittest_sh_SOURCES) $@
 
 TESTS += heap-checker-death_unittest.sh$(EXEEXT)
 heap_checker_death_unittest_sh_SOURCES = src/tests/heap-checker-death_unittest.sh
 noinst_SCRIPTS += $(top_srcdir)/$(heap_checker_death_unittest_sh_SOURCES)
 heap-checker-death_unittest.sh$(EXEEXT): $(heap_checker_death_unittest_sh_SOURCES) \
                                          heap-checker_unittest
         rm -f $@
         cp -p $(top_srcdir)/$(heap_checker_death_unittest_sh_SOURCES) $@
 
 # These are sub-programs used by heap-checker_unittest.sh
 noinst_PROGRAMS += heap-checker_unittest
 HEAP_CHECKER_UNITTEST_INCLUDES = src/config_for_unittests.h \
                                  src/memory_region_map.h \
                                  src/base/commandlineflags.h \
                                  src/base/googleinit.h \
-                                 src/gperftools/heap-checker.h \
+                                 src/google/heap-checker.h \
                                  $(LOGGING_INCLUDES)
 heap_checker_unittest_SOURCES = src/tests/heap-checker_unittest.cc \
                                 $(HEAP_CHECKER_UNITTEST_INCLUDES)
 heap_checker_unittest_CXXFLAGS = -g $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 heap_checker_unittest_LDFLAGS = -g $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 # We want libtcmalloc last on the link line, but due to a bug in
 # libtool involving convenience libs, they need to come last on the
 # link line in order to get dependency ordering right.  This is ok:
 # convenience libraries are .a's, so tcmalloc is still the last .so.
 # We also put pthreads after tcmalloc, because some pthread
@@ skipping 113 matching lines @@
                           src/profile-handler.h \
                           src/getpc.h \
                           src/base/basictypes.h \
                           src/base/commandlineflags.h \
                           src/base/googleinit.h \
                           src/base/logging.h \
                           src/base/simple_mutex.h \
                           src/base/sysinfo.h \
                           $(SPINLOCK_INCLUDES) \
                           $(LOGGING_INCLUDES)
-SG_CPU_PROFILER_INCLUDES = src/gperftools/profiler.h \
-                           src/gperftools/stacktrace.h
+SG_CPU_PROFILER_INCLUDES = src/google/profiler.h \
+                           src/google/stacktrace.h
 CPU_PROFILER_INCLUDES = $(S_CPU_PROFILER_INCLUDES) $(SG_CPU_PROFILER_INCLUDES)
-perftoolsinclude_HEADERS += $(SG_CPU_PROFILER_INCLUDES)
+googleinclude_HEADERS += $(SG_CPU_PROFILER_INCLUDES)
 
 ### Making the library
 lib_LTLIBRARIES += libprofiler.la
 libprofiler_la_SOURCES = src/profiler.cc \
                          src/profile-handler.cc \
                          src/profiledata.cc \
                          $(CPU_PROFILER_INCLUDES)
 libprofiler_la_LIBADD = libstacktrace.la
 # We have to include ProfileData for profiledata_unittest
 CPU_PROFILER_SYMBOLS = '(ProfilerStart|ProfilerStartWithOptions|ProfilerStop|ProfilerFlush|ProfilerEnable|ProfilerDisable|ProfilingIsEnabledForAllThreads|ProfilerRegisterThread|ProfilerGetCurrentState|ProfilerState|ProfileData|ProfileHandler)'
@@ skipping 31 matching lines @@
 profiler_unittest.sh$(EXEEXT): $(top_srcdir)/$(profiler_unittest_sh_SOURCES) \
                                profiler1_unittest profiler2_unittest \
                                profiler3_unittest profiler4_unittest
         rm -f $@
         cp -p $(top_srcdir)/$(profiler_unittest_sh_SOURCES) $@
 
 # These are sub-programs used by profiler_unittest.sh
 noinst_PROGRAMS += profiler1_unittest profiler2_unittest profiler3_unittest \
                    profiler4_unittest
 PROFILER_UNITTEST_INCLUDES = src/config_for_unittests.h \
-                             src/gperftools/profiler.h
+                             src/google/profiler.h
 PROFILER_UNITTEST_SRCS = src/tests/profiler_unittest.cc \
                          src/tests/testutil.h src/tests/testutil.cc \
                          $(PROFILER_UNITTEST_INCLUDES)
 profiler1_unittest_SOURCES = $(PROFILER_UNITTEST_SRCS)
 profiler1_unittest_CXXFLAGS = -g -DNO_THREADS $(AM_CXXFLAGS)
 profiler1_unittest_LDADD = $(LIBPROFILER)
 profiler2_unittest_SOURCES = $(PROFILER_UNITTEST_SRCS)
 profiler2_unittest_CXXFLAGS = -g -DNO_THREADS $(AM_CXXFLAGS)
 profiler2_unittest_LDADD = -lstacktrace -lprofiler
 # We depend on -lprofiler but haven't yet said how to build it.  Do so now.
@@ skipping 119 matching lines @@
         $(SHELL) ./config.status --recheck
 
 # Windows wants write permission to .vcproj files and maybe even sln files.
 dist-hook:
         test -e "$(distdir)/vsprojects" \
            && chmod -R u+w $(distdir)/*.sln $(distdir)/vsprojects/
 
 EXTRA_DIST = packages/rpm.sh packages/rpm/rpm.spec packages/deb.sh packages/deb \
              $(SCRIPTS) libtool \
              src/windows/get_mangled_names.cc src/windows/override_functions.cc \
-             src/windows/config.h src/windows/gperftools/tcmalloc.h \
+             src/windows/config.h src/windows/google/tcmalloc.h \
              $(WINDOWS_PROJECTS) \
              src/solaris/libstdc++.la