diff --git a/FreeRTOS/Demo/RISC-V-Qemu-virt_GCC/Makefile b/FreeRTOS/Demo/RISC-V-Qemu-virt_GCC/Makefile
index 0c53cbe0f54..bd24333a208 100644
--- a/FreeRTOS/Demo/RISC-V-Qemu-virt_GCC/Makefile
+++ b/FreeRTOS/Demo/RISC-V-Qemu-virt_GCC/Makefile
@@ -24,7 +24,7 @@ LDFLAGS = -nostartfiles -Tfake_rom.lds \
 	-march=rv32imac -mabi=ilp32 -mcmodel=medany \
 	-Xlinker --gc-sections \
 	-Xlinker --defsym=__stack_size=300 \
-	-Xlinker -Map=RTOSDemo.map
+	-Xlinker -Map=$(BUILD_DIR)/RTOSDemo.map
 
 ifeq ($(DEBUG), 1)
     CFLAGS += -Og -ggdb3
diff --git a/FreeRTOS/Demo/RISC-V-Qemu-virt_GCC/fake_rom.lds b/FreeRTOS/Demo/RISC-V-Qemu-virt_GCC/fake_rom.lds
index b63fad8f053..ca66b669d52 100644
--- a/FreeRTOS/Demo/RISC-V-Qemu-virt_GCC/fake_rom.lds
+++ b/FreeRTOS/Demo/RISC-V-Qemu-virt_GCC/fake_rom.lds
@@ -30,9 +30,8 @@ SECTIONS
 		_etext = .;
 	} >rom AT>rom
 
-	.rodata.align :
+	.rodata.align ALIGN(4):
 	{
-		. = ALIGN(4);
 		_rodata = .;
 	} >rom AT>rom
 
diff --git a/FreeRTOS/Demo/RISC-V-spike-htif_GCC/Makefile b/FreeRTOS/Demo/RISC-V-spike-htif_GCC/Makefile
index c9e0bf390a0..51cb2bd1b4a 100644
--- a/FreeRTOS/Demo/RISC-V-spike-htif_GCC/Makefile
+++ b/FreeRTOS/Demo/RISC-V-spike-htif_GCC/Makefile
@@ -34,8 +34,8 @@ CFLAGS  = -march=$(MARCH) -mabi=$(MABI) -mcmodel=medany \
 	-ffunction-sections \
 	-fdata-sections \
 	-fno-builtin-printf
-ASFLAGS = -march=$(MARCH) -mabi=$(MABI) -mcmodel=medany
 LDFLAGS = -nostartfiles \
+	-march=$(MARCH) -mabi=$(MABI) -mcmodel=medany \
 	-Xlinker --gc-sections \
 	-Xlinker --defsym=__stack_size=$(STACK_SIZE)
 
@@ -76,7 +76,7 @@ $(BUILD_DIR)/%$(XLEN).o: %.c Makefile
 
 $(BUILD_DIR)/%$(XLEN).o: %.S Makefile
 	@mkdir -p $(@D)
-	$(CC) $(CPPFLAGS) $(ASFLAGS) -MMD -MP -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -MMD -MP -c $< -o $@
 
 # Run lds through the C preprocessor, to replace BASE_ADDRESS with the actual
 # value. It might be simpler to use sed instead.
diff --git a/FreeRTOS/Demo/RISC-V-spike-htif_GCC/fake_rom.lds b/FreeRTOS/Demo/RISC-V-spike-htif_GCC/fake_rom.lds
index abac8091a77..ea9e9d0ad3f 100644
--- a/FreeRTOS/Demo/RISC-V-spike-htif_GCC/fake_rom.lds
+++ b/FreeRTOS/Demo/RISC-V-spike-htif_GCC/fake_rom.lds
@@ -31,9 +31,8 @@ SECTIONS
 		_etext = .;
 	} >rom AT>rom
 
-	.rodata.align :
+	.rodata.align ALIGN(4):
 	{
-		. = ALIGN(4);
 		_rodata = .;
 	} >rom AT>rom
 
diff --git a/FreeRTOS/Demo/RISC-V_RV32_QEMU_VIRT_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/RISC-V_RV32_QEMU_VIRT_GCC/FreeRTOSConfig.h
index b98df47b999..f336cd5810d 100644
--- a/FreeRTOS/Demo/RISC-V_RV32_QEMU_VIRT_GCC/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/RISC-V_RV32_QEMU_VIRT_GCC/FreeRTOSConfig.h
@@ -103,7 +103,7 @@ to exclude the API function. */
 format the raw data provided by the uxTaskGetSystemState() function in to human
 readable ASCII form.  See the notes in the implementation of vTaskList() within
 FreeRTOS/Source/tasks.c for limitations. */
-#define configUSE_STATS_FORMATTING_FUNCTIONS	1
+#define configUSE_STATS_FORMATTING_FUNCTIONS	0
 
 /* The QEMU target is capable of running all the tests tasks at the same
  * time. */
diff --git a/FreeRTOS/Demo/RISC-V_RV32_QEMU_VIRT_GCC/build/gcc/fake_rom.ld b/FreeRTOS/Demo/RISC-V_RV32_QEMU_VIRT_GCC/build/gcc/fake_rom.ld
index f8059ecca66..6f3cef8035d 100644
--- a/FreeRTOS/Demo/RISC-V_RV32_QEMU_VIRT_GCC/build/gcc/fake_rom.ld
+++ b/FreeRTOS/Demo/RISC-V_RV32_QEMU_VIRT_GCC/build/gcc/fake_rom.ld
@@ -30,9 +30,8 @@ SECTIONS
 		_etext = .;
 	} >rom AT>rom
 
-	.rodata.align :
+	.rodata.align ALIGN(4):
 	{
-		. = ALIGN(4);
 		_rodata = .;
 	} >rom AT>rom