Merge pull request #105 from pulp-platform/fix-gcc9.2-1

Minor fixes for GCC 9.2 support
pulp-platform · Jul 26, 2021 · 6aaa646 · 6aaa646
2 parents 5ac08f3 + 02b9c48
commit 6aaa646
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/rtos/pulpos/common/include/pos/implem/implem.h b/rtos/pulpos/common/include/pos/implem/implem.h
@@ -52,15 +52,15 @@ static inline uint32_t pi_cluster_id()
 static inline int pi_cl_cluster_nb_cores()
 {
 #ifdef ARCHI_HAS_CC
-    return __builtin_pulp_CoreCount() + 1;
+    return ARCHI_CLUSTER_NB_PE + 1;
 #else
-    return __builtin_pulp_CoreCount();
+    return ARCHI_CLUSTER_NB_PE;
 #endif
 }
 
 static inline uint32_t pi_cl_cluster_nb_pe_cores()
 {
-    return __builtin_pulp_CoreCount();
+    return ARCHI_CLUSTER_NB_PE;
 }
 
 static inline uint32_t pi_is_fc()
@@ -171,4 +171,4 @@ extern unsigned char __l1_heap_size;
 
 #define rt_platform() __PLATFORM__
 
-#endif
+#endif
diff --git a/rtos/pulpos/pulp/drivers/cluster/pe-eu-v3.S b/rtos/pulpos/pulp/drivers/cluster/pe-eu-v3.S
@@ -251,7 +251,7 @@ pos_set_slave_stack:
     // and thus we need to take the next stack
     addi     t5, s3, 1
 #endif
-    p.mul   t4, t5, a0
+    mul   t4, t5, a0
     add     sp, t4, t0
 
     ret
diff --git a/rtos/pulpos/pulp_archi/include/archi/riscv/builtins_v2.h b/rtos/pulpos/pulp_archi/include/archi/riscv/builtins_v2.h
@@ -294,7 +294,7 @@ static inline unsigned int __attribute__ ((always_inline)) __ExtInsMaskSafe(unsi
 
 #define __COREID()					__builtin_pulp_CoreId()
 #define __CLUSTERID()				__builtin_pulp_ClusterId()
-#define __NCORE()					__builtin_pulp_CoreCount()
+#define __NCORE()					(ARCHI_CLUSTER_NB_PE)
 #define __ISFC()					__builtin_pulp_IsFc()
 
 #define __SPRWRITE(x, y)				__builtin_pulp_spr_write(x, y)

diff --git a/rtos/pulpos/pulp_hal/include/hal/riscv/builtins_v2.h b/rtos/pulpos/pulp_hal/include/hal/riscv/builtins_v2.h
@@ -290,7 +290,7 @@ typedef unsigned int rt_pointerT;
 
 #define __COREID()					__builtin_pulp_CoreId()
 #define __CLUSTERID()				__builtin_pulp_ClusterId()
-#define __NCORE()					__builtin_pulp_CoreCount()
+#define __NCORE()					(ARCHI_CLUSTER_NB_PE)
 #define __ISFC()					__builtin_pulp_IsFc()
 
 #define __SPRWRITE(x, y)				__builtin_pulp_spr_write(x, y)