Index: libcfa/Makefile.in =================================================================== --- libcfa/Makefile.in (revision 4dcaed2c212a42d633824e9b88053258a2d0f969) +++ libcfa/Makefile.in (revision 37fe3525f53534b29c07f4f1204c5f779836d193) @@ -89,9 +89,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../automake/cfa.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -161,6 +160,4 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/./automake/compile \ - $(top_srcdir)/./automake/config.guess \ - $(top_srcdir)/./automake/config.sub \ $(top_srcdir)/./automake/install-sh \ $(top_srcdir)/./automake/missing ./automake/compile \ @@ -212,4 +209,6 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +ARCHITECTURE = @ARCHITECTURE@ +ARCH_FLAGS = @ARCH_FLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -226,4 +225,5 @@ CFA_INCDIR = @CFA_INCDIR@ CFA_LIBDIR = @CFA_LIBDIR@ +CFA_NAME = @CFA_NAME@ CFA_PREFIX = @CFA_PREFIX@ CFLAGS = @CFLAGS@ @@ -278,9 +278,5 @@ am__untar = @am__untar@ bindir = @bindir@ -build = @build@ build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ @@ -289,9 +285,5 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -host = @host@ host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ htmldir = @htmldir@ includedir = @includedir@ Index: libcfa/configure =================================================================== --- libcfa/configure (revision 4dcaed2c212a42d633824e9b88053258a2d0f969) +++ libcfa/configure (revision 37fe3525f53534b29c07f4f1204c5f779836d193) @@ -622,16 +622,11 @@ CFA_INCDIR CFA_PREFIX +CFA_NAME +ARCH_FLAGS CFACPP CFACC DRIVER_DIR CONFIGURATION -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build +ARCHITECTURE AM_BACKSLASH AM_DEFAULT_VERBOSITY @@ -704,4 +699,5 @@ enable_option_checking enable_silent_rules +with_cfa_name enable_dependency_tracking ' @@ -709,4 +705,5 @@ host_alias target_alias +ARCHITECTURE CONFIGURATION DRIVER_DIR @@ -1333,8 +1330,4 @@ --program-suffix=SUFFIX append SUFFIX to installed program names --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] _ACEOF fi @@ -1357,5 +1350,12 @@ speeds up one-time build +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-cfa-name=NAME NAME too which cfa will be installed + Some influential environment variables: + ARCHITECTURE + The architecture to use when building libcfa CONFIGURATION The configuration to use when building libcfa, options are: @@ -1911,4 +1911,11 @@ + + + + + + + am__api_version='1.15' @@ -2495,75 +2502,4 @@ -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - @@ -2575,11 +2511,42 @@ +case $ARCHITECTURE in + "x64" ) ARCH_FLAGS="-m64";; + "x86" ) ARCH_FLAGS="-m32";; + "arm" ) ARCH_FLAGS="";; +esac + + + +#============================================================================== +#Trasforming cc1 will break compilation + + if test "${program_transform_name}" = ""; then + as_fn_error $? "Program transform not supported. + Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5 + fi + + #Define the new name of the installed command + +# Check whether --with-cfa-name was given. +if test "${with_cfa_name+set}" = set; then : + withval=$with_cfa_name; cfa_name=$withval +else + cfa_name="cfa" +fi + + + CFA_NAME=${cfa_name} + + + #============================================================================== # Installation paths -if test "x$prefix" = "xNONE"; then - cfa_prefix=${ac_default_prefix} -else - cfa_prefix=${prefix} -fi + + if test "x$prefix" = "xNONE"; then + cfa_prefix=${ac_default_prefix} + else + cfa_prefix=${prefix} + fi cat >>confdefs.h <<_ACEOF @@ -2587,12 +2554,12 @@ _ACEOF -CFA_PREFIX=${cfa_prefix} - - -if test "$includedir" = '${prefix}/include'; then - cfa_incdir="${cfa_prefix}/include/${cfa_name}" -else - cfa_incdir=${includedir} -fi + CFA_PREFIX=${cfa_prefix} + + + if test "$includedir" = '${prefix}/include'; then + cfa_incdir="${cfa_prefix}/include/${cfa_name}" + else + cfa_incdir=${includedir} + fi cat >>confdefs.h <<_ACEOF @@ -2600,12 +2567,12 @@ _ACEOF -CFA_INCDIR=${cfa_incdir} - - -if test "$bindir" = '${exec_prefix}/bin'; then - cfa_bindir="${cfa_prefix}/bin" -else - cfa_bindir=${bindir} -fi + CFA_INCDIR=${cfa_incdir} + + + if test "$bindir" = '${exec_prefix}/bin'; then + cfa_bindir="${cfa_prefix}/bin" + else + cfa_bindir=${bindir} + fi cat >>confdefs.h <<_ACEOF @@ -2613,12 +2580,12 @@ _ACEOF -CFA_BINDIR=${cfa_bindir} - - -if test "$libdir" = '${exec_prefix}/lib'; then - cfa_libdir="${cfa_prefix}/lib/${cfa_name}" -else - cfa_libdir=${libdir} -fi + CFA_BINDIR=${cfa_bindir} + + + if test "$libdir" = '${exec_prefix}/lib'; then + cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}" + else + cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}" + fi cat >>confdefs.h <<_ACEOF @@ -2626,5 +2593,6 @@ _ACEOF -CFA_LIBDIR=${cfa_libdir} + CFA_LIBDIR=${cfa_libdir} + Index: libcfa/configure.ac =================================================================== --- libcfa/configure.ac (revision 4dcaed2c212a42d633824e9b88053258a2d0f969) +++ libcfa/configure.ac (revision 37fe3525f53534b29c07f4f1204c5f779836d193) @@ -6,4 +6,6 @@ AC_CONFIG_AUX_DIR([./automake]) +m4_include([../automake/cfa.m4]) + AM_INIT_AUTOMAKE([subdir-objects]) @@ -12,7 +14,5 @@ AC_ARG_PROGRAM -AC_CANONICAL_BUILD -AC_CANONICAL_HOST - +AC_ARG_VAR(ARCHITECTURE, [The architecture to use when building libcfa]) AC_ARG_VAR(CONFIGURATION, [The configuration to use when building libcfa, options are: deubg, nodebug, nolib (prelude-only)]) AC_ARG_VAR(DRIVER_DIR, [The path to the cforall driver directory]) @@ -23,37 +23,19 @@ AC_SUBST(CFACPP) +case $ARCHITECTURE in + "x64" ) ARCH_FLAGS="-m64";; + "x86" ) ARCH_FLAGS="-m32";; + "arm" ) ARCH_FLAGS="";; +esac + +AC_SUBST(ARCH_FLAGS) + +#============================================================================== +#Trasforming cc1 will break compilation +M4CFA_PROGRAM_NAME + #============================================================================== # Installation paths -if test "x$prefix" = "xNONE"; then - cfa_prefix=${ac_default_prefix} -else - cfa_prefix=${prefix} -fi -AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.]) -AC_SUBST(CFA_PREFIX, ${cfa_prefix}) - -if test "$includedir" = '${prefix}/include'; then - cfa_incdir="${cfa_prefix}/include/${cfa_name}" -else - cfa_incdir=${includedir} -fi -AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.]) -AC_SUBST(CFA_INCDIR, ${cfa_incdir}) - -if test "$bindir" = '${exec_prefix}/bin'; then - cfa_bindir="${cfa_prefix}/bin" -else - cfa_bindir=${bindir} -fi -AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.]) -AC_SUBST(CFA_BINDIR, ${cfa_bindir}) - -if test "$libdir" = '${exec_prefix}/lib'; then - cfa_libdir="${cfa_prefix}/lib/${cfa_name}" -else - cfa_libdir=${libdir} -fi -AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.]) -AC_SUBST(CFA_LIBDIR, ${cfa_libdir}) +M4CFA_PARSE_PREFIX # Checks for programs. Index: libcfa/prelude/Makefile.am =================================================================== --- libcfa/prelude/Makefile.am (revision 4dcaed2c212a42d633824e9b88053258a2d0f969) +++ libcfa/prelude/Makefile.am (revision 37fe3525f53534b29c07f4f1204c5f779836d193) @@ -24,4 +24,5 @@ CC = @CFACC@ +AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ $(DEPDIR) : @@ -33,5 +34,5 @@ # create extra forward types/declarations to reduce inclusion of library files extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c - ${AM_V_GEN}gcc -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf + ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf # create forward declarations for gcc builtins @@ -43,5 +44,5 @@ prelude.cf : prelude-gen.cc - ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14 + ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14 @./prelude-gen > $@ @rm ./prelude-gen @@ -53,5 +54,5 @@ # create forward declarations for cfa builtins builtins.cf : builtins.c ${CC} - ${AM_V_GEN}${CC} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po + ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po @@ -67,3 +68,4 @@ rm -rf $(DEPDIR) -MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c prelude.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} +MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf +MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} Index: libcfa/prelude/Makefile.in =================================================================== --- libcfa/prelude/Makefile.in (revision 4dcaed2c212a42d633824e9b88053258a2d0f969) +++ libcfa/prelude/Makefile.in (revision 37fe3525f53534b29c07f4f1204c5f779836d193) @@ -90,9 +90,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ subdir = prelude ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../automake/cfa.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -155,4 +154,6 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +ARCHITECTURE = @ARCHITECTURE@ +ARCH_FLAGS = @ARCH_FLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -169,4 +170,5 @@ CFA_INCDIR = @CFA_INCDIR@ CFA_LIBDIR = @CFA_LIBDIR@ +CFA_NAME = @CFA_NAME@ CFA_PREFIX = @CFA_PREFIX@ CFLAGS = @CFLAGS@ @@ -221,9 +223,5 @@ am__untar = @am__untar@ bindir = @bindir@ -build = @build@ build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ @@ -232,9 +230,5 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -host = @host@ host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ htmldir = @htmldir@ includedir = @includedir@ @@ -269,5 +263,7 @@ cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c noinst_DATA = ../src/prelude.c -MAINTAINERCLEANFILES = gcc-builtins.c gcc-builtins.cf builtins.cf extras.cf bootloader.c prelude.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} +AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ +MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf +MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}} all: all-am @@ -387,4 +383,5 @@ fi mostlyclean-generic: + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: @@ -490,5 +487,5 @@ # create extra forward types/declarations to reduce inclusion of library files extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c - ${AM_V_GEN}gcc -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf + ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf # create forward declarations for gcc builtins @@ -500,5 +497,5 @@ prelude.cf : prelude-gen.cc - ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14 + ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14 @./prelude-gen > $@ @rm ./prelude-gen @@ -510,5 +507,5 @@ # create forward declarations for cfa builtins builtins.cf : builtins.c ${CC} - ${AM_V_GEN}${CC} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po + ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po Index: libcfa/src/Makefile.am =================================================================== --- libcfa/src/Makefile.am (revision 4dcaed2c212a42d633824e9b88053258a2d0f969) +++ libcfa/src/Makefile.am (revision 37fe3525f53534b29c07f4f1204c5f779836d193) @@ -28,6 +28,7 @@ # use -no-include-stdhdr to prevent rebuild cycles # The built sources must not depend on the installed headers -AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr -AM_CFLAGS = -g -Wall -Wno-unused-function +AM_CFAFLAGS = -quiet -in-tree -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr +AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ +AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ CFACC = @CFACC@ @@ -43,5 +44,5 @@ # not all platforms support concurrency, add option do disable it -libsrc += concurrency/CtxSwitch-@host_cpu@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa +libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing Index: libcfa/src/Makefile.in =================================================================== --- libcfa/src/Makefile.in (revision 4dcaed2c212a42d633824e9b88053258a2d0f969) +++ libcfa/src/Makefile.in (revision 37fe3525f53534b29c07f4f1204c5f779836d193) @@ -91,9 +91,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/../automake/cfa.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -151,5 +150,6 @@ interpose.$(OBJEXT) bits/debug.$(OBJEXT) assert.$(OBJEXT) \ exception.$(OBJEXT) virtual.$(OBJEXT) heap.$(OBJEXT) \ - $(am__objects_1) concurrency/CtxSwitch-@host_cpu@.$(OBJEXT) \ + $(am__objects_1) \ + concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \ concurrency/alarm.$(OBJEXT) concurrency/invoke.$(OBJEXT) \ concurrency/preemption.$(OBJEXT) @@ -223,4 +223,6 @@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +ARCHITECTURE = @ARCHITECTURE@ +ARCH_FLAGS = @ARCH_FLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -237,4 +239,5 @@ CFA_INCDIR = @CFA_INCDIR@ CFA_LIBDIR = @CFA_LIBDIR@ +CFA_NAME = @CFA_NAME@ CFA_PREFIX = @CFA_PREFIX@ CFLAGS = @CFLAGS@ @@ -289,9 +292,5 @@ am__untar = @am__untar@ bindir = @bindir@ -build = @build@ build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ @@ -300,9 +299,5 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -host = @host@ host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ htmldir = @htmldir@ includedir = @includedir@ @@ -344,6 +339,7 @@ # use -no-include-stdhdr to prevent rebuild cycles # The built sources must not depend on the installed headers -AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr -AM_CFLAGS = -g -Wall -Wno-unused-function +AM_CFAFLAGS = -quiet -in-tree -B@DRIVER_DIR@ -XCFA --prelude-dir=$(top_builddir)/prelude -imacros prelude.c -I$(srcdir)/stdhdr +AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ +AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ # not all platforms support concurrency, add option do disable it @@ -357,5 +353,5 @@ libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \ exception.c virtual.c heap.cfa ${headers:=.cfa} \ - concurrency/CtxSwitch-@host_cpu@.S concurrency/alarm.cfa \ + concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \ concurrency/invoke.c concurrency/preemption.cfa libcfa_a_SOURCES = ${libsrc} @@ -479,5 +475,5 @@ concurrency/mutex.$(OBJEXT): concurrency/$(am__dirstamp) \ concurrency/$(DEPDIR)/$(am__dirstamp) -concurrency/CtxSwitch-@host_cpu@.$(OBJEXT): \ +concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT): \ concurrency/$(am__dirstamp) \ concurrency/$(DEPDIR)/$(am__dirstamp) @@ -506,5 +502,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelude.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@host_cpu@.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@ARCHITECTURE@.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/invoke.Po@am__quote@ Index: libcfa/src/concurrency/CtxSwitch-x64.S =================================================================== --- libcfa/src/concurrency/CtxSwitch-x64.S (revision 37fe3525f53534b29c07f4f1204c5f779836d193) +++ libcfa/src/concurrency/CtxSwitch-x64.S (revision 37fe3525f53534b29c07f4f1204c5f779836d193) @@ -0,0 +1,1 @@ +CtxSwitch-x86_64.S Index: libcfa/src/concurrency/CtxSwitch-x86.S =================================================================== --- libcfa/src/concurrency/CtxSwitch-x86.S (revision 37fe3525f53534b29c07f4f1204c5f779836d193) +++ libcfa/src/concurrency/CtxSwitch-x86.S (revision 37fe3525f53534b29c07f4f1204c5f779836d193) @@ -0,0 +1,1 @@ +CtxSwitch-i386.S