adds wrap for scanf in dhrystone

fixes tgc_vp setup in coremark
Merge remote-tracking branch 'origin/main' into develop
2024-08-28 18:13:40 +02:00 · 2024-06-30 17:26:58 +02:00 · 2024-06-30 07:54:36 +02:00 · 2024-03-20 12:29:57 +01:00 · 2023-12-06 10:00:33 +01:00
3 changed files with 3 additions and 4 deletions
--- a/benchmarks/coremark/ee_printf.c
+++ b/benchmarks/coremark/ee_printf.c
@ -664,7 +664,7 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
 void
 uart_send_char(char c)
 {
-#if defined(BOARD_ehrenberg)
+#if defined(BOARD_ehrenberg) || defined(BOARD_tgc_vp)
            while (get_uart_rx_tx_reg_tx_free(uart)==0) ;
            uart_write(uart, c);
            if (c == '\n') {
--- a/benchmarks/dhrystone/Makefile
+++ b/benchmarks/dhrystone/Makefile
@ -9,7 +9,7 @@ HEADERS := dhry.h
 BOARD?=iss
 LINK_TARGET=link
 RISCV_ARCH:=rv32$(ISA)
-ifeq ($(ISA),e)
+ifneq (,$(findstring e,$(ISA)))
    RISCV_ABI:=ilp32e
 else
    RISCV_ABI:=ilp32
@ -17,7 +17,7 @@ endif
 # '-lgcc -lm' are needed to add softfloat routines
 CFLAGS  := -g -O3 -DITERATIONS=$(ITERATIONS) -DHZ=32768 -DTIME -DNO_INIT -fno-inline -fno-builtin-printf -fno-common -Wno-implicit \
 -funroll-loops -fpeel-loops -fgcse-sm -fgcse-las
-
+LDFLAGS := -Wl,--wrap=scanf
 TOOL_DIR=$(dir $(compiler))
 BSP_BASE = ../../bare-metal-bsp
--- a/hello-world/Makefile
+++ b/hello-world/Makefile
@ -1,4 +1,3 @@
 TARGET  = hello
 ISA?=imc
Author	SHA1	Message	Date
Eyck Jentzsch	f3dc9aea54	adds wrap for scanf in dhrystone	2024-08-28 18:13:40 +02:00
Eyck Jentzsch	2f675e9bdd	fixes tgc_vp setup in coremark	2024-06-30 17:26:58 +02:00
Eyck Jentzsch	3114cb265a	Merge remote-tracking branch 'origin/main' into develop	2024-06-30 07:54:36 +02:00
Eyck Jentzsch	fca9f04264	Merge remote-tracking branch 'origin/main' into develop	2024-03-20 12:29:57 +01:00
Eyck Jentzsch	fe1136c7ce	fixes ISA handling	2023-12-06 10:00:33 +01:00
`@ -1,4 +1,3 @@`

	`TARGET = hello`	`TARGET = hello`
	`ISA?=imc`	`ISA?=imc`