Changeset df8b87c


Ignore:
Timestamp:
Aug 1, 2019, 5:56:39 PM (2 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
7e0017f5
Parents:
0d92e5c
Message:

Demangler can now be disable to avoid compiling it (enabled by default)

Files:
11 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    r0d92e5c rdf8b87c  
    281281CYGPATH_W = @CYGPATH_W@
    282282DEFS = @DEFS@
     283DEMANGLER = @DEMANGLER@
    283284DEPDIR = @DEPDIR@
    284285DLLTOOL = @DLLTOOL@
     
    306307LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
    307308LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     309LIBDEMANGLE = @LIBDEMANGLE@
    308310LIBOBJS = @LIBOBJS@
    309311LIBS = @LIBS@
  • benchmark/Makefile.in

    r0d92e5c rdf8b87c  
    231231CYGPATH_W = @CYGPATH_W@
    232232DEFS = @DEFS@
     233DEMANGLER = @DEMANGLER@
    233234DEPDIR = @DEPDIR@
    234235DLLTOOL = @DLLTOOL@
     
    256257LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
    257258LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     259LIBDEMANGLE = @LIBDEMANGLE@
    258260LIBOBJS = @LIBOBJS@
    259261LIBS = @LIBS@
  • configure

    r0d92e5c rdf8b87c  
    637637LIBOBJS
    638638CFA_BACKEND_CC
     639DEMANGLER
     640LIBDEMANGLE
    639641WITH_LIBTCMALLOC_FALSE
    640642WITH_LIBTCMALLOC_TRUE
     
    797799with_target_hosts
    798800enable_gprofiler
     801enable_demangler
    799802enable_dependency_tracking
    800803enable_shared
     
    14571460  --disable-silent-rules  verbose build output (undo: "make V=0")
    14581461  --enable-gprofiler     whether or not to enable gprofiler tools (if available)
     1462  --enable-demangler     whether or not to build the demangler (executable and library)
    14591463  --enable-dependency-tracking
    14601464                          do not reject slow dependency extractors
     
    33983402else
    33993403  enable_gprofiler=yes
     3404fi
     3405
     3406
     3407# Check whether --enable-demangler was given.
     3408if test "${enable_demangler+set}" = set; then :
     3409  enableval=$enable_demangler; enable_demangler=$enableval
     3410else
     3411  enable_demangler=yes
    34003412fi
    34013413
     
    1678016792
    1678116793
     16794# conditionnally build the demangler
     16795if test "x$enable_demangler" == xyes; then
     16796        LIBDEMANGLE="libdemangle.a"
     16797        DEMANGLER="demangler"
     16798else
     16799        LIBDEMANGLE=""
     16800        DEMANGLER=""
     16801fi
     16802
     16803
     16804
    1678216805# Checks for header files.
    1678316806for ac_header in libintl.h malloc.h unistd.h
  • configure.ac

    r0d92e5c rdf8b87c  
    133133        enable_gprofiler=$enableval, enable_gprofiler=yes)
    134134
     135AC_ARG_ENABLE(demangler,
     136        [  --enable-demangler     whether or not to build the demangler (executable and library)],
     137        enable_demangler=$enableval, enable_demangler=yes)
     138
    135139AC_SUBST(TARGET_HOSTS, ${target_hosts})
    136140
     
    205209AM_CONDITIONAL([WITH_LIBTCMALLOC], [test "x$enable_gprofiler" = "xyes" -a "$HAVE_LIBTCMALLOC" -eq 1])
    206210
     211# conditionnally build the demangler
     212if test "x$enable_demangler" == xyes; then
     213        LIBDEMANGLE="libdemangle.a"
     214        DEMANGLER="demangler"
     215else
     216        LIBDEMANGLE=""
     217        DEMANGLER=""
     218fi
     219AC_SUBST([LIBDEMANGLE])
     220AC_SUBST([DEMANGLER])
     221
    207222# Checks for header files.
    208223AC_CHECK_HEADERS([libintl.h malloc.h unistd.h], [], [echo "Error: Missing required header"; exit 1])
  • driver/Makefile.in

    r0d92e5c rdf8b87c  
    218218CYGPATH_W = @CYGPATH_W@
    219219DEFS = @DEFS@
     220DEMANGLER = @DEMANGLER@
    220221DEPDIR = @DEPDIR@
    221222DLLTOOL = @DLLTOOL@
     
    243244LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
    244245LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     246LIBDEMANGLE = @LIBDEMANGLE@
    245247LIBOBJS = @LIBOBJS@
    246248LIBS = @LIBS@
  • longrun_tests/Makefile.in

    r0d92e5c rdf8b87c  
    365365CYGPATH_W = @CYGPATH_W@
    366366DEFS = @DEFS@
     367DEMANGLER = @DEMANGLER@
    367368DEPDIR = @DEPDIR@
    368369DLLTOOL = @DLLTOOL@
     
    390391LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
    391392LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     393LIBDEMANGLE = @LIBDEMANGLE@
    392394LIBOBJS = @LIBOBJS@
    393395LIBS = @LIBS@
  • src/Makefile.am

    r0d92e5c rdf8b87c  
    6262# put into lib for now
    6363cfa_cpplibdir = $(CFA_LIBDIR)
    64 cfa_cpplib_PROGRAMS = ../driver/cfa-cpp demangler
     64cfa_cpplib_PROGRAMS = ../driver/cfa-cpp $(DEMANGLER)
     65EXTRA_PROGRAMS = demangler
    6566___driver_cfa_cpp_SOURCES = $(SRC)
    6667___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
     
    7475demangler_LDADD = libdemangle.a -ldl                    # yywrap
    7576
    76 noinst_LIBRARIES = libdemangle.a
     77noinst_LIBRARIES = $(LIBDEMANGLE)
     78EXTRA_LIBRARIES = libdemangle.a
    7779libdemangle_a_SOURCES = $(SRCDEMANGLE)
    7880
  • src/Makefile.in

    r0d92e5c rdf8b87c  
    141141build_triplet = @build@
    142142host_triplet = @host@
    143 cfa_cpplib_PROGRAMS = ../driver/cfa-cpp$(EXEEXT) demangler$(EXEEXT)
     143cfa_cpplib_PROGRAMS = ../driver/cfa-cpp$(EXEEXT) $(DEMANGLER)
     144EXTRA_PROGRAMS = demangler$(EXEEXT)
    144145subdir = src
    145146ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    427428CYGPATH_W = @CYGPATH_W@
    428429DEFS = @DEFS@
     430DEMANGLER = @DEMANGLER@
    429431DEPDIR = @DEPDIR@
    430432DLLTOOL = @DLLTOOL@
     
    452454LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
    453455LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     456LIBDEMANGLE = @LIBDEMANGLE@
    454457LIBOBJS = @LIBOBJS@
    455458LIBS = @LIBS@
     
    703706demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
    704707demangler_LDADD = libdemangle.a -ldl                    # yywrap
    705 noinst_LIBRARIES = libdemangle.a
     708noinst_LIBRARIES = $(LIBDEMANGLE)
     709EXTRA_LIBRARIES = libdemangle.a
    706710libdemangle_a_SOURCES = $(SRCDEMANGLE)
    707711all: $(BUILT_SOURCES)
  • tests/Makefile.in

    r0d92e5c rdf8b87c  
    235235CYGPATH_W = @CYGPATH_W@
    236236DEFS = @DEFS@
     237DEMANGLER = @DEMANGLER@
    237238DEPDIR = @DEPDIR@
    238239DLLTOOL = @DLLTOOL@
     
    260261LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
    261262LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     263LIBDEMANGLE = @LIBDEMANGLE@
    262264LIBOBJS = @LIBOBJS@
    263265LIBS = @LIBS@
  • tools/Makefile.in

    r0d92e5c rdf8b87c  
    225225CYGPATH_W = @CYGPATH_W@
    226226DEFS = @DEFS@
     227DEMANGLER = @DEMANGLER@
    227228DEPDIR = @DEPDIR@
    228229DLLTOOL = @DLLTOOL@
     
    250251LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
    251252LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     253LIBDEMANGLE = @LIBDEMANGLE@
    252254LIBOBJS = @LIBOBJS@
    253255LIBS = @LIBS@
  • tools/prettyprinter/Makefile.in

    r0d92e5c rdf8b87c  
    254254CYGPATH_W = @CYGPATH_W@
    255255DEFS = @DEFS@
     256DEMANGLER = @DEMANGLER@
    256257DEPDIR = @DEPDIR@
    257258DLLTOOL = @DLLTOOL@
     
    279280LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
    280281LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     282LIBDEMANGLE = @LIBDEMANGLE@
    281283LIBOBJS = @LIBOBJS@
    282284LIBS = @LIBS@
Note: See TracChangeset for help on using the changeset viewer.