diff --git a/include/pmsis.h b/include/pmsis.h
new file mode 100644
index 0000000..c72ba3a
--- /dev/null
+++ b/include/pmsis.h
@@ -0,0 +1,9 @@
+#ifndef __FAKE_PMSIS_H__
+#define __FAKE_PMSIS_H__
+
+// simply include the runtime equivalent of pmsis.h: pulp.h
+#include "pulp.h"
+#define pi_core_id get_core_id
+#define pi_cl_team_barrier(x) synch_barrier()
+
+#endif
diff --git a/rules/pulpos/targets/pulp_cluster.mk b/rules/pulpos/targets/pulp_cluster.mk
index 033b2c6..3905eaa 100644
--- a/rules/pulpos/targets/pulp_cluster.mk
+++ b/rules/pulpos/targets/pulp_cluster.mk
@@ -13,9 +13,9 @@ PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9 -mnohwloop
 else
 PULP_LDFLAGS      += 
 PULP_CFLAGS       +=  -D__riscv__
-PULP_ARCH_CFLAGS ?=  -march=rv32imcxgap9
-PULP_ARCH_LDFLAGS ?=  -march=rv32imcxgap9
-PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9
+PULP_ARCH_CFLAGS ?=  -march=rv32imcxpulpnn
+PULP_ARCH_LDFLAGS ?=  -march=rv32imcxpulpnn
+PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxpulpnn
 endif
 
 PULP_CFLAGS    += -fdata-sections -ffunction-sections -include chips/pulp_cluster/config.h -I$(PULPRT_HOME)/include/chips/pulp_cluster