diff --git a/src/app/prototest/Makefile.inc b/src/app/prototest/Makefile.inc
index 957591ad8c2d34ed784cf6cd614d9e11243212e7..a33fd487b3eebe8763d87573be283ceb25f2162d 100644
--- a/src/app/prototest/Makefile.inc
+++ b/src/app/prototest/Makefile.inc
@@ -1,3 +1,7 @@
+ifeq (${aspectc}, 1)
+	CXX_FLAGS += --Xweaver -asrc/app/prototest/prototest.ah --Xcompiler
+endif
+
 ifeq (${prototest_bench_energy}, 1)
 	loop ?= 1
 	COMMON_FLAGS += -DPROTOTEST_BENCH_ENERGY
diff --git a/src/arch/msp430fr5969lp/arch.cc b/src/arch/msp430fr5969lp/arch.cc
index 1eb34b5bc538f900763a34a0abe09a890101b211..3f0eb3c352b5c0a2a60e6e77271ad7f3232ac99e 100644
--- a/src/arch/msp430fr5969lp/arch.cc
+++ b/src/arch/msp430fr5969lp/arch.cc
@@ -1,6 +1,10 @@
 #include "arch.h"
 #include <msp430.h>
 
+#ifdef __acweaving
+#define __delay_cycles(x)
+#endif
+
 void Arch::setup(void)
 {
 	WDTCTL = WDTPW | WDTHOLD;
@@ -157,6 +161,7 @@ Arch arch;
 
 #include "driver/uptime.h"
 
+#ifndef __acweaving
 __attribute__((interrupt(TIMER1_A1_VECTOR))) __attribute__((wakeup)) void handle_timer1_overflow()
 {
 	if (TA1IV == 0x0e) {
@@ -168,5 +173,6 @@ __attribute__((interrupt(TIMER1_A1_VECTOR))) __attribute__((wakeup)) void handle
 #endif
 	}
 }
+#endif
 
 #endif /* defined(WITH_LOOP) || defined(TIMER_S) */
diff --git a/src/arch/msp430fr5994lp/arch.cc b/src/arch/msp430fr5994lp/arch.cc
index 1eb34b5bc538f900763a34a0abe09a890101b211..3f0eb3c352b5c0a2a60e6e77271ad7f3232ac99e 100644
--- a/src/arch/msp430fr5994lp/arch.cc
+++ b/src/arch/msp430fr5994lp/arch.cc
@@ -1,6 +1,10 @@
 #include "arch.h"
 #include <msp430.h>
 
+#ifdef __acweaving
+#define __delay_cycles(x)
+#endif
+
 void Arch::setup(void)
 {
 	WDTCTL = WDTPW | WDTHOLD;
@@ -157,6 +161,7 @@ Arch arch;
 
 #include "driver/uptime.h"
 
+#ifndef __acweaving
 __attribute__((interrupt(TIMER1_A1_VECTOR))) __attribute__((wakeup)) void handle_timer1_overflow()
 {
 	if (TA1IV == 0x0e) {
@@ -168,5 +173,6 @@ __attribute__((interrupt(TIMER1_A1_VECTOR))) __attribute__((wakeup)) void handle
 #endif
 	}
 }
+#endif
 
 #endif /* defined(WITH_LOOP) || defined(TIMER_S) */