From 7ffc79556004e42092acf51ff0371872c5f6a50d Mon Sep 17 00:00:00 2001
From: Luca Valente <luca.valente2@unibo.it>
Date: Tue, 18 May 2021 19:21:35 +0200
Subject: [PATCH] Fixed syntax problems

---
 include/archi/chips/pulpissimo/pulp.h | 2 +-
 include/hal/chips/pulpissimo/pulp.h   | 2 +-
 kernel/bench.c                        | 2 +-
 rules/pulpos/targets/pulpissimo.mk    | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/archi/chips/pulpissimo/pulp.h b/include/archi/chips/pulpissimo/pulp.h
index f041530..ee552ec 100644
--- a/include/archi/chips/pulpissimo/pulp.h
+++ b/include/archi/chips/pulpissimo/pulp.h
@@ -26,7 +26,7 @@
 #include "archi/riscv/priv_1_10.h"
 #ifdef __ibex__
 #include "archi/ibex/mhpm.h"
-#else #ifdef __cv32e40p__
+#elif defined(__cv32e40p__)
 #include "archi/cv32e40p/cv32e40p.h"
 #else
 #include "archi/riscv/pcer_v2.h"
diff --git a/include/hal/chips/pulpissimo/pulp.h b/include/hal/chips/pulpissimo/pulp.h
index 14c67ca..7a63ca4 100644
--- a/include/hal/chips/pulpissimo/pulp.h
+++ b/include/hal/chips/pulpissimo/pulp.h
@@ -19,7 +19,7 @@
 
 #ifdef __ibex__
 #include "hal/ibex/ibex.h"
-#else #ifdef __cv32e40p__
+#elif defined(__cv32e40p__)
 #include "hal/cv32e40p/cv32e40p.h"
 #else
 #include "hal/riscv/riscv_v5.h"
diff --git a/kernel/bench.c b/kernel/bench.c
index b69e838..d51fed8 100644
--- a/kernel/bench.c
+++ b/kernel/bench.c
@@ -247,7 +247,7 @@ void illegal_insn_handler_c(void)
 {
 #ifndef __ariane__
   unsigned int exception_address, insn;
-#if defined( __riscv__ ) || defined( __ibex__)
+#if defined( __riscv__ ) || defined( __ibex__) || defined(__cv32e40p__)
   asm("csrr %0, 0x341" : "=r" (exception_address) : );
 #else
   exception_address = hal_spr_read(SPR_EPCR_BASE);
diff --git a/rules/pulpos/targets/pulpissimo.mk b/rules/pulpos/targets/pulpissimo.mk
index b4efdab..25ed391 100644
--- a/rules/pulpos/targets/pulpissimo.mk
+++ b/rules/pulpos/targets/pulpissimo.mk
@@ -5,11 +5,11 @@ PULP_ARCH_CFLAGS ?= -march=rv32imc
 PULP_ARCH_LDFLAGS ?= -march=rv32imc
 PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imc
 else ifdef USE_CV32E40P
-PULP_LDFLAGS += -mhwloopalign
+PULP_LDFLAGS += 
 PULP_CFLAGS += -D__cv32e40p__ -U__riscv__ -UARCHI_CORE_HAS_PULPV2 
-PULP_ARCH_CFLAGS ?=  -march=rv32imcxgap9 -mhwloopalign
-PULP_ARCH_LDFLAGS ?=  -march=rv32imcxgap9 -mhwloopalign
-PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9 -mhwloopalign
+PULP_ARCH_CFLAGS ?=  -march=rv32imcxgap9 
+PULP_ARCH_LDFLAGS ?=  -march=rv32imcxgap9 
+PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9 
 else
 PULP_LDFLAGS      += 
 PULP_CFLAGS       +=  -D__riscv__