diff --git a/scripts/standalone.mk b/scripts/standalone.mk
index e384509c2..0fadde673 100644
--- a/scripts/standalone.mk
+++ b/scripts/standalone.mk
@@ -119,8 +119,13 @@ RISCV_CFLAGS    += -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -mcmodel=$(RISCV_CMOD
 RISCV_CXXFLAGS  += -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -mcmodel=$(RISCV_CMODEL)
 RISCV_ASFLAGS   += -march=$(RISCV_ARCH) -mabi=$(RISCV_ABI) -mcmodel=$(RISCV_CMODEL)
 # Prune unused functions and data
+ifeq ($(PROGRAM),dhrystone)
+RISCV_CFLAGS   += -fno-function-sections -fno-data-sections
+RISCV_CXXFLAGS += -fno-function-sections -fno-data-sections
+else
 RISCV_CFLAGS   += -ffunction-sections -fdata-sections
 RISCV_CXXFLAGS += -ffunction-sections -fdata-sections
+endif
 # Include the Metal headers
 RISCV_CCASFLAGS += -I$(abspath $(BSP_DIR)/install/include/)
 RISCV_CFLAGS    += -I$(abspath $(BSP_DIR)/install/include/)
diff --git a/software/dhrystone b/software/dhrystone
index e3e7e91d4..0ddff533c 160000
--- a/software/dhrystone
+++ b/software/dhrystone
@@ -1 +1 @@
-Subproject commit e3e7e91d48ae15f4a8e395cf998b0abbf5b70542
+Subproject commit 0ddff533cc9052c524990d5ace4560372053314b
diff --git a/software/software-interrupt b/software/software-interrupt
index b10a32d2b..b72fda554 160000
--- a/software/software-interrupt
+++ b/software/software-interrupt
@@ -1 +1 @@
-Subproject commit b10a32d2b079e8e454648bd605b49954ed0fd505
+Subproject commit b72fda55491be700009954eff9056f8a29a1bbac
diff --git a/wit-manifest.json b/wit-manifest.json
index 7ee3c5bd2..9af8744f8 100644
--- a/wit-manifest.json
+++ b/wit-manifest.json
@@ -40,7 +40,7 @@
         "source": "git@github.com:sifive/esdk-settings-generator.git"
     },
     {
-        "commit": "e3e7e91d48ae15f4a8e395cf998b0abbf5b70542",
+        "commit": "0ddff533cc9052c524990d5ace4560372053314b",
         "name": "benchmark-dhrystone",
         "source": "git@github.com:sifive/benchmark-dhrystone.git"
     },
@@ -145,7 +145,7 @@
         "source": "git@github.com:sifive/example-sifive-welcome.git"
     },
     {
-        "commit": "b10a32d2b079e8e454648bd605b49954ed0fd505",
+        "commit": "b72fda55491be700009954eff9056f8a29a1bbac",
         "name": "example-software-interrupt",
         "source": "git@github.com:sifive/example-software-interrupt.git"
     },