Index: head/sys/conf/ldscript.riscv
===================================================================
--- head/sys/conf/ldscript.riscv	(revision 352070)
+++ head/sys/conf/ldscript.riscv	(revision 352071)
@@ -1,148 +1,148 @@
 /* $FreeBSD$ */
 OUTPUT_ARCH(riscv)
 ENTRY(_start)
 
 SEARCH_DIR(/usr/lib);
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = kernbase;
   .text      : AT(ADDR(.text) - kernbase)
   {
     *(.text)
     *(.stub)
     /* .gnu.warning sections are handled specially by elf32.em.  */
     *(.gnu.warning)
     *(.gnu.linkonce.t*)
   } =0x9090
   _etext = .;
   PROVIDE (etext = .);
   .fini      : { *(.fini)    } =0x9090
   .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
   .rodata1   : { *(.rodata1) }
    .interp     : { *(.interp) 	}
   .hash          : { *(.hash)		}
   .dynsym        : { *(.dynsym)		}
   .dynstr        : { *(.dynstr)		}
   .gnu.version   : { *(.gnu.version)	}
   .gnu.version_d   : { *(.gnu.version_d)	}
   .gnu.version_r   : { *(.gnu.version_r)	}
   .note.gnu.build-id : {
     PROVIDE (__build_id_start = .);
     *(.note.gnu.build-id)
     PROVIDE (__build_id_end = .);
   }
   .rel.text      :
     { *(.rel.text) *(.rel.gnu.linkonce.t*) }
   .rela.text     :
     { *(.rela.text) *(.rela.gnu.linkonce.t*) }
   .rel.data      :
     { *(.rel.data) *(.rel.gnu.linkonce.d*) }
   .rela.data     :
     { *(.rela.data) *(.rela.gnu.linkonce.d*) }
   .rel.rodata    :
     { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
   .rela.rodata   :
     { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
   .rel.got       : { *(.rel.got)		}
   .rela.got      : { *(.rela.got)		}
   .rel.ctors     : { *(.rel.ctors)	}
   .rela.ctors    : { *(.rela.ctors)	}
   .rel.dtors     : { *(.rel.dtors)	}
   .rela.dtors    : { *(.rela.dtors)	}
   .rel.init      : { *(.rel.init)	}
   .rela.init     : { *(.rela.init)	}
   .rel.fini      : { *(.rel.fini)	}
   .rela.fini     : { *(.rela.fini)	}
   .rel.bss       : { *(.rel.bss)		}
   .rela.bss      : { *(.rela.bss)		}
   .rel.plt       : { *(.rel.plt)		}
   .rela.plt      : { *(.rela.plt)		}
   .init          : { *(.init)	} =0x9090
   .plt      : { *(.plt)	}
 
   /* Adjust the address for the data segment.  We want to adjust up to
      the same address within the page on the next page up.  */
   . = ALIGN(0x1000) + (. & (0x1000 - 1)) ;
   .data    :
   {
     *(.data)
     *(.gnu.linkonce.d*)
   }
   .data1   : { *(.data1) }
   . = ALIGN(32 / 8);
   _start_ctors = .;
   PROVIDE (start_ctors = .);
   .ctors         :
   {
     *(.ctors)
   }
   _stop_ctors = .;
   PROVIDE (stop_ctors = .);
   .dtors         :
   {
     *(.dtors)
   }
   .got           : { *(.got.plt) *(.got) }
   .dynamic       : { *(.dynamic) }
   /* We want the small data sections together, so single-instruction offsets
      can access them all, and initialized data all before uninitialized, so
      we can shorten the on-disk segment size.  */
   . = ALIGN(8);
   .sdata     :
   {
     __global_pointer$ = . + 0x800;
     *(.sdata)
   }
   _edata  =  .;
   PROVIDE (edata = .);
   /* Ensure __bss_start is associated with the next section in case orphan
      sections are placed directly after .sdata, as has been seen to happen with
      LLD.  */
-  . = .;
+  . = ALIGN(8);
   __bss_start = .;
   .sbss      : { *(.sbss) *(.scommon) }
   .bss       :
   {
    *(.dynbss)
    *(.bss)
    *(COMMON)
   }
   . = ALIGN(8);
   _end = . ;
   PROVIDE (end = .);
   /* Stabs debugging sections.  */
   .stab 0 : { *(.stab) }
   .stabstr 0 : { *(.stabstr) }
   .stab.excl 0 : { *(.stab.excl) }
   .stab.exclstr 0 : { *(.stab.exclstr) }
   .stab.index 0 : { *(.stab.index) }
   .stab.indexstr 0 : { *(.stab.indexstr) }
   .comment 0 : { *(.comment) }
   /* DWARF debug sections.
      Symbols in the DWARF debugging sections are relative to the beginning
      of the section so we begin them at 0.  */
   /* DWARF 1 */
   .debug          0 : { *(.debug) }
   .line           0 : { *(.line) }
   /* GNU DWARF 1 extensions */
   .debug_srcinfo  0 : { *(.debug_srcinfo) }
   .debug_sfnames  0 : { *(.debug_sfnames) }
   /* DWARF 1.1 and DWARF 2 */
   .debug_aranges  0 : { *(.debug_aranges) }
   .debug_pubnames 0 : { *(.debug_pubnames) }
   /* DWARF 2 */
   .debug_info     0 : { *(.debug_info) }
   .debug_abbrev   0 : { *(.debug_abbrev) }
   .debug_line     0 : { *(.debug_line) }
   .debug_frame    0 : { *(.debug_frame) }
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
   .debug_typenames 0 : { *(.debug_typenames) }
   .debug_varnames  0 : { *(.debug_varnames) }
   /* These must appear regardless of  .  */
 }