Changeset 292d599


Ignore:
Timestamp:
May 10, 2019, 12:02:12 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
36354b1
Parents:
b038fe4
Message:

Fixed problem with TCMALLOC and heap stats

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/Common/Stats/Heap.cc

    rb038fe4 r292d599  
    2121#include <iostream>
    2222
    23 #if defined( NO_STATISTICS )
     23#if defined( NO_STATISTICS ) || defined( TCMALLOC )
    2424        #define NO_HEAP_STATISTICS
    2525#endif
  • src/Makefile.am

    rb038fe4 r292d599  
    2828MOSTLYCLEANFILES =
    2929
     30if WITH_LIBPROFILER
     31LIBPROFILER = -lprofiler
     32endif
     33
     34if WITH_LIBTCMALLOC
     35LIBTCMALLOC = -ltcmalloc
     36TCMALLOCFLAG = -DTCMALLOC
     37endif
     38
    3039include CodeGen/module.mk
    3140include CodeTools/module.mk
     
    5463cfa_cpplib_PROGRAMS = ../driver/cfa-cpp demangler
    5564___driver_cfa_cpp_SOURCES = $(SRC)
    56 ___driver_cfa_cpp_LDADD = -ldl                  # yywrap
     65___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
    5766
    58 if WITH_LIBPROFILER
    59         ___driver_cfa_cpp_LDADD += -lprofiler
    60 endif
    61 
    62 if WITH_LIBTCMALLOC
    63         ___driver_cfa_cpp_LDADD += -ltcmalloc
    64 endif
    65 
    66 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14
     67AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 $(TCMALLOCFLAG)
    6768AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
    6869ARFLAGS     = cr
  • src/Makefile.in

    rb038fe4 r292d599  
    258258am____driver_cfa_cpp_OBJECTS = $(am__objects_8)
    259259___driver_cfa_cpp_OBJECTS = $(am____driver_cfa_cpp_OBJECTS)
    260 ___driver_cfa_cpp_DEPENDENCIES =
     260am__DEPENDENCIES_1 =
     261___driver_cfa_cpp_DEPENDENCIES = $(am__DEPENDENCIES_1) \
     262        $(am__DEPENDENCIES_1)
    261263AM_V_lt = $(am__v_lt_@AM_V@)
    262264am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     
    554556MOSTLYCLEANFILES = Parser/lex.cc Parser/parser.cc Parser/parser.hh \
    555557        Parser/parser.output
     558@WITH_LIBPROFILER_TRUE@LIBPROFILER = -lprofiler
     559@WITH_LIBTCMALLOC_TRUE@LIBTCMALLOC = -ltcmalloc
     560@WITH_LIBTCMALLOC_TRUE@TCMALLOCFLAG = -DTCMALLOC
    556561SRC_CODEGEN = \
    557562        CodeGen/CodeGenerator.cc \
     
    650655cfa_cpplibdir = $(CFA_LIBDIR)
    651656___driver_cfa_cpp_SOURCES = $(SRC)
    652 ___driver_cfa_cpp_LDADD = -ldl                  # yywrap
    653 AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14
     657___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
     658AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O3 -g -std=c++14 $(TCMALLOCFLAG)
    654659AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
    655660ARFLAGS = cr
     
    15261531        @rm BasicTypes-gen
    15271532
    1528 @WITH_LIBPROFILER_TRUE@ ___driver_cfa_cpp_LDADD += -lprofiler
    1529 
    1530 @WITH_LIBTCMALLOC_TRUE@ ___driver_cfa_cpp_LDADD += -ltcmalloc
    1531 
    15321533# Tell versions [3.59,3.63) of GNU make to not export all variables.
    15331534# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.