diff --git a/hw/bsp/circuitplayground_express/samd21g18a_flash.ld b/hw/bsp/circuitplayground_express/samd21g18a_flash.ld
index 7fc42171b..f0c93340c 100644
--- a/hw/bsp/circuitplayground_express/samd21g18a_flash.ld
+++ b/hw/bsp/circuitplayground_express/samd21g18a_flash.ld
@@ -42,6 +42,8 @@ MEMORY
 /* The stack size used by the application. NOTE: you need to adjust according to your application. */
 STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
 
+ENTRY(Reset_Handler)
+
 /* Section Definitions */
 SECTIONS
 {
diff --git a/hw/bsp/feather_m0_express/samd21g18a_flash.ld b/hw/bsp/feather_m0_express/samd21g18a_flash.ld
index 7fc42171b..f0c93340c 100644
--- a/hw/bsp/feather_m0_express/samd21g18a_flash.ld
+++ b/hw/bsp/feather_m0_express/samd21g18a_flash.ld
@@ -42,6 +42,8 @@ MEMORY
 /* The stack size used by the application. NOTE: you need to adjust according to your application. */
 STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
 
+ENTRY(Reset_Handler)
+
 /* Section Definitions */
 SECTIONS
 {
diff --git a/hw/bsp/feather_m4_express/samd51g19a_flash.ld b/hw/bsp/feather_m4_express/samd51g19a_flash.ld
index cf5db3800..f1a021d75 100644
--- a/hw/bsp/feather_m4_express/samd51g19a_flash.ld
+++ b/hw/bsp/feather_m4_express/samd51g19a_flash.ld
@@ -44,6 +44,8 @@ MEMORY
 /* The stack size used by the application. NOTE: you need to adjust according to your application. */
 STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0xC000;
 
+ENTRY(Reset_Handler)
+
 /* Section Definitions */
 SECTIONS
 {
diff --git a/hw/bsp/itsybitsy_m0/samd21g18a_flash.ld b/hw/bsp/itsybitsy_m0/samd21g18a_flash.ld
index 7fc42171b..f0c93340c 100644
--- a/hw/bsp/itsybitsy_m0/samd21g18a_flash.ld
+++ b/hw/bsp/itsybitsy_m0/samd21g18a_flash.ld
@@ -42,6 +42,8 @@ MEMORY
 /* The stack size used by the application. NOTE: you need to adjust according to your application. */
 STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
 
+ENTRY(Reset_Handler)
+
 /* Section Definitions */
 SECTIONS
 {
diff --git a/hw/bsp/itsybitsy_m4/samd51g19a_flash.ld b/hw/bsp/itsybitsy_m4/samd51g19a_flash.ld
index cf5db3800..f1a021d75 100644
--- a/hw/bsp/itsybitsy_m4/samd51g19a_flash.ld
+++ b/hw/bsp/itsybitsy_m4/samd51g19a_flash.ld
@@ -44,6 +44,8 @@ MEMORY
 /* The stack size used by the application. NOTE: you need to adjust according to your application. */
 STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0xC000;
 
+ENTRY(Reset_Handler)
+
 /* Section Definitions */
 SECTIONS
 {
diff --git a/hw/bsp/metro_m0_express/samd21g18a_flash.ld b/hw/bsp/metro_m0_express/samd21g18a_flash.ld
index 7fc42171b..f0c93340c 100644
--- a/hw/bsp/metro_m0_express/samd21g18a_flash.ld
+++ b/hw/bsp/metro_m0_express/samd21g18a_flash.ld
@@ -42,6 +42,8 @@ MEMORY
 /* The stack size used by the application. NOTE: you need to adjust according to your application. */
 STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
 
+ENTRY(Reset_Handler)
+
 /* Section Definitions */
 SECTIONS
 {
diff --git a/hw/bsp/metro_m4_express/samd51g19a_flash.ld b/hw/bsp/metro_m4_express/samd51g19a_flash.ld
index cf5db3800..f1a021d75 100644
--- a/hw/bsp/metro_m4_express/samd51g19a_flash.ld
+++ b/hw/bsp/metro_m4_express/samd51g19a_flash.ld
@@ -44,6 +44,8 @@ MEMORY
 /* The stack size used by the application. NOTE: you need to adjust according to your application. */
 STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0xC000;
 
+ENTRY(Reset_Handler)
+
 /* Section Definitions */
 SECTIONS
 {
diff --git a/hw/bsp/seeeduino_xiao/samd21g18a_flash.ld b/hw/bsp/seeeduino_xiao/samd21g18a_flash.ld
index bae38a881..cf11c4c35 100644
--- a/hw/bsp/seeeduino_xiao/samd21g18a_flash.ld
+++ b/hw/bsp/seeeduino_xiao/samd21g18a_flash.ld
@@ -52,8 +52,7 @@ SECTIONS
         . = ALIGN(4);
         _sfixed = .;
         KEEP(*(.vectors .vectors.*))
-        *(.text*)
-	*(.gnu.linkonce.t.*)
+        *(.text .text.* .gnu.linkonce.t.*)
         *(.glue_7t) *(.glue_7)
         *(.rodata .rodata* .gnu.linkonce.r.*)
         *(.ARM.extab* .gnu.linkonce.armextab.*)