Update the tcmalloc vendor branch to r111 (perftools version 1.8)

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 <google/foo>
@@ skipping 12 matching lines @@
 # 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
 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
 # systems, such as cygwin, it would be disastrous if they did, because
 # the exception handler might call malloc!  If our low-level routines
 # raised an exception within the malloc, they'd deadlock.  Luckily,
 # we control all this code, and do not need exceptions for it.
@@ skipping 205 matching lines @@
 endif !MINGW
 
 ### 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/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 \
-                                   src/maybe_threads.cc \
+                                   $(MAYBE_THREADS_CC) \
                                    src/tests/low_level_alloc_unittest.cc \
                                    $(LOW_LEVEL_ALLOC_UNITTEST_INCLUDES)
 # By default, MallocHook takes stack traces for use by the heap-checker.
 # We don't need that functionality here, so we turn it off to reduce deps.
 low_level_alloc_unittest_CXXFLAGS = -DNO_TCMALLOC_SAMPLES
 low_level_alloc_unittest_LDADD = $(LIBSPINLOCK)
 
 TESTS += atomicops_unittest
 ATOMICOPS_UNITTEST_INCLUDES = src/base/atomicops.h \
                               src/base/atomicops-internals-macosx.h \
                               src/base/atomicops-internals-windows.h \
                               src/base/atomicops-internals-x86.h \
                               $(LOGGING_INCLUDES)
 atomicops_unittest_SOURCES = src/tests/atomicops_unittest.cc \
                              $(ATOMICOPS_UNITTEST_INCLUDES)
 atomicops_unittest_LDADD = $(LIBSPINLOCK)
 
 
 ### ------- 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_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/google/stacktrace.h
 STACKTRACE_INCLUDES = $(S_STACKTRACE_INCLUDES) $(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_INLCUDES = src/config_for_unittests.h \
                                src/base/commandlineflags.h \
@@ skipping 45 matching lines @@
                               src/system-alloc.h \
                               src/packed-cache-inl.h \
                               $(SPINLOCK_INCLUDES) \
                               src/tcmalloc_guard.h \
                               src/base/commandlineflags.h \
                               src/base/basictypes.h \
                               src/pagemap.h \
                               src/sampler.h \
                               src/central_freelist.h \
                               src/linked_list.h \
+                              src/libc_override.h \
+                              src/libc_override_gcc_and_weak.h \
+                              src/libc_override_glibc.h \
+                              src/libc_override_osx.h \
+                              src/libc_override_redefine.h \
                               src/page_heap.h \
                               src/page_heap_allocator.h \
                               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/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)
 googleinclude_HEADERS += $(SG_TCMALLOC_MINIMAL_INCLUDES)
 
 ### Making the library
@@ skipping 50 matching lines @@
 
 ### 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/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)
 ## malloc_unittest_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 ## malloc_unittest_LDFLAGS = $(PTHREAD_CFLAGS)
 ## malloc_unittest_LDADD = $(PTHREAD_LIBS)
@@ skipping 135 matching lines @@
 # -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
 
 if !MINGW
+if !OSX
 TESTS += memalign_unittest
 memalign_unittest_SOURCES = src/tests/memalign_unittest.cc \
                             src/tcmalloc.h \
                             src/config_for_unittests.h \
                             src/tests/testutil.h src/tests/testutil.cc
 memalign_unittest_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 memalign_unittest_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 memalign_unittest_LDADD = $(LIBTCMALLOC_MINIMAL) $(PTHREAD_LIBS)
+endif !OSX
 endif !MINGW
 
 TESTS += page_heap_test
 WINDOWS_PROJECTS += vsprojects/page_heap_test/page_heap_test.vcproj
 page_heap_test_SOURCES = src/tests/page_heap_test.cc \
                          src/config_for_unittests.h \
                          src/base/logging.h \
                          src/common.h \
                          src/page_heap.h
 page_heap_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
@@ skipping 102 matching lines @@
                                            -DDEBUGALLOCATION
 tcmalloc_minimal_debug_unittest_LDFLAGS = $(tcmalloc_minimal_unittest_LDFLAGS)
 tcmalloc_minimal_debug_unittest_LDADD = libtcmalloc_minimal_debug.la $(PTHREAD_LIBS)
 
 TESTS += malloc_extension_debug_test
 malloc_extension_debug_test_SOURCES = $(malloc_extension_test_SOURCES)
 malloc_extension_debug_test_CXXFLAGS = $(malloc_extension_test_CXXFLAGS)
 malloc_extension_debug_test_LDFLAGS = $(malloc_extension_test_LDFLAGS)
 malloc_extension_debug_test_LDADD = libtcmalloc_minimal_debug.la $(PTHREAD_LIBS)
 
+if !MINGW
+if !OSX
 TESTS += memalign_debug_unittest
 memalign_debug_unittest_SOURCES = $(memalign_unittest_SOURCES)
 memalign_debug_unittest_CXXFLAGS = $(memalign_unittest_CXXFLAGS)
 memalign_debug_unittest_LDFLAGS = $(memalign_unittest_LDFLAGS)
 memalign_debug_unittest_LDADD = libtcmalloc_minimal_debug.la $(PTHREAD_LIBS)
+endif !OSX
+endif !MINGW
 
 TESTS += realloc_debug_unittest
 realloc_debug_unittest_SOURCES = $(realloc_unittest_SOURCES)
 realloc_debug_unittest_CXXFLAGS = $(realloc_unittest_CXXFLAGS)
 realloc_debug_unittest_LDFLAGS = $(realloc_unittest_LDFLAGS)
 realloc_debug_unittest_LDADD = libtcmalloc_minimal_debug.la $(PTHREAD_LIBS)
 
 # debugallocation_test checks that we print a proper stacktrace when
 # debug-allocs fail, so we can't run it if we don't have stacktrace info.
 if WITH_STACK_TRACE
@@ skipping 100 matching lines @@
 # 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
 # implementations define their own malloc, and we need to go on the
 # first linkline to make sure our malloc 'wins'.
 tcmalloc_unittest_LDADD = $(LIBTCMALLOC) liblogging.la $(PTHREAD_LIBS)
 
 # This makes sure it's safe to link in both tcmalloc and
 # tcmalloc_minimal.  (One would never do this on purpose, but perhaps
 # by accident...)  When we can compile libprofiler, we also link it in
-# to make sure that works too.
-
-TESTS += tcmalloc_both_unittest
-tcmalloc_both_unittest_SOURCES = src/tests/tcmalloc_unittest.cc \
-                                 src/tests/testutil.h src/tests/testutil.cc \
-                                 $(TCMALLOC_UNITTEST_INCLUDES)
-tcmalloc_both_unittest_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
-tcmalloc_both_unittest_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
+# to make sure that works too.  NOTE: On OS X, it's *not* safe to
+# link both in (we end up with two copies of every global var, and
+# the code tends to pick one arbitrarily), so don't run the test there.
+# (We define these outside the 'if' because they're reused below.)
+tcmalloc_both_unittest_srcs = src/tests/tcmalloc_unittest.cc \
+                              src/tests/testutil.h src/tests/testutil.cc \
+                              $(TCMALLOC_UNITTEST_INCLUDES)
+tcmalloc_both_unittest_cflags = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
+tcmalloc_both_unittest_lflags = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 if WITH_CPU_PROFILER
 # 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
 # implementations define their own malloc, and we need to go on the
 # first linkline to make sure our malloc 'wins'.
-tcmalloc_both_unittest_LDADD = $(LIBTCMALLOC) $(LIBTCMALLOC_MINIMAL) \
-                               libprofiler.la liblogging.la $(PTHREAD_LIBS)
+tcmalloc_both_unittest_ladd = $(LIBTCMALLOC) $(LIBTCMALLOC_MINIMAL) \
+                              libprofiler.la liblogging.la $(PTHREAD_LIBS)
 else
-tcmalloc_both_unittest_LDADD = $(LIBTCMALLOC) $(LIBTCMALLOC_MINIMAL) \
-                               liblogging.la $(PTHREAD_LIBS)
+tcmalloc_both_unittest_ladd = $(LIBTCMALLOC) $(LIBTCMALLOC_MINIMAL) \
+                              liblogging.la $(PTHREAD_LIBS)
 endif !WITH_CPU_PROFILER
+if !OSX
+TESTS += tcmalloc_both_unittest
+tcmalloc_both_unittest_SOURCES = $(tcmalloc_both_unittest_srcs)
+tcmalloc_both_unittest_CXXFLAGS = $(tcmalloc_both_unittest_cflags)
+tcmalloc_both_unittest_LDFLAGS = $(tcmalloc_both_unittest_lflags)
+tcmalloc_both_unittest_LDADD = $(tcmalloc_both_unittest_ladd)
+endif !OSX
 
 TESTS += tcmalloc_large_unittest
 tcmalloc_large_unittest_SOURCES = src/tests/tcmalloc_large_unittest.cc
 tcmalloc_large_unittest_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
 tcmalloc_large_unittest_LDFLAGS = $(PTHREAD_CFLAGS) $(TCMALLOC_FLAGS)
 tcmalloc_large_unittest_LDADD = $(LIBTCMALLOC) $(PTHREAD_LIBS)
 
 TESTS += raw_printer_test
 raw_printer_test_SOURCES = src/tests/raw_printer_test.cc
 raw_printer_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(AM_CXXFLAGS)
@@ skipping 327 matching lines @@
 # about .so versioning.  I just give the libtcmalloc version number.
 # TODO(csilvers): use -export-symbols-regex?
 libtcmalloc_and_profiler_la_LDFLAGS = $(PTHREAD_CFLAGS) \
                                       -version-info @TCMALLOC_SO_VERSION@
 # We don't include libprofiler_la_LIBADD here because all it adds is
 # libstacktrace.la, which we already get via libtcmalloc.  Trying to
 # specify it twice causes link-time duplicate-definition errors. :-(
 libtcmalloc_and_profiler_la_LIBADD = $(libtcmalloc_la_LIBADD)
 
 TESTS += tcmalloc_and_profiler_unittest
-tcmalloc_and_profiler_unittest_SOURCES = $(tcmalloc_both_unittest_SOURCES)
-tcmalloc_and_profiler_unittest_CXXFLAGS = $(tcmalloc_both_unittest_CXXFLAGS)
-tcmalloc_and_profiler_unittest_LDFLAGS = $(tcmalloc_both_unittest_LDFLAGS)
+tcmalloc_and_profiler_unittest_SOURCES = $(tcmalloc_both_unittest_srcs)
+tcmalloc_and_profiler_unittest_CXXFLAGS = $(tcmalloc_both_unittest_cflags)
+tcmalloc_and_profiler_unittest_LDFLAGS = $(tcmalloc_both_unittest_lflags)
 tcmalloc_and_profiler_unittest_LDADD = libtcmalloc_and_profiler.la
 
 LIBS_TO_WEAKEN += libtcmalloc_and_profiler.la
 
 endif WITH_CPU_PROFILER
 endif WITH_HEAP_PROFILER_OR_CHECKER
 
 ## ^^^^ END OF RULES TO MAKE YOUR LIBRARIES, BINARIES, AND UNITTESTS
 
 
@@ skipping 25 matching lines @@
 # try to rewrite exec_prefix, libdir, and includedir in terms of
 # prefix, if possible.
 libtcmalloc.pc: Makefile packages/rpm/rpm.spec
         echo 'prefix=$(prefix)' > "$@".tmp
         echo 'exec_prefix='`echo '$(exec_prefix)' | sed 's@^$(prefix)@$${prefix}@'` >> "$@".tmp
         echo 'libdir='`echo '$(libdir)' | sed 's@^$(exec_prefix)@$${exec_prefix}@'` >> "$@".tmp
         echo 'includedir='`echo '$(includedir)' | sed 's@^$(prefix)@$${prefix}@'` >> "$@".tmp
         echo '' >> "$@".tmp
         echo 'Name: $(PACKAGE)' >> "$@".tmp
         echo 'Version: $(VERSION)' >> "$@".tmp
-        -grep '^Summary:' packages/rpm/rpm.spec | sed s/^Summary:/Description:/ | head -n1 >> "$@".tmp
-        -grep '^URL: ' packages/rpm/rpm.spec >> "$@".tmp
+        -grep '^Summary:' $(top_srcdir)/packages/rpm/rpm.spec | sed s/^Summary:/Description:/ | head -n1 >> "$@".tmp
+        -grep '^URL: ' $(top_srcdir)/packages/rpm/rpm.spec >> "$@".tmp
         echo 'Requires:' >> "$@".tmp
         echo 'Libs: -L$${libdir} -ltcmalloc' >> "$@".tmp
         echo 'Libs.private: $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)' >> "$@".tmp
         echo 'Cflags: -I$${includedir}' >> "$@".tmp
         mv -f "$@".tmp "$@"
 
 # The other versions are mostly the same.
 libtcmalloc_minimal.pc: libtcmalloc.pc
         cat libtcmalloc.pc | sed s/-ltcmalloc/-ltcmalloc_minimal/ > "$@"
 
@@ skipping 13 matching lines @@
 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/google/tcmalloc.h \
              $(WINDOWS_PROJECTS) \
              src/solaris/libstdc++.la