Changeset e4745d7a


Ignore:
Timestamp:
Dec 6, 2016, 3:38:11 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
d9c44c3
Parents:
c5cb6130
Message:

Properly fixed the build for i386/x86_64 including regular C file invoke.c and appropriate assembly CtxSwitch?-[CPU].S

Files:
3 added
10 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    rc5cb6130 re4745d7a  
    3535PRE_UNINSTALL = :
    3636POST_UNINSTALL = :
     37build_triplet = @build@
     38host_triplet = @host@
    3739subdir = .
    3840DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
    3941        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
    4042        $(top_srcdir)/configure INSTALL automake/compile \
    41         automake/depcomp automake/install-sh automake/missing \
    42         automake/ylwrap
     43        automake/config.guess automake/config.sub automake/depcomp \
     44        automake/install-sh automake/missing automake/ylwrap
    4345ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4446am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     
    161163LIBS = @LIBS@
    162164LTLIBOBJS = @LTLIBOBJS@
     165MACHINE_TYPE = @MACHINE_TYPE@
    163166MAINT = @MAINT@
    164167MAKEINFO = @MAKEINFO@
     
    192195am__untar = @am__untar@
    193196bindir = @bindir@
     197build = @build@
    194198build_alias = @build_alias@
     199build_cpu = @build_cpu@
     200build_os = @build_os@
     201build_vendor = @build_vendor@
    195202builddir = @builddir@
    196203datadir = @datadir@
     
    199206dvidir = @dvidir@
    200207exec_prefix = @exec_prefix@
     208host = @host@
    201209host_alias = @host_alias@
     210host_cpu = @host_cpu@
     211host_os = @host_os@
     212host_vendor = @host_vendor@
    202213htmldir = @htmldir@
    203214includedir = @includedir@
  • configure

    rc5cb6130 re4745d7a  
    644644CXXFLAGS
    645645CXX
     646MACHINE_TYPE
     647host_os
     648host_vendor
     649host_cpu
     650host
     651build_os
     652build_vendor
     653build_cpu
     654build
    646655CFA_FLAGS
    647656CFA_LIBDIR
     
    13461355  --program-suffix=SUFFIX            append SUFFIX to installed program names
    13471356  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
     1357
     1358System types:
     1359  --build=BUILD     configure for building on BUILD [guessed]
     1360  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
    13481361_ACEOF
    13491362fi
     
    31463159
    31473160CFA_FLAGS=${CFAFLAGS}
     3161
     3162
     3163# Make sure we can run config.sub.
     3164$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
     3165  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     3166
     3167{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
     3168$as_echo_n "checking build system type... " >&6; }
     3169if ${ac_cv_build+:} false; then :
     3170  $as_echo_n "(cached) " >&6
     3171else
     3172  ac_build_alias=$build_alias
     3173test "x$ac_build_alias" = x &&
     3174  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
     3175test "x$ac_build_alias" = x &&
     3176  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     3177ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
     3178  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
     3179
     3180fi
     3181{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
     3182$as_echo "$ac_cv_build" >&6; }
     3183case $ac_cv_build in
     3184*-*-*) ;;
     3185*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
     3186esac
     3187build=$ac_cv_build
     3188ac_save_IFS=$IFS; IFS='-'
     3189set x $ac_cv_build
     3190shift
     3191build_cpu=$1
     3192build_vendor=$2
     3193shift; shift
     3194# Remember, the first character of IFS is used to create $*,
     3195# except with old shells:
     3196build_os=$*
     3197IFS=$ac_save_IFS
     3198case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
     3199
     3200
     3201{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
     3202$as_echo_n "checking host system type... " >&6; }
     3203if ${ac_cv_host+:} false; then :
     3204  $as_echo_n "(cached) " >&6
     3205else
     3206  if test "x$host_alias" = x; then
     3207  ac_cv_host=$ac_cv_build
     3208else
     3209  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
     3210    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
     3211fi
     3212
     3213fi
     3214{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
     3215$as_echo "$ac_cv_host" >&6; }
     3216case $ac_cv_host in
     3217*-*-*) ;;
     3218*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
     3219esac
     3220host=$ac_cv_host
     3221ac_save_IFS=$IFS; IFS='-'
     3222set x $ac_cv_host
     3223shift
     3224host_cpu=$1
     3225host_vendor=$2
     3226shift; shift
     3227# Remember, the first character of IFS is used to create $*,
     3228# except with old shells:
     3229host_os=$*
     3230IFS=$ac_save_IFS
     3231case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
     3232
     3233
     3234MACHINE_TYPE=$host_cpu
    31483235
    31493236
  • configure.ac

    rc5cb6130 re4745d7a  
    8888AC_SUBST(CFA_FLAGS, ${CFAFLAGS})
    8989
     90AC_CANONICAL_HOST
     91AC_SUBST([MACHINE_TYPE],[$host_cpu])
     92
    9093# Checks for programs.
    9194AC_PROG_CXX
  • src/Makefile.in

    rc5cb6130 re4745d7a  
    6969PRE_UNINSTALL = :
    7070POST_UNINSTALL = :
     71build_triplet = @build@
     72host_triplet = @host@
    7173DIST_COMMON = $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk \
    7274        $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk \
     
    296298LIBS = @LIBS@
    297299LTLIBOBJS = @LTLIBOBJS@
     300MACHINE_TYPE = @MACHINE_TYPE@
    298301MAINT = @MAINT@
    299302MAKEINFO = @MAKEINFO@
     
    327330am__untar = @am__untar@
    328331bindir = @bindir@
     332build = @build@
    329333build_alias = @build_alias@
     334build_cpu = @build_cpu@
     335build_os = @build_os@
     336build_vendor = @build_vendor@
    330337builddir = @builddir@
    331338datadir = @datadir@
     
    334341dvidir = @dvidir@
    335342exec_prefix = @exec_prefix@
     343host = @host@
    336344host_alias = @host_alias@
     345host_cpu = @host_cpu@
     346host_os = @host_os@
     347host_vendor = @host_vendor@
    337348htmldir = @htmldir@
    338349includedir = @includedir@
  • src/driver/Makefile.in

    rc5cb6130 re4745d7a  
    3636PRE_UNINSTALL = :
    3737POST_UNINSTALL = :
     38build_triplet = @build@
     39host_triplet = @host@
    3840bin_PROGRAMS = cfa$(EXEEXT)
    3941cc1lib_PROGRAMS = cc1$(EXEEXT)
     
    129131LIBS = @LIBS@
    130132LTLIBOBJS = @LTLIBOBJS@
     133MACHINE_TYPE = @MACHINE_TYPE@
    131134MAINT = @MAINT@
    132135MAKEINFO = @MAKEINFO@
     
    160163am__untar = @am__untar@
    161164bindir = @bindir@
     165build = @build@
    162166build_alias = @build_alias@
     167build_cpu = @build_cpu@
     168build_os = @build_os@
     169build_vendor = @build_vendor@
    163170builddir = @builddir@
    164171datadir = @datadir@
     
    167174dvidir = @dvidir@
    168175exec_prefix = @exec_prefix@
     176host = @host@
    169177host_alias = @host_alias@
     178host_cpu = @host_cpu@
     179host_os = @host_os@
     180host_vendor = @host_vendor@
    170181htmldir = @htmldir@
    171182includedir = @includedir@
  • src/examples/Makefile.in

    rc5cb6130 re4745d7a  
    3636PRE_UNINSTALL = :
    3737POST_UNINSTALL = :
     38build_triplet = @build@
     39host_triplet = @host@
    3840noinst_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
    3941        avl_test$(EXEEXT)
     
    140142LIBS = @LIBS@
    141143LTLIBOBJS = @LTLIBOBJS@
     144MACHINE_TYPE = @MACHINE_TYPE@
    142145MAINT = @MAINT@
    143146MAKEINFO = @MAKEINFO@
     
    171174am__untar = @am__untar@
    172175bindir = @bindir@
     176build = @build@
    173177build_alias = @build_alias@
     178build_cpu = @build_cpu@
     179build_os = @build_os@
     180build_vendor = @build_vendor@
    174181builddir = @builddir@
    175182datadir = @datadir@
     
    178185dvidir = @dvidir@
    179186exec_prefix = @exec_prefix@
     187host = @host@
    180188host_alias = @host_alias@
     189host_cpu = @host_cpu@
     190host_os = @host_os@
     191host_vendor = @host_vendor@
    181192htmldir = @htmldir@
    182193includedir = @includedir@
  • src/libcfa/Makefile.am

    rc5cb6130 re4745d7a  
    6161        # TEMPORARY: does not build with -O2
    6262
     63AM_CCASFLAGS = @CFA_FLAGS@
    6364CFLAGS = ${EXTRA_FLAGS} -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver
    6465CC = ${abs_top_srcdir}/src/driver/cfa
     
    7778${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    7879
    79 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S concurrency/invoke.c
     80libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    8081
    8182stdhdr = ${shell echo stdhdr/*}
  • src/libcfa/Makefile.in

    rc5cb6130 re4745d7a  
    3838PRE_UNINSTALL = :
    3939POST_UNINSTALL = :
     40build_triplet = @build@
     41host_triplet = @host@
    4042subdir = src/libcfa
    4143DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
     
    9597        containers/vector.$(OBJEXT) concurrency/threads.$(OBJEXT)
    9698am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
    97         concurrency/CtxSwitch-x86_64.$(OBJEXT) \
     99        concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
    98100        concurrency/invoke.$(OBJEXT)
    99101libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
     
    174176LIBS = @LIBS@
    175177LTLIBOBJS = @LTLIBOBJS@
     178MACHINE_TYPE = @MACHINE_TYPE@
    176179MAINT = @MAINT@
    177180MAKEINFO = @MAKEINFO@
     
    205208am__untar = @am__untar@
    206209bindir = @bindir@
     210build = @build@
    207211build_alias = @build_alias@
     212build_cpu = @build_cpu@
     213build_os = @build_os@
     214build_vendor = @build_vendor@
    208215builddir = @builddir@
    209216datadir = @datadir@
     
    212219dvidir = @dvidir@
    213220exec_prefix = @exec_prefix@
     221host = @host@
    214222host_alias = @host_alias@
     223host_cpu = @host_cpu@
     224host_os = @host_os@
     225host_vendor = @host_vendor@
    215226htmldir = @htmldir@
    216227includedir = @includedir@
     
    253264        # TEMPORARY: does not build with -O2
    254265
     266AM_CCASFLAGS = @CFA_FLAGS@
    255267headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/threads
    256268runtimehdrs = concurrency
    257269libobjs = ${headers:=.o}
    258 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-x86_64.S concurrency/invoke.c
     270libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    259271stdhdr = ${shell echo stdhdr/*}
    260272nobase_include_HEADERS = ${headers} ${stdhdr}
     
    340352concurrency/threads.$(OBJEXT): concurrency/$(am__dirstamp) \
    341353        concurrency/$(DEPDIR)/$(am__dirstamp)
    342 concurrency/CtxSwitch-x86_64.$(OBJEXT): concurrency/$(am__dirstamp) \
     354concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT):  \
     355        concurrency/$(am__dirstamp) \
    343356        concurrency/$(DEPDIR)/$(am__dirstamp)
    344357concurrency/invoke.$(OBJEXT): concurrency/$(am__dirstamp) \
     
    351364mostlyclean-compile:
    352365        -rm -f *.$(OBJEXT)
    353         -rm -f concurrency/CtxSwitch-x86_64.$(OBJEXT)
     366        -rm -f concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT)
    354367        -rm -f concurrency/invoke.$(OBJEXT)
    355368        -rm -f concurrency/threads.$(OBJEXT)
     
    368381@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
    369382@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
    370 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-x86_64.Po@am__quote@
     383@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@MACHINE_TYPE@.Po@am__quote@
    371384@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@
    372385@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/threads.Po@am__quote@
  • src/libcfa/concurrency/invoke.c

    rc5cb6130 re4745d7a  
    2828
    2929void __startCoroutine__A0_1_0___this_coroutine__PFP10scoroutine_Pd0___co_main__PF_Pd0___vtable__PFP9scoVtable_Pd0__F_Pd0PF_P9scoVtablePv___1(
    30       struct coroutine *(*this_coroutine)(void * ), 
    31       void (*co_main)(void *), 
    32       struct coVtable *(*get_vtable)(void *), 
    33       void *vthis, 
     30      struct coroutine *(*this_coroutine)(void * ),
     31      void (*co_main)(void *),
     32      struct coVtable *(*get_vtable)(void *),
     33      void *vthis,
    3434      void (*invoke)(struct coVtable *, void *)
    3535) {
    3636
    37       #if ! defined( __x86_64__ )
    38             #error Only __x86_64__ is supported for threads in cfa
     37      #if ! defined( __x86_64__ ) && ! defined( __i386__ )
     38            #error Only __x86_64__ and __i386__ is supported for threads in cfa
    3939      #endif
    4040
  • src/tests/Makefile.in

    rc5cb6130 re4745d7a  
    3535PRE_UNINSTALL = :
    3636POST_UNINSTALL = :
     37build_triplet = @build@
     38host_triplet = @host@
    3739EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
    3840        avl_test$(EXEEXT) constant0-1DP$(EXEEXT) \
     
    150152LIBS = @LIBS@
    151153LTLIBOBJS = @LTLIBOBJS@
     154MACHINE_TYPE = @MACHINE_TYPE@
    152155MAINT = @MAINT@
    153156MAKEINFO = @MAKEINFO@
     
    181184am__untar = @am__untar@
    182185bindir = @bindir@
     186build = @build@
    183187build_alias = @build_alias@
     188build_cpu = @build_cpu@
     189build_os = @build_os@
     190build_vendor = @build_vendor@
    184191builddir = @builddir@
    185192datadir = @datadir@
     
    188195dvidir = @dvidir@
    189196exec_prefix = @exec_prefix@
     197host = @host@
    190198host_alias = @host_alias@
     199host_cpu = @host_cpu@
     200host_os = @host_os@
     201host_vendor = @host_vendor@
    191202htmldir = @htmldir@
    192203includedir = @includedir@
Note: See TracChangeset for help on using the changeset viewer.