Changeset e4745d7a
- Timestamp:
- Dec 6, 2016, 3:38:11 PM (8 years ago)
- 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:
- d9c44c3
- Parents:
- c5cb6130
- Files:
-
- 3 added
- 10 edited
-
Makefile.in (modified) (4 diffs)
-
automake/config.guess (added)
-
automake/config.sub (added)
-
configure (modified) (3 diffs)
-
configure.ac (modified) (1 diff)
-
src/Makefile.in (modified) (4 diffs)
-
src/driver/Makefile.in (modified) (4 diffs)
-
src/examples/Makefile.in (modified) (4 diffs)
-
src/libcfa/Makefile.am (modified) (2 diffs)
-
src/libcfa/Makefile.in (modified) (9 diffs)
-
src/libcfa/concurrency/CtxSwitch-i386.S (added)
-
src/libcfa/concurrency/invoke.c (modified) (1 diff)
-
src/tests/Makefile.in (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Makefile.in
rc5cb6130 re4745d7a 35 35 PRE_UNINSTALL = : 36 36 POST_UNINSTALL = : 37 build_triplet = @build@ 38 host_triplet = @host@ 37 39 subdir = . 38 40 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 39 41 $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 40 42 $(top_srcdir)/configure INSTALL automake/compile \ 41 automake/ depcomp automake/install-sh automake/missing\42 automake/ ylwrap43 automake/config.guess automake/config.sub automake/depcomp \ 44 automake/install-sh automake/missing automake/ylwrap 43 45 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 44 46 am__aclocal_m4_deps = $(top_srcdir)/configure.ac … … 161 163 LIBS = @LIBS@ 162 164 LTLIBOBJS = @LTLIBOBJS@ 165 MACHINE_TYPE = @MACHINE_TYPE@ 163 166 MAINT = @MAINT@ 164 167 MAKEINFO = @MAKEINFO@ … … 192 195 am__untar = @am__untar@ 193 196 bindir = @bindir@ 197 build = @build@ 194 198 build_alias = @build_alias@ 199 build_cpu = @build_cpu@ 200 build_os = @build_os@ 201 build_vendor = @build_vendor@ 195 202 builddir = @builddir@ 196 203 datadir = @datadir@ … … 199 206 dvidir = @dvidir@ 200 207 exec_prefix = @exec_prefix@ 208 host = @host@ 201 209 host_alias = @host_alias@ 210 host_cpu = @host_cpu@ 211 host_os = @host_os@ 212 host_vendor = @host_vendor@ 202 213 htmldir = @htmldir@ 203 214 includedir = @includedir@ -
configure
rc5cb6130 re4745d7a 644 644 CXXFLAGS 645 645 CXX 646 MACHINE_TYPE 647 host_os 648 host_vendor 649 host_cpu 650 host 651 build_os 652 build_vendor 653 build_cpu 654 build 646 655 CFA_FLAGS 647 656 CFA_LIBDIR … … 1346 1355 --program-suffix=SUFFIX append SUFFIX to installed program names 1347 1356 --program-transform-name=PROGRAM run sed PROGRAM on installed program names 1357 1358 System types: 1359 --build=BUILD configure for building on BUILD [guessed] 1360 --host=HOST cross-compile to build programs to run on HOST [BUILD] 1348 1361 _ACEOF 1349 1362 fi … … 3146 3159 3147 3160 CFA_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; } 3169 if ${ac_cv_build+:} false; then : 3170 $as_echo_n "(cached) " >&6 3171 else 3172 ac_build_alias=$build_alias 3173 test "x$ac_build_alias" = x && 3174 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 3175 test "x$ac_build_alias" = x && 3176 as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 3177 ac_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 3180 fi 3181 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 3182 $as_echo "$ac_cv_build" >&6; } 3183 case $ac_cv_build in 3184 *-*-*) ;; 3185 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 3186 esac 3187 build=$ac_cv_build 3188 ac_save_IFS=$IFS; IFS='-' 3189 set x $ac_cv_build 3190 shift 3191 build_cpu=$1 3192 build_vendor=$2 3193 shift; shift 3194 # Remember, the first character of IFS is used to create $*, 3195 # except with old shells: 3196 build_os=$* 3197 IFS=$ac_save_IFS 3198 case $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; } 3203 if ${ac_cv_host+:} false; then : 3204 $as_echo_n "(cached) " >&6 3205 else 3206 if test "x$host_alias" = x; then 3207 ac_cv_host=$ac_cv_build 3208 else 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 3211 fi 3212 3213 fi 3214 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 3215 $as_echo "$ac_cv_host" >&6; } 3216 case $ac_cv_host in 3217 *-*-*) ;; 3218 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 3219 esac 3220 host=$ac_cv_host 3221 ac_save_IFS=$IFS; IFS='-' 3222 set x $ac_cv_host 3223 shift 3224 host_cpu=$1 3225 host_vendor=$2 3226 shift; shift 3227 # Remember, the first character of IFS is used to create $*, 3228 # except with old shells: 3229 host_os=$* 3230 IFS=$ac_save_IFS 3231 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac 3232 3233 3234 MACHINE_TYPE=$host_cpu 3148 3235 3149 3236 -
configure.ac
rc5cb6130 re4745d7a 88 88 AC_SUBST(CFA_FLAGS, ${CFAFLAGS}) 89 89 90 AC_CANONICAL_HOST 91 AC_SUBST([MACHINE_TYPE],[$host_cpu]) 92 90 93 # Checks for programs. 91 94 AC_PROG_CXX -
src/Makefile.in
rc5cb6130 re4745d7a 69 69 PRE_UNINSTALL = : 70 70 POST_UNINSTALL = : 71 build_triplet = @build@ 72 host_triplet = @host@ 71 73 DIST_COMMON = $(srcdir)/CodeGen/module.mk $(srcdir)/Common/module.mk \ 72 74 $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk \ … … 296 298 LIBS = @LIBS@ 297 299 LTLIBOBJS = @LTLIBOBJS@ 300 MACHINE_TYPE = @MACHINE_TYPE@ 298 301 MAINT = @MAINT@ 299 302 MAKEINFO = @MAKEINFO@ … … 327 330 am__untar = @am__untar@ 328 331 bindir = @bindir@ 332 build = @build@ 329 333 build_alias = @build_alias@ 334 build_cpu = @build_cpu@ 335 build_os = @build_os@ 336 build_vendor = @build_vendor@ 330 337 builddir = @builddir@ 331 338 datadir = @datadir@ … … 334 341 dvidir = @dvidir@ 335 342 exec_prefix = @exec_prefix@ 343 host = @host@ 336 344 host_alias = @host_alias@ 345 host_cpu = @host_cpu@ 346 host_os = @host_os@ 347 host_vendor = @host_vendor@ 337 348 htmldir = @htmldir@ 338 349 includedir = @includedir@ -
src/driver/Makefile.in
rc5cb6130 re4745d7a 36 36 PRE_UNINSTALL = : 37 37 POST_UNINSTALL = : 38 build_triplet = @build@ 39 host_triplet = @host@ 38 40 bin_PROGRAMS = cfa$(EXEEXT) 39 41 cc1lib_PROGRAMS = cc1$(EXEEXT) … … 129 131 LIBS = @LIBS@ 130 132 LTLIBOBJS = @LTLIBOBJS@ 133 MACHINE_TYPE = @MACHINE_TYPE@ 131 134 MAINT = @MAINT@ 132 135 MAKEINFO = @MAKEINFO@ … … 160 163 am__untar = @am__untar@ 161 164 bindir = @bindir@ 165 build = @build@ 162 166 build_alias = @build_alias@ 167 build_cpu = @build_cpu@ 168 build_os = @build_os@ 169 build_vendor = @build_vendor@ 163 170 builddir = @builddir@ 164 171 datadir = @datadir@ … … 167 174 dvidir = @dvidir@ 168 175 exec_prefix = @exec_prefix@ 176 host = @host@ 169 177 host_alias = @host_alias@ 178 host_cpu = @host_cpu@ 179 host_os = @host_os@ 180 host_vendor = @host_vendor@ 170 181 htmldir = @htmldir@ 171 182 includedir = @includedir@ -
src/examples/Makefile.in
rc5cb6130 re4745d7a 36 36 PRE_UNINSTALL = : 37 37 POST_UNINSTALL = : 38 build_triplet = @build@ 39 host_triplet = @host@ 38 40 noinst_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \ 39 41 avl_test$(EXEEXT) … … 140 142 LIBS = @LIBS@ 141 143 LTLIBOBJS = @LTLIBOBJS@ 144 MACHINE_TYPE = @MACHINE_TYPE@ 142 145 MAINT = @MAINT@ 143 146 MAKEINFO = @MAKEINFO@ … … 171 174 am__untar = @am__untar@ 172 175 bindir = @bindir@ 176 build = @build@ 173 177 build_alias = @build_alias@ 178 build_cpu = @build_cpu@ 179 build_os = @build_os@ 180 build_vendor = @build_vendor@ 174 181 builddir = @builddir@ 175 182 datadir = @datadir@ … … 178 185 dvidir = @dvidir@ 179 186 exec_prefix = @exec_prefix@ 187 host = @host@ 180 188 host_alias = @host_alias@ 189 host_cpu = @host_cpu@ 190 host_os = @host_os@ 191 host_vendor = @host_vendor@ 181 192 htmldir = @htmldir@ 182 193 includedir = @includedir@ -
src/libcfa/Makefile.am
rc5cb6130 re4745d7a 61 61 # TEMPORARY: does not build with -O2 62 62 63 AM_CCASFLAGS = @CFA_FLAGS@ 63 64 CFLAGS = ${EXTRA_FLAGS} -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver 64 65 CC = ${abs_top_srcdir}/src/driver/cfa … … 77 78 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator 78 79 79 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch- x86_64.S concurrency/invoke.c80 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c 80 81 81 82 stdhdr = ${shell echo stdhdr/*} -
src/libcfa/Makefile.in
rc5cb6130 re4745d7a 38 38 PRE_UNINSTALL = : 39 39 POST_UNINSTALL = : 40 build_triplet = @build@ 41 host_triplet = @host@ 40 42 subdir = src/libcfa 41 43 DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \ … … 95 97 containers/vector.$(OBJEXT) concurrency/threads.$(OBJEXT) 96 98 am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) \ 97 concurrency/CtxSwitch- x86_64.$(OBJEXT) \99 concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \ 98 100 concurrency/invoke.$(OBJEXT) 99 101 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS) … … 174 176 LIBS = @LIBS@ 175 177 LTLIBOBJS = @LTLIBOBJS@ 178 MACHINE_TYPE = @MACHINE_TYPE@ 176 179 MAINT = @MAINT@ 177 180 MAKEINFO = @MAKEINFO@ … … 205 208 am__untar = @am__untar@ 206 209 bindir = @bindir@ 210 build = @build@ 207 211 build_alias = @build_alias@ 212 build_cpu = @build_cpu@ 213 build_os = @build_os@ 214 build_vendor = @build_vendor@ 208 215 builddir = @builddir@ 209 216 datadir = @datadir@ … … 212 219 dvidir = @dvidir@ 213 220 exec_prefix = @exec_prefix@ 221 host = @host@ 214 222 host_alias = @host_alias@ 223 host_cpu = @host_cpu@ 224 host_os = @host_os@ 225 host_vendor = @host_vendor@ 215 226 htmldir = @htmldir@ 216 227 includedir = @includedir@ … … 253 264 # TEMPORARY: does not build with -O2 254 265 266 AM_CCASFLAGS = @CFA_FLAGS@ 255 267 headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/threads 256 268 runtimehdrs = concurrency 257 269 libobjs = ${headers:=.o} 258 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch- x86_64.S concurrency/invoke.c270 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c 259 271 stdhdr = ${shell echo stdhdr/*} 260 272 nobase_include_HEADERS = ${headers} ${stdhdr} … … 340 352 concurrency/threads.$(OBJEXT): concurrency/$(am__dirstamp) \ 341 353 concurrency/$(DEPDIR)/$(am__dirstamp) 342 concurrency/CtxSwitch-x86_64.$(OBJEXT): concurrency/$(am__dirstamp) \ 354 concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT): \ 355 concurrency/$(am__dirstamp) \ 343 356 concurrency/$(DEPDIR)/$(am__dirstamp) 344 357 concurrency/invoke.$(OBJEXT): concurrency/$(am__dirstamp) \ … … 351 364 mostlyclean-compile: 352 365 -rm -f *.$(OBJEXT) 353 -rm -f concurrency/CtxSwitch- x86_64.$(OBJEXT)366 -rm -f concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) 354 367 -rm -f concurrency/invoke.$(OBJEXT) 355 368 -rm -f concurrency/threads.$(OBJEXT) … … 368 381 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@ 369 382 @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@ 371 384 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@ 372 385 @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/threads.Po@am__quote@ -
src/libcfa/concurrency/invoke.c
rc5cb6130 re4745d7a 28 28 29 29 void __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, 34 34 void (*invoke)(struct coVtable *, void *) 35 35 ) { 36 36 37 #if ! defined( __x86_64__ ) 38 #error Only __x86_64__ is supported for threads in cfa37 #if ! defined( __x86_64__ ) && ! defined( __i386__ ) 38 #error Only __x86_64__ and __i386__ is supported for threads in cfa 39 39 #endif 40 40 -
src/tests/Makefile.in
rc5cb6130 re4745d7a 35 35 PRE_UNINSTALL = : 36 36 POST_UNINSTALL = : 37 build_triplet = @build@ 38 host_triplet = @host@ 37 39 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \ 38 40 avl_test$(EXEEXT) constant0-1DP$(EXEEXT) \ … … 150 152 LIBS = @LIBS@ 151 153 LTLIBOBJS = @LTLIBOBJS@ 154 MACHINE_TYPE = @MACHINE_TYPE@ 152 155 MAINT = @MAINT@ 153 156 MAKEINFO = @MAKEINFO@ … … 181 184 am__untar = @am__untar@ 182 185 bindir = @bindir@ 186 build = @build@ 183 187 build_alias = @build_alias@ 188 build_cpu = @build_cpu@ 189 build_os = @build_os@ 190 build_vendor = @build_vendor@ 184 191 builddir = @builddir@ 185 192 datadir = @datadir@ … … 188 195 dvidir = @dvidir@ 189 196 exec_prefix = @exec_prefix@ 197 host = @host@ 190 198 host_alias = @host_alias@ 199 host_cpu = @host_cpu@ 200 host_os = @host_os@ 201 host_vendor = @host_vendor@ 191 202 htmldir = @htmldir@ 192 203 includedir = @includedir@
Note: See TracChangeset
for help on using the changeset viewer.
