Changeset 292d599b for src

Timestamp:

May 10, 2019, 12:02:12 PM (6 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:

• Common/Stats/Heap.cc (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (4 diffs)

src/Common/Stats/Heap.cc

@@ -21 +21 @@
 #include <iostream>
 
-#if defined( NO_STATISTICS )
+#if defined( NO_STATISTICS ) || defined( TCMALLOC )
         #define NO_HEAP_STATISTICS
 #endif

src/Makefile.am

@@ -28 +28 @@
 MOSTLYCLEANFILES =
 
+if WITH_LIBPROFILER
+LIBPROFILER = -lprofiler
+endif
+
+if WITH_LIBTCMALLOC
+LIBTCMALLOC = -ltcmalloc
+TCMALLOCFLAG = -DTCMALLOC
+endif
+
 include CodeGen/module.mk
 include CodeTools/module.mk
@@ -54 +63 @@
 cfa_cpplib_PROGRAMS = ../driver/cfa-cpp demangler
 ___driver_cfa_cpp_SOURCES = $(SRC)
-___driver_cfa_cpp_LDADD = -ldl                  # yywrap
+___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
 
-if WITH_LIBPROFILER
-        ___driver_cfa_cpp_LDADD += -lprofiler
-endif
-
-if WITH_LIBTCMALLOC
-        ___driver_cfa_cpp_LDADD += -ltcmalloc
-endif
-
-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
+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 $(TCMALLOCFLAG)
 AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
 ARFLAGS     = cr

src/Makefile.in

@@ -258 +258 @@
 am____driver_cfa_cpp_OBJECTS = $(am__objects_8)
 ___driver_cfa_cpp_OBJECTS = $(am____driver_cfa_cpp_OBJECTS)
-___driver_cfa_cpp_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+___driver_cfa_cpp_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+        $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -554 +556 @@
 MOSTLYCLEANFILES = Parser/lex.cc Parser/parser.cc Parser/parser.hh \
         Parser/parser.output
+@WITH_LIBPROFILER_TRUE@LIBPROFILER = -lprofiler
+@WITH_LIBTCMALLOC_TRUE@LIBTCMALLOC = -ltcmalloc
+@WITH_LIBTCMALLOC_TRUE@TCMALLOCFLAG = -DTCMALLOC
 SRC_CODEGEN = \
         CodeGen/CodeGenerator.cc \
@@ -650 +655 @@
 cfa_cpplibdir = $(CFA_LIBDIR)
 ___driver_cfa_cpp_SOURCES = $(SRC)
-___driver_cfa_cpp_LDADD = -ldl                  # yywrap
-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
+___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
+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 $(TCMALLOCFLAG)
 AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
 ARFLAGS = cr
@@ -1526 +1531 @@
         @rm BasicTypes-gen
 
-@WITH_LIBPROFILER_TRUE@ ___driver_cfa_cpp_LDADD += -lprofiler
-
-@WITH_LIBTCMALLOC_TRUE@ ___driver_cfa_cpp_LDADD += -ltcmalloc
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.