Changeset 8e5724e for src/libcfa


Ignore:
Timestamp:
Nov 29, 2016, 4:47:15 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
148f7290
Parents:
1f44196
Message:

Added the CFA_DEBUG flag and the libhdr folder to libcfa compilation.
Compilation now has an assambly compiler.
Added first assembly file to compiler.

Location:
src/libcfa
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.am

    r1f44196 r8e5724e  
    5353         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -c -o $@ $<
    5454
    55 CFLAGS = -quiet -no-include-stdhdr -g -Wall -Wno-unused-function @CFA_FLAGS@ -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2
     55CFLAGS = \
     56        -quiet \
     57        -no-include-stdhdr \
     58        -g \
     59        -Wall \
     60        -Wno-unused-function \
     61        @CFA_FLAGS@ \
     62        -B${abs_top_srcdir}/src/driver \
     63        -XCFA \
     64        -t \
     65        -D__CFA_DEBUG__ \
     66        -I${abs_top_srcdir}/src/libcfa/libhdr \
     67        # TEMPORARY: does not build with -O2
    5668CC = ${abs_top_srcdir}/src/driver/cfa
    5769
     
    6678${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    6779
    68 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
     80libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S
    6981
    7082stdhdr = ${shell echo stdhdr/*}
  • src/libcfa/Makefile.in

    r1f44196 r8e5724e  
    9494        rational.$(OBJEXT) assert.$(OBJEXT) \
    9595        containers/vector.$(OBJEXT) concurrency/threads.$(OBJEXT)
    96 am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1)
     96am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
     97        concurrency/CtxSwitch-x86_64.$(OBJEXT)
    9798libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    9899DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
     
    100101am__depfiles_maybe = depfiles
    101102am__mv = mv -f
     103CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     104        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
     105AM_V_CPPAS = $(am__v_CPPAS_@AM_V@)
     106am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@)
     107am__v_CPPAS_0 = @echo "  CPPAS " $@;
    102108COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    103109        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     
    130136BACKEND_CC = @BACKEND_CC@
    131137CC = ${abs_top_srcdir}/src/driver/cfa
     138CCAS = @CCAS@
     139CCASDEPMODE = @CCASDEPMODE@
     140CCASFLAGS = @CCASFLAGS@
    132141CCDEPMODE = @CCDEPMODE@
    133142CFA_BACKEND_CC = @CFA_BACKEND_CC@
     
    137146CFA_LIBDIR = @CFA_LIBDIR@
    138147CFA_PREFIX = @CFA_PREFIX@
    139 CFLAGS = -quiet -no-include-stdhdr -g -Wall -Wno-unused-function @CFA_FLAGS@ -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2
     148CFLAGS = \
     149        -quiet \
     150        -no-include-stdhdr \
     151        -g \
     152        -Wall \
     153        -Wno-unused-function \
     154        @CFA_FLAGS@ \
     155        -B${abs_top_srcdir}/src/driver \
     156        -XCFA \
     157        -t \
     158        -D__CFA_DEBUG__ \
     159        -I${abs_top_srcdir}/src/libcfa/libhdr \
     160        # TEMPORARY: does not build with -O2
     161
    140162CPP = @CPP@
    141163CPPFLAGS = @CPPFLAGS@
     
    238260runtimehdrs = concurrency
    239261libobjs = ${headers:=.o}
    240 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
     262libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S
    241263stdhdr = ${shell echo stdhdr/*}
    242264nobase_include_HEADERS = ${headers} ${stdhdr}
     
    245267
    246268.SUFFIXES:
    247 .SUFFIXES: .c .o .obj
     269.SUFFIXES: .S .c .o .obj
    248270$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
    249271        @for dep in $?; do \
     
    322344concurrency/threads.$(OBJEXT): concurrency/$(am__dirstamp) \
    323345        concurrency/$(DEPDIR)/$(am__dirstamp)
     346concurrency/CtxSwitch-x86_64.$(OBJEXT): concurrency/$(am__dirstamp) \
     347        concurrency/$(DEPDIR)/$(am__dirstamp)
    324348libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES)
    325349        $(AM_V_at)-rm -f libcfa.a
     
    329353mostlyclean-compile:
    330354        -rm -f *.$(OBJEXT)
     355        -rm -f concurrency/CtxSwitch-x86_64.$(OBJEXT)
    331356        -rm -f concurrency/threads.$(OBJEXT)
    332357        -rm -f containers/vector.$(OBJEXT)
     
    344369@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
    345370@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
     371@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-x86_64.Po@am__quote@
    346372@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/threads.Po@am__quote@
    347373@AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/vector.Po@am__quote@
     374
     375.S.o:
     376@am__fastdepCCAS_TRUE@  $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     377@am__fastdepCCAS_TRUE@  $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     378@am__fastdepCCAS_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
     379@AMDEP_TRUE@@am__fastdepCCAS_FALSE@     $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     380@AMDEP_TRUE@@am__fastdepCCAS_FALSE@     DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     381@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $<
     382
     383.S.obj:
     384@am__fastdepCCAS_TRUE@  $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     385@am__fastdepCCAS_TRUE@  $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     386@am__fastdepCCAS_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
     387@AMDEP_TRUE@@am__fastdepCCAS_FALSE@     $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     388@AMDEP_TRUE@@am__fastdepCCAS_FALSE@     DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     389@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    348390
    349391.c.o:
Note: See TracChangeset for help on using the changeset viewer.