diff --git a/targets/riscv.ld b/targets/riscv.ld
index 7f4427a8c..6ebee2728 100644
--- a/targets/riscv.ld
+++ b/targets/riscv.ld
@@ -18,7 +18,7 @@ SECTIONS
      * See: http://blog.japaric.io/stack-overflow-protection/ */
     .stack (NOLOAD) :
     {
-        . = ALIGN(4);
+        . = ALIGN(8);
         . += _stack_size;
         _stack_top = .;
     } >RAM
@@ -29,25 +29,25 @@ SECTIONS
     /* Globals with initial value */
     .data :
     {
-        . = ALIGN(4);
+        . = ALIGN(8);
         /* see https://gnu-mcu-eclipse.github.io/arch/riscv/programmer/#the-gp-global-pointer-register */
         PROVIDE( __global_pointer$ = . + (4K / 2) );
         _sdata = .;        /* used by startup code */
         *(.sdata)
         *(.data .data.*)
-        . = ALIGN(4);
+        . = ALIGN(8);
         _edata = .;        /* used by startup code */
     } >RAM AT>FLASH_TEXT
 
     /* Zero-initialized globals  */
     .bss :
     {
-        . = ALIGN(4);
+        . = ALIGN(8);
         _sbss = .;         /* used by startup code */
         *(.sbss)
         *(.bss .bss.*)
         *(COMMON)
-        . = ALIGN(4);
+        . = ALIGN(8);
         _ebss = .;         /* used by startup code */
     } >RAM