Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ libcfa/src/Makefile.am	(revision 4dcaed2c212a42d633824e9b88053258a2d0f969)
@@ -28,5 +28,5 @@
 # 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@ -imacros prelude.c -I$(srcdir)/stdhdr
+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
 CFACC = @CFACC@
@@ -43,5 +43,5 @@
 
 # not all platforms support concurrency, add option do disable it
-libsrc += concurrency/CtxSwitch-@host_alias@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
+libsrc += concurrency/CtxSwitch-@host_cpu@.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 ba9baadeb7d347b3375a3c22e4ce3628359e9187)
+++ libcfa/src/Makefile.in	(revision 4dcaed2c212a42d633824e9b88053258a2d0f969)
@@ -151,5 +151,5 @@
 	interpose.$(OBJEXT) bits/debug.$(OBJEXT) assert.$(OBJEXT) \
 	exception.$(OBJEXT) virtual.$(OBJEXT) heap.$(OBJEXT) \
-	$(am__objects_1) concurrency/CtxSwitch-@host_alias@.$(OBJEXT) \
+	$(am__objects_1) concurrency/CtxSwitch-@host_cpu@.$(OBJEXT) \
 	concurrency/alarm.$(OBJEXT) concurrency/invoke.$(OBJEXT) \
 	concurrency/preemption.$(OBJEXT)
@@ -344,5 +344,5 @@
 # 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@ -imacros prelude.c -I$(srcdir)/stdhdr
+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
 
@@ -357,5 +357,5 @@
 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
 	exception.c virtual.c heap.cfa ${headers:=.cfa} \
-	concurrency/CtxSwitch-@host_alias@.S concurrency/alarm.cfa \
+	concurrency/CtxSwitch-@host_cpu@.S concurrency/alarm.cfa \
 	concurrency/invoke.c concurrency/preemption.cfa
 libcfa_a_SOURCES = ${libsrc}
@@ -479,5 +479,5 @@
 concurrency/mutex.$(OBJEXT): concurrency/$(am__dirstamp) \
 	concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/CtxSwitch-@host_alias@.$(OBJEXT):  \
+concurrency/CtxSwitch-@host_cpu@.$(OBJEXT):  \
 	concurrency/$(am__dirstamp) \
 	concurrency/$(DEPDIR)/$(am__dirstamp)
@@ -506,5 +506,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_alias@.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)/invoke.Po@am__quote@