Date: Sun, 8 Jan 2012 16:30:09 GMT From: Shane Ambler <FreeBSD@Shaneware.biz> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/163921: Fix warnings at the beginning of www/chromium build Message-ID: <201201081630.q08GU9cA042044@red.freebsd.org> Resent-Message-ID: <201201081640.q08Ge7hp086758@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163921 >Category: ports >Synopsis: Fix warnings at the beginning of www/chromium build >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jan 08 16:40:07 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Shane Ambler >Release: PCBSD - 9.0RC3-p1 amd64 >Organization: >Environment: FreeBSD leader 9.0-RC3 FreeBSD 9.0-RC3 #2: Mon Dec 5 15:02:57 PST 2011 root@build9x64.pcbsd.org:/usr/obj/builds/amd64/pcbsd-build90/fbsd-source/9.0/sys/GENERIC amd64 >Description: At the start of building www/chromium the following warnings appear - WARNING: allocator uses invalid type 'settings'. Please fix the source gyp file to use type 'none'. See http://code.google.com/p/chromium/issues/detail?id=96629 . WARNING: libjpeg uses invalid type 'settings'. Please fix the source gyp file to use type 'none'. See http://code.google.com/p/chromium/issues/detail?id=96629 . WARNING: libevent uses invalid type 'settings'. Please fix the source gyp file to use type 'none'. See http://code.google.com/p/chromium/issues/detail?id=96629 . The attached patch (2 existing patches adjusted - 1 added) removes the warnings >How-To-Repeat: >Fix: Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # files/patch-third_party__libevent__libevent.gyp # files/patch-third_party__libjpeg_turbo__libjpeg.gyp # files/patch-base__allocator__allocator.gyp # echo x - files/patch-third_party__libevent__libevent.gyp sed 's/^X//' >files/patch-third_party__libevent__libevent.gyp << '96a4390af0710eb61bb105a657e1559e' X--- third_party/libevent/libevent.gyp.orig X+++ third_party/libevent/libevent.gyp X@@ -73,7 +73,7 @@ X 'targets': [ X { X 'target_name': 'libevent', X- 'type': 'settings', X+ 'type': 'none', X 'toolsets': ['host', 'target'], X 'direct_dependent_settings': { X 'defines': [ X 96a4390af0710eb61bb105a657e1559e echo x - files/patch-third_party__libjpeg_turbo__libjpeg.gyp sed 's/^X//' >files/patch-third_party__libjpeg_turbo__libjpeg.gyp << '6d0b7b5b6b500972f04c3f3e24e545f2' X--- third_party/libjpeg_turbo/libjpeg.gyp.orig X+++ third_party/libjpeg_turbo/libjpeg.gyp X@@ -273,11 +273,14 @@ X 'targets': [ X { X 'target_name': 'libjpeg', X- 'type': 'settings', X+ 'type': 'none', X 'direct_dependent_settings': { X 'defines': [ X 'USE_SYSTEM_LIBJPEG', X ], X+ 'include_dirs': [ X+ '<(prefix_dir)/include', X+ ], X }, X 'link_settings': { X 'libraries': [ X 6d0b7b5b6b500972f04c3f3e24e545f2 echo x - files/patch-base__allocator__allocator.gyp sed 's/^X//' >files/patch-base__allocator__allocator.gyp << 'c968cbadee7a9c776ea9f1a03e2780ca' X--- base/allocator/allocator.gyp.orig 2011-11-28 21:53:42.000000000 +0200 X+++ base/allocator/allocator.gyp 2011-11-28 22:01:26.000000000 +0200 X@@ -7,326 +7,198 @@ X 'jemalloc_dir': '../../third_party/jemalloc/chromium', X 'tcmalloc_dir': '../../third_party/tcmalloc/chromium', X }, X- 'targets': [ X- { X- 'target_name': 'allocator', X- 'type': 'static_library', X- 'include_dirs': [ X- '.', X- '<(tcmalloc_dir)/src/base', X- '<(tcmalloc_dir)/src', X- '../..', X- ], X- 'direct_dependent_settings': { X- 'configurations': { X- 'Common_Base': { X- 'msvs_settings': { X- 'VCLinkerTool': { X- 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], X- 'AdditionalDependencies': [ X- '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib' X- ], X- }, X- }, X- }, X- }, X- 'conditions': [ X- ['OS=="win"', { X+ 'conditions': [ X+ ['use_system_tcmalloc == 1', { X+ 'targets': [ X+ { X+ 'target_name': 'allocator', X+ 'type': 'none', X+ 'direct_dependent_settings': { X 'defines': [ X- ['PERFTOOLS_DLL_DECL', ''] X+ 'USE_SYSTEM_TCMALLOC', X+ ], X+ }, X+ 'link_settings': { X+ 'ldflags': [ X+ '<!@(pkg-config libtcmalloc --libs-only-L)', X+ ], X+ 'libraries': [ X+ '<!@(pkg-config libtcmalloc --libs-only-l)', X ], X- }], X- ], X- }, X- 'sources': [ X- # Generated for our configuration from tcmalloc's build X- # and checked in. X- '<(tcmalloc_dir)/src/config.h', X- '<(tcmalloc_dir)/src/config_linux.h', X- '<(tcmalloc_dir)/src/config_win.h', X- X- # all tcmalloc native and forked files X- '<(tcmalloc_dir)/src/addressmap-inl.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', X- '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-arm-gcc.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc', X- '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', X- '<(tcmalloc_dir)/src/base/atomicops.h', X- '<(tcmalloc_dir)/src/base/basictypes.h', X- '<(tcmalloc_dir)/src/base/commandlineflags.h', X- '<(tcmalloc_dir)/src/base/cycleclock.h', X- # We don't list dynamic_annotations.c since its copy is already X- # present in the dynamic_annotations target. X- '<(tcmalloc_dir)/src/base/dynamic_annotations.h', X- '<(tcmalloc_dir)/src/base/elfcore.h', X- '<(tcmalloc_dir)/src/base/googleinit.h', X- '<(tcmalloc_dir)/src/base/linux_syscall_support.h', X- '<(tcmalloc_dir)/src/base/linuxthreads.cc', X- '<(tcmalloc_dir)/src/base/linuxthreads.h', X- '<(tcmalloc_dir)/src/base/logging.cc', X- '<(tcmalloc_dir)/src/base/logging.h', X- '<(tcmalloc_dir)/src/base/low_level_alloc.cc', X- '<(tcmalloc_dir)/src/base/low_level_alloc.h', X- '<(tcmalloc_dir)/src/base/simple_mutex.h', X- '<(tcmalloc_dir)/src/base/spinlock.cc', X- '<(tcmalloc_dir)/src/base/spinlock.h', X- '<(tcmalloc_dir)/src/base/spinlock_internal.cc', X- '<(tcmalloc_dir)/src/base/spinlock_internal.h', X- '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h', X- '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', X- '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', X- '<(tcmalloc_dir)/src/base/stl_allocator.h', X- '<(tcmalloc_dir)/src/base/synchronization_profiling.h', X- '<(tcmalloc_dir)/src/base/sysinfo.cc', X- '<(tcmalloc_dir)/src/base/sysinfo.h', X- '<(tcmalloc_dir)/src/base/thread_annotations.h', X- '<(tcmalloc_dir)/src/base/thread_lister.c', X- '<(tcmalloc_dir)/src/base/thread_lister.h', X- '<(tcmalloc_dir)/src/base/vdso_support.cc', X- '<(tcmalloc_dir)/src/base/vdso_support.h', X- '<(tcmalloc_dir)/src/central_freelist.cc', X- '<(tcmalloc_dir)/src/central_freelist.h', X- '<(tcmalloc_dir)/src/common.cc', X- '<(tcmalloc_dir)/src/common.h', X- '<(tcmalloc_dir)/src/debugallocation.cc', X- '<(tcmalloc_dir)/src/free_list.cc', X- '<(tcmalloc_dir)/src/free_list.h', X- '<(tcmalloc_dir)/src/getpc.h', X- '<(tcmalloc_dir)/src/google/heap-checker.h', X- '<(tcmalloc_dir)/src/google/heap-profiler.h', X- '<(tcmalloc_dir)/src/google/malloc_extension.h', X- '<(tcmalloc_dir)/src/google/malloc_extension_c.h', X- '<(tcmalloc_dir)/src/google/malloc_hook.h', X- '<(tcmalloc_dir)/src/google/malloc_hook_c.h', X- '<(tcmalloc_dir)/src/google/profiler.h', X- '<(tcmalloc_dir)/src/google/stacktrace.h', X- '<(tcmalloc_dir)/src/google/tcmalloc.h', X- '<(tcmalloc_dir)/src/heap-checker-bcad.cc', X- '<(tcmalloc_dir)/src/heap-checker.cc', X- '<(tcmalloc_dir)/src/heap-profile-table.cc', X- '<(tcmalloc_dir)/src/heap-profile-table.h', X- '<(tcmalloc_dir)/src/heap-profiler.cc', X- '<(tcmalloc_dir)/src/internal_logging.cc', X- '<(tcmalloc_dir)/src/internal_logging.h', X- '<(tcmalloc_dir)/src/linked_list.h', X- '<(tcmalloc_dir)/src/malloc_extension.cc', X- '<(tcmalloc_dir)/src/malloc_hook-inl.h', X- '<(tcmalloc_dir)/src/malloc_hook.cc', X- '<(tcmalloc_dir)/src/maybe_threads.cc', X- '<(tcmalloc_dir)/src/maybe_threads.h', X- '<(tcmalloc_dir)/src/memfs_malloc.cc', X- '<(tcmalloc_dir)/src/memory_region_map.cc', X- '<(tcmalloc_dir)/src/memory_region_map.h', X- '<(tcmalloc_dir)/src/packed-cache-inl.h', X- '<(tcmalloc_dir)/src/page_heap.cc', X- '<(tcmalloc_dir)/src/page_heap.h', X- '<(tcmalloc_dir)/src/page_heap_allocator.h', X- '<(tcmalloc_dir)/src/pagemap.h', X- '<(tcmalloc_dir)/src/profile-handler.cc', X- '<(tcmalloc_dir)/src/profile-handler.h', X- '<(tcmalloc_dir)/src/profiledata.cc', X- '<(tcmalloc_dir)/src/profiledata.h', X- '<(tcmalloc_dir)/src/profiler.cc', X- '<(tcmalloc_dir)/src/raw_printer.cc', X- '<(tcmalloc_dir)/src/raw_printer.h', X- '<(tcmalloc_dir)/src/sampler.cc', X- '<(tcmalloc_dir)/src/sampler.h', X- '<(tcmalloc_dir)/src/span.cc', X- '<(tcmalloc_dir)/src/span.h', X- '<(tcmalloc_dir)/src/stack_trace_table.cc', X- '<(tcmalloc_dir)/src/stack_trace_table.h', X- '<(tcmalloc_dir)/src/stacktrace.cc', X- '<(tcmalloc_dir)/src/stacktrace_config.h', X- '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_powerpc-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_with_context.cc', X- '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', X- '<(tcmalloc_dir)/src/static_vars.cc', X- '<(tcmalloc_dir)/src/static_vars.h', X- '<(tcmalloc_dir)/src/symbolize.cc', X- '<(tcmalloc_dir)/src/symbolize.h', X- '<(tcmalloc_dir)/src/system-alloc.cc', X- '<(tcmalloc_dir)/src/system-alloc.h', X- '<(tcmalloc_dir)/src/tcmalloc.cc', X- '<(tcmalloc_dir)/src/tcmalloc_guard.h', X- '<(tcmalloc_dir)/src/thread_cache.cc', X- '<(tcmalloc_dir)/src/thread_cache.h', X- '<(tcmalloc_dir)/src/windows/config.h', X- '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', X- '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', X- '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', X- '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', X- '<(tcmalloc_dir)/src/windows/mingw.h', X- '<(tcmalloc_dir)/src/windows/mini_disassembler.cc', X- '<(tcmalloc_dir)/src/windows/mini_disassembler.h', X- '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h', X- '<(tcmalloc_dir)/src/windows/override_functions.cc', X- '<(tcmalloc_dir)/src/windows/patch_functions.cc', X- '<(tcmalloc_dir)/src/windows/port.cc', X- '<(tcmalloc_dir)/src/windows/port.h', X- '<(tcmalloc_dir)/src/windows/preamble_patcher.cc', X- '<(tcmalloc_dir)/src/windows/preamble_patcher.h', X- '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', X- X- # jemalloc files X- '<(jemalloc_dir)/jemalloc.c', X- '<(jemalloc_dir)/jemalloc.h', X- '<(jemalloc_dir)/ql.h', X- '<(jemalloc_dir)/qr.h', X- '<(jemalloc_dir)/rb.h', X- X- 'allocator_shim.cc', X- 'allocator_shim.h', X- 'generic_allocators.cc', X- 'win_allocator.cc', X- ], X- # sources! means that these are not compiled directly. X- 'sources!': [ X- # Included by allocator_shim.cc for maximal inlining. X- 'generic_allocators.cc', X- 'win_allocator.cc', X- X- # We simply don't use these, but list them above so that IDE X- # users can view the full available source for reference, etc. X- '<(tcmalloc_dir)/src/addressmap-inl.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h', X- '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc', X- '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', X- '<(tcmalloc_dir)/src/base/atomicops.h', X- '<(tcmalloc_dir)/src/base/basictypes.h', X- '<(tcmalloc_dir)/src/base/commandlineflags.h', X- '<(tcmalloc_dir)/src/base/cycleclock.h', X- '<(tcmalloc_dir)/src/base/elfcore.h', X- '<(tcmalloc_dir)/src/base/googleinit.h', X- '<(tcmalloc_dir)/src/base/linux_syscall_support.h', X- '<(tcmalloc_dir)/src/base/simple_mutex.h', X- '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h', X- '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', X- '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', X- '<(tcmalloc_dir)/src/base/stl_allocator.h', X- '<(tcmalloc_dir)/src/base/thread_annotations.h', X- '<(tcmalloc_dir)/src/getpc.h', X- '<(tcmalloc_dir)/src/google/heap-checker.h', X- '<(tcmalloc_dir)/src/google/heap-profiler.h', X- '<(tcmalloc_dir)/src/google/malloc_extension_c.h', X- '<(tcmalloc_dir)/src/google/malloc_hook.h', X- '<(tcmalloc_dir)/src/google/malloc_hook_c.h', X- '<(tcmalloc_dir)/src/google/profiler.h', X- '<(tcmalloc_dir)/src/google/stacktrace.h', X- '<(tcmalloc_dir)/src/memfs_malloc.cc', X- '<(tcmalloc_dir)/src/packed-cache-inl.h', X- '<(tcmalloc_dir)/src/page_heap_allocator.h', X- '<(tcmalloc_dir)/src/pagemap.h', X- '<(tcmalloc_dir)/src/stacktrace_config.h', X- '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_powerpc-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_with_context.cc', X- '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', X- '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', X- '<(tcmalloc_dir)/src/tcmalloc_guard.h', X- '<(tcmalloc_dir)/src/windows/config.h', X- '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', X- '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', X- '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', X- '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', X- '<(tcmalloc_dir)/src/windows/mingw.h', X- '<(tcmalloc_dir)/src/windows/mini_disassembler.cc', X- '<(tcmalloc_dir)/src/windows/mini_disassembler.h', X- '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h', X- '<(tcmalloc_dir)/src/windows/override_functions.cc', X- '<(tcmalloc_dir)/src/windows/patch_functions.cc', X- '<(tcmalloc_dir)/src/windows/preamble_patcher.cc', X- '<(tcmalloc_dir)/src/windows/preamble_patcher.h', X- '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', X- ], X- 'dependencies': [ X- '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', X- ], X- 'msvs_settings': { X- # TODO(sgk): merge this with build/common.gypi settings X- 'VCLibrarianTool': { X- 'AdditionalOptions': ['/ignore:4006,4221'], X- 'AdditionalLibraryDirectories': X- ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], X- }, X- 'VCLinkerTool': { X- 'AdditionalOptions': ['/ignore:4006'], X- }, X- }, X- 'configurations': { X- 'Debug_Base': { X- 'msvs_settings': { X- 'VCCLCompilerTool': { X- 'RuntimeLibrary': '0', X- }, X }, X }, X- }, X- 'conditions': [ X- ['OS=="win"', { X- 'defines': [ X- ['PERFTOOLS_DLL_DECL', ''] X- ], X- 'dependencies': [ X- 'libcmt', X- ], X+ ], X+ }, { X+ 'targets': [ X+ { X+ 'target_name': 'allocator', X+ 'type': 'static_library', X 'include_dirs': [ X- '<(tcmalloc_dir)/src/windows', X- ], X- 'sources!': [ X+ '.', X+ '<(tcmalloc_dir)/src/base', X+ '<(tcmalloc_dir)/src', X+ '../..', X+ ], X+ 'direct_dependent_settings': { X+ 'configurations': { X+ 'Common_Base': { X+ 'msvs_settings': { X+ 'VCLinkerTool': { X+ 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'], X+ 'AdditionalDependencies': [ X+ '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib' X+ ], X+ }, X+ }, X+ }, X+ }, X+ 'conditions': [ X+ ['OS=="win"', { X+ 'defines': [ X+ ['PERFTOOLS_DLL_DECL', ''] X+ ], X+ }], X+ ], X+ }, X+ 'sources': [ X+ # Generated for our configuration from tcmalloc's build X+ # and checked in. X+ '<(tcmalloc_dir)/src/config.h', X+ '<(tcmalloc_dir)/src/config_linux.h', X+ '<(tcmalloc_dir)/src/config_win.h', X+ '<(tcmalloc_dir)/src/config_freebsd.h', X+ X+ # all tcmalloc native and forked files X+ '<(tcmalloc_dir)/src/addressmap-inl.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', X+ '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-gcc.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', X+ '<(tcmalloc_dir)/src/base/atomicops.h', X+ '<(tcmalloc_dir)/src/base/basictypes.h', X+ '<(tcmalloc_dir)/src/base/commandlineflags.h', X+ '<(tcmalloc_dir)/src/base/cycleclock.h', X+ # We don't list dynamic_annotations.c since its copy is already X+ # present in the dynamic_annotations target. X+ '<(tcmalloc_dir)/src/base/dynamic_annotations.h', X+ '<(tcmalloc_dir)/src/base/elfcore.h', X+ '<(tcmalloc_dir)/src/base/googleinit.h', X+ '<(tcmalloc_dir)/src/base/linux_syscall_support.h', X '<(tcmalloc_dir)/src/base/linuxthreads.cc', X '<(tcmalloc_dir)/src/base/linuxthreads.h', X- '<(tcmalloc_dir)/src/base/vdso_support.cc', X- '<(tcmalloc_dir)/src/base/vdso_support.h', X- '<(tcmalloc_dir)/src/maybe_threads.cc', X- '<(tcmalloc_dir)/src/maybe_threads.h', X- '<(tcmalloc_dir)/src/symbolize.h', X- '<(tcmalloc_dir)/src/system-alloc.cc', X- '<(tcmalloc_dir)/src/system-alloc.h', X- X- # included by allocator_shim.cc X- '<(tcmalloc_dir)/src/tcmalloc.cc', X- X- # heap-profiler/checker/cpuprofiler X+ '<(tcmalloc_dir)/src/base/logging.cc', X+ '<(tcmalloc_dir)/src/base/logging.h', X+ '<(tcmalloc_dir)/src/base/low_level_alloc.cc', X+ '<(tcmalloc_dir)/src/base/low_level_alloc.h', X+ '<(tcmalloc_dir)/src/base/simple_mutex.h', X+ '<(tcmalloc_dir)/src/base/spinlock.cc', X+ '<(tcmalloc_dir)/src/base/spinlock.h', X+ '<(tcmalloc_dir)/src/base/spinlock_internal.cc', X+ '<(tcmalloc_dir)/src/base/spinlock_internal.h', X+ '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h', X+ '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', X+ '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', X+ '<(tcmalloc_dir)/src/base/stl_allocator.h', X+ '<(tcmalloc_dir)/src/base/synchronization_profiling.h', X+ '<(tcmalloc_dir)/src/base/sysinfo.cc', X+ '<(tcmalloc_dir)/src/base/sysinfo.h', X+ '<(tcmalloc_dir)/src/base/thread_annotations.h', X '<(tcmalloc_dir)/src/base/thread_lister.c', X '<(tcmalloc_dir)/src/base/thread_lister.h', X+ '<(tcmalloc_dir)/src/base/vdso_support.cc', X+ '<(tcmalloc_dir)/src/base/vdso_support.h', X+ '<(tcmalloc_dir)/src/central_freelist.cc', X+ '<(tcmalloc_dir)/src/central_freelist.h', X+ '<(tcmalloc_dir)/src/common.cc', X+ '<(tcmalloc_dir)/src/common.h', X+ '<(tcmalloc_dir)/src/debugallocation.cc', X+ '<(tcmalloc_dir)/src/free_list.cc', X+ '<(tcmalloc_dir)/src/free_list.h', X+ '<(tcmalloc_dir)/src/getpc.h', X+ '<(tcmalloc_dir)/src/google/heap-checker.h', X+ '<(tcmalloc_dir)/src/google/heap-profiler.h', X+ '<(tcmalloc_dir)/src/google/malloc_extension.h', X+ '<(tcmalloc_dir)/src/google/malloc_extension_c.h', X+ '<(tcmalloc_dir)/src/google/malloc_hook.h', X+ '<(tcmalloc_dir)/src/google/malloc_hook_c.h', X+ '<(tcmalloc_dir)/src/google/profiler.h', X+ '<(tcmalloc_dir)/src/google/stacktrace.h', X+ '<(tcmalloc_dir)/src/google/tcmalloc.h', X '<(tcmalloc_dir)/src/heap-checker-bcad.cc', X '<(tcmalloc_dir)/src/heap-checker.cc', X+ '<(tcmalloc_dir)/src/heap-profile-table.cc', X+ '<(tcmalloc_dir)/src/heap-profile-table.h', X '<(tcmalloc_dir)/src/heap-profiler.cc', X+ '<(tcmalloc_dir)/src/internal_logging.cc', X+ '<(tcmalloc_dir)/src/internal_logging.h', X+ '<(tcmalloc_dir)/src/linked_list.h', X+ '<(tcmalloc_dir)/src/malloc_extension.cc', X+ '<(tcmalloc_dir)/src/malloc_hook-inl.h', X+ '<(tcmalloc_dir)/src/malloc_hook.cc', X+ '<(tcmalloc_dir)/src/maybe_threads.cc', X+ '<(tcmalloc_dir)/src/maybe_threads.h', X+ '<(tcmalloc_dir)/src/memfs_malloc.cc', X '<(tcmalloc_dir)/src/memory_region_map.cc', X '<(tcmalloc_dir)/src/memory_region_map.h', X- '<(tcmalloc_dir)/src/profiledata.cc', X- '<(tcmalloc_dir)/src/profiledata.h', X+ '<(tcmalloc_dir)/src/packed-cache-inl.h', X+ '<(tcmalloc_dir)/src/page_heap.cc', X+ '<(tcmalloc_dir)/src/page_heap.h', X+ '<(tcmalloc_dir)/src/page_heap_allocator.h', X+ '<(tcmalloc_dir)/src/pagemap.h', X '<(tcmalloc_dir)/src/profile-handler.cc', X '<(tcmalloc_dir)/src/profile-handler.h', X+ '<(tcmalloc_dir)/src/profiledata.cc', X+ '<(tcmalloc_dir)/src/profiledata.h', X '<(tcmalloc_dir)/src/profiler.cc', X- X- # debugallocation X- '<(tcmalloc_dir)/src/debugallocation.cc', X- ], X- }], X- ['OS=="linux" or OS=="freebsd" or OS=="solaris"', { X- 'sources!': [ X+ '<(tcmalloc_dir)/src/raw_printer.cc', X+ '<(tcmalloc_dir)/src/raw_printer.h', X+ '<(tcmalloc_dir)/src/sampler.cc', X+ '<(tcmalloc_dir)/src/sampler.h', X+ '<(tcmalloc_dir)/src/span.cc', X+ '<(tcmalloc_dir)/src/span.h', X+ '<(tcmalloc_dir)/src/stack_trace_table.cc', X+ '<(tcmalloc_dir)/src/stack_trace_table.h', X+ '<(tcmalloc_dir)/src/stacktrace.cc', X+ '<(tcmalloc_dir)/src/stacktrace_config.h', X+ '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_powerpc-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_with_context.cc', X+ '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', X+ '<(tcmalloc_dir)/src/static_vars.cc', X+ '<(tcmalloc_dir)/src/static_vars.h', X+ '<(tcmalloc_dir)/src/symbolize.cc', X+ '<(tcmalloc_dir)/src/symbolize.h', X+ '<(tcmalloc_dir)/src/system-alloc.cc', X '<(tcmalloc_dir)/src/system-alloc.h', X+ '<(tcmalloc_dir)/src/tcmalloc.cc', X+ '<(tcmalloc_dir)/src/tcmalloc_guard.h', X+ '<(tcmalloc_dir)/src/thread_cache.cc', X+ '<(tcmalloc_dir)/src/thread_cache.h', X+ '<(tcmalloc_dir)/src/windows/config.h', X+ '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', X+ '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', X+ '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', X+ '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', X+ '<(tcmalloc_dir)/src/windows/mingw.h', X+ '<(tcmalloc_dir)/src/windows/mini_disassembler.cc', X+ '<(tcmalloc_dir)/src/windows/mini_disassembler.h', X+ '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h', X+ '<(tcmalloc_dir)/src/windows/override_functions.cc', X+ '<(tcmalloc_dir)/src/windows/patch_functions.cc', X '<(tcmalloc_dir)/src/windows/port.cc', X '<(tcmalloc_dir)/src/windows/port.h', X+ '<(tcmalloc_dir)/src/windows/preamble_patcher.cc', X+ '<(tcmalloc_dir)/src/windows/preamble_patcher.h', X+ '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', X X- # TODO(willchan): Support allocator shim later on. X- 'allocator_shim.cc', X- X- # TODO(willchan): support jemalloc on other platforms X # jemalloc files X '<(jemalloc_dir)/jemalloc.c', X '<(jemalloc_dir)/jemalloc.h', X@@ -334,85 +206,236 @@ X '<(jemalloc_dir)/qr.h', X '<(jemalloc_dir)/rb.h', X X+ 'allocator_shim.cc', X+ 'allocator_shim.h', X+ 'generic_allocators.cc', X+ 'win_allocator.cc', X ], X- # We enable all warnings by default, but upstream disables a few. X- # Keep "-Wno-*" flags in sync with upstream by comparing against: X- # http://code.google.com/p/google-perftools/source/browse/trunk/Makefile.am X- 'cflags': [ X- '-Wno-sign-compare', X- '-Wno-unused-result', X- ], X- 'cflags!': [ X- '-fvisibility=hidden', X- ], X- 'link_settings': { X- 'ldflags': [ X- # Don't let linker rip this symbol out, otherwise the heap&cpu X- # profilers will not initialize properly on startup. X- '-Wl,-uIsHeapProfilerRunning,-uProfilerStart', X- # Do the same for heap leak checker. X- '-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi', X- '-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl', X- '-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv', X- ]}, X- }], X- [ 'linux_use_debugallocation==1', { X+ # sources! means that these are not compiled directly. X 'sources!': [ X- # debugallocation.cc #includes tcmalloc.cc, X- # so only one of them should be used. X- '<(tcmalloc_dir)/src/tcmalloc.cc', X- ], X- 'cflags': [ X- '-DTCMALLOC_FOR_DEBUGALLOCATION', X+ # Included by allocator_shim.cc for maximal inlining. X+ 'generic_allocators.cc', X+ 'win_allocator.cc', X+ X+ # We simply don't use these, but list them above so that IDE X+ # users can view the full available source for reference, etc. X+ '<(tcmalloc_dir)/src/addressmap-inl.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc', X+ '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', X+ '<(tcmalloc_dir)/src/base/atomicops.h', X+ '<(tcmalloc_dir)/src/base/basictypes.h', X+ '<(tcmalloc_dir)/src/base/commandlineflags.h', X+ '<(tcmalloc_dir)/src/base/cycleclock.h', X+ '<(tcmalloc_dir)/src/base/elfcore.h', X+ '<(tcmalloc_dir)/src/base/googleinit.h', X+ '<(tcmalloc_dir)/src/base/linux_syscall_support.h', X+ '<(tcmalloc_dir)/src/base/simple_mutex.h', X+ '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h', X+ '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', X+ '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', X+ '<(tcmalloc_dir)/src/base/stl_allocator.h', X+ '<(tcmalloc_dir)/src/base/thread_annotations.h', X+ '<(tcmalloc_dir)/src/getpc.h', X+ '<(tcmalloc_dir)/src/google/heap-checker.h', X+ '<(tcmalloc_dir)/src/google/heap-profiler.h', X+ '<(tcmalloc_dir)/src/google/malloc_extension_c.h', X+ '<(tcmalloc_dir)/src/google/malloc_hook.h', X+ '<(tcmalloc_dir)/src/google/malloc_hook_c.h', X+ '<(tcmalloc_dir)/src/google/profiler.h', X+ '<(tcmalloc_dir)/src/google/stacktrace.h', X+ '<(tcmalloc_dir)/src/memfs_malloc.cc', X+ '<(tcmalloc_dir)/src/packed-cache-inl.h', X+ '<(tcmalloc_dir)/src/page_heap_allocator.h', X+ '<(tcmalloc_dir)/src/pagemap.h', X+ '<(tcmalloc_dir)/src/stacktrace_config.h', X+ '<(tcmalloc_dir)/src/stacktrace_generic-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_powerpc-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_win32-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_with_context.cc', X+ '<(tcmalloc_dir)/src/stacktrace_x86-inl.h', X+ '<(tcmalloc_dir)/src/stacktrace_x86_64-inl.h', X+ '<(tcmalloc_dir)/src/tcmalloc_guard.h', X+ '<(tcmalloc_dir)/src/windows/config.h', X+ '<(tcmalloc_dir)/src/windows/google/tcmalloc.h', X+ '<(tcmalloc_dir)/src/windows/get_mangled_names.cc', X+ '<(tcmalloc_dir)/src/windows/ia32_modrm_map.cc', X+ '<(tcmalloc_dir)/src/windows/ia32_opcode_map.cc', X+ '<(tcmalloc_dir)/src/windows/mingw.h', X+ '<(tcmalloc_dir)/src/windows/mini_disassembler.cc', X+ '<(tcmalloc_dir)/src/windows/mini_disassembler.h', X+ '<(tcmalloc_dir)/src/windows/mini_disassembler_types.h', X+ '<(tcmalloc_dir)/src/windows/override_functions.cc', X+ '<(tcmalloc_dir)/src/windows/patch_functions.cc', X+ '<(tcmalloc_dir)/src/windows/preamble_patcher.cc', X+ '<(tcmalloc_dir)/src/windows/preamble_patcher.h', X+ '<(tcmalloc_dir)/src/windows/preamble_patcher_with_stub.cc', X ], X- }, { # linux_use_debugallocation != 1 X- 'sources!': [ X- '<(tcmalloc_dir)/src/debugallocation.cc', X+ 'dependencies': [ X+ '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', X ], X- }], X- [ 'linux_keep_shadow_stacks==1', { X- 'sources': [ X- '<(tcmalloc_dir)/src/linux_shadow_stacks.cc', X- '<(tcmalloc_dir)/src/linux_shadow_stacks.h', X- '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h', X+ 'msvs_settings': { X+ # TODO(sgk): merge this with build/common.gypi settings X+ 'VCLibrarianTool': { X+ 'AdditionalOptions': ['/ignore:4006,4221'], X+ 'AdditionalLibraryDirectories': X+ ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'], X+ }, X+ 'VCLinkerTool': { X+ 'AdditionalOptions': ['/ignore:4006'], X+ }, X+ }, X+ 'configurations': { X+ 'Debug_Base': { X+ 'msvs_settings': { X+ 'VCCLCompilerTool': { X+ 'RuntimeLibrary': '0', X+ }, X+ }, X+ }, X+ }, X+ 'conditions': [ X+ ['OS=="win"', { X+ 'defines': [ X+ ['PERFTOOLS_DLL_DECL', ''] X+ ], X+ 'dependencies': [ X+ 'libcmt', X+ ], X+ 'include_dirs': [ X+ '<(tcmalloc_dir)/src/windows', X+ ], X+ 'sources!': [ X+ '<(tcmalloc_dir)/src/base/linuxthreads.cc', X+ '<(tcmalloc_dir)/src/base/linuxthreads.h', X+ '<(tcmalloc_dir)/src/base/vdso_support.cc', X+ '<(tcmalloc_dir)/src/base/vdso_support.h', X+ '<(tcmalloc_dir)/src/maybe_threads.cc', X+ '<(tcmalloc_dir)/src/maybe_threads.h', X+ '<(tcmalloc_dir)/src/symbolize.h', X+ '<(tcmalloc_dir)/src/system-alloc.cc', X+ '<(tcmalloc_dir)/src/system-alloc.h', X+ X+ # included by allocator_shim.cc X+ '<(tcmalloc_dir)/src/tcmalloc.cc', X+ X+ # heap-profiler/checker/cpuprofiler X+ '<(tcmalloc_dir)/src/base/thread_lister.c', X+ '<(tcmalloc_dir)/src/base/thread_lister.h', X+ '<(tcmalloc_dir)/src/heap-checker-bcad.cc', X+ '<(tcmalloc_dir)/src/heap-checker.cc', X+ '<(tcmalloc_dir)/src/heap-profiler.cc', X+ '<(tcmalloc_dir)/src/memory_region_map.cc', X+ '<(tcmalloc_dir)/src/memory_region_map.h', X+ '<(tcmalloc_dir)/src/profiledata.cc', X+ '<(tcmalloc_dir)/src/profiledata.h', X+ '<(tcmalloc_dir)/src/profile-handler.cc', X+ '<(tcmalloc_dir)/src/profile-handler.h', X+ '<(tcmalloc_dir)/src/profiler.cc', X+ X+ # debugallocation X+ '<(tcmalloc_dir)/src/debugallocation.cc', X+ ], X+ }], X+ ['OS=="linux" or OS=="freebsd" or OS=="solaris"', { X+ 'sources!': [ X+ '<(tcmalloc_dir)/src/system-alloc.h', X+ '<(tcmalloc_dir)/src/windows/port.cc', X+ '<(tcmalloc_dir)/src/windows/port.h', X+ X+ # TODO(willchan): Support allocator shim later on. X+ 'allocator_shim.cc', X+ X+ # TODO(willchan): support jemalloc on other platforms X+ # jemalloc files X+ '<(jemalloc_dir)/jemalloc.c', X+ '<(jemalloc_dir)/jemalloc.h', X+ '<(jemalloc_dir)/ql.h', X+ '<(jemalloc_dir)/qr.h', X+ '<(jemalloc_dir)/rb.h', X+ X+ ], X+ # We enable all warnings by default, but upstream disables a few. X+ # Keep "-Wno-*" flags in sync with upstream by comparing against: X+ # http://code.google.com/p/google-perftools/source/browse/trunk/Makefile.am X+ 'cflags': [ X+ '-Wno-sign-compare', X+ '-Wno-unused-result', X+ ], X+ 'cflags!': [ X+ '-fvisibility=hidden', X+ ], X+ 'link_settings': { X+ 'ldflags': [ X+ # Don't let linker rip this symbol out, otherwise the heap&cpu X+ # profilers will not initialize properly on startup. X+ '-Wl,-uIsHeapProfilerRunning,-uProfilerStart', X+ # Do the same for heap leak checker. X+ '-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi', X+ '-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl', X+ '-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv', X+ ]}, X+ }], X+ [ 'linux_use_debugallocation==1', { X+ 'sources!': [ X+ # debugallocation.cc #includes tcmalloc.cc, X+ # so only one of them should be used. X+ '<(tcmalloc_dir)/src/tcmalloc.cc', X+ ], X+ 'cflags': [ X+ '-DTCMALLOC_FOR_DEBUGALLOCATION', X+ ], X+ }, { # linux_use_debugallocation != 1 X+ 'sources!': [ X+ '<(tcmalloc_dir)/src/debugallocation.cc', X+ ], X+ }], X+ [ 'linux_keep_shadow_stacks==1', { X+ 'sources': [ X+ '<(tcmalloc_dir)/src/linux_shadow_stacks.cc', X+ '<(tcmalloc_dir)/src/linux_shadow_stacks.h', X+ '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h', X+ ], X+ 'cflags': [ X+ '-finstrument-functions', X+ '-DKEEP_SHADOW_STACKS', X+ ], X+ }], X+ [ 'linux_use_heapchecker==0', { X+ # Do not compile and link the heapchecker source. X+ 'sources!': [ X+ '<(tcmalloc_dir)/src/heap-checker-bcad.cc', X+ '<(tcmalloc_dir)/src/heap-checker.cc', X+ ], X+ # Disable the heap checker in tcmalloc. X+ 'cflags': [ X+ '-DNO_HEAP_CHECK', X+ ], X+ }], X ], X- 'cflags': [ X- '-finstrument-functions', X- '-DKEEP_SHADOW_STACKS', X+ }, X+ { X+ 'target_name': 'allocator_unittests', X+ 'type': 'executable', X+ 'dependencies': [ X+ 'allocator', X+ '../../testing/gtest.gyp:gtest', X ], X- }], X- [ 'linux_use_heapchecker==0', { X- # Do not compile and link the heapchecker source. X- 'sources!': [ X- '<(tcmalloc_dir)/src/heap-checker-bcad.cc', X- '<(tcmalloc_dir)/src/heap-checker.cc', X+ 'include_dirs': [ X+ '.', X+ '<(tcmalloc_dir)/src/base', X+ '<(tcmalloc_dir)/src', X+ '../..', X ], X- # Disable the heap checker in tcmalloc. X- 'cflags': [ X- '-DNO_HEAP_CHECK', X+ 'sources': [ X+ 'allocator_unittests.cc', X ], X- }], X- ], X- }, X- { X- 'target_name': 'allocator_unittests', X- 'type': 'executable', X- 'dependencies': [ X- 'allocator', X- '../../testing/gtest.gyp:gtest', X- ], X- 'include_dirs': [ X- '.', X- '<(tcmalloc_dir)/src/base', X- '<(tcmalloc_dir)/src', X- '../..', X- ], X- 'sources': [ X- 'allocator_unittests.cc', X+ }, X ], X- }, X- ], X- 'conditions': [ X+ }], X ['OS=="win"', { X 'targets': [ X { c968cbadee7a9c776ea9f1a03e2780ca exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201081630.q08GU9cA042044>