* spelling

  * check against current_settings.cputype

compiler/nadd.pas

@@ -1907,7 +1907,7 @@ const
                and (CPUM68K_HAS_ROLROR in cpu_capabilities[current_settings.cputype])
 {$endif m68k}
 {$ifdef riscv}
-               and ([CPURV_HAS_ZBB,CPURV_HAS_ZBKB]*cpu_capabilities[init_settings.cputype]<>[])
+               and ([CPURV_HAS_ZBB,CPURV_HAS_ZBKB]*cpu_capabilities[current_settings.cputype]<>[])
 {$endif riscv}
 {$ifndef cpu64bitalu}
                and (ld.typ=orddef) and

compiler/options.pas

@@ -4843,7 +4843,7 @@ procedure read_arguments(cmd:TCmdStr);
         def_system_macro('FPC_HAS_CEXTENDED');
         def_system_macro('FPC_HAS_RESSTRINITS');
 
-      { these cpus have an inline rol/ror implementaion }
+      { these cpus have an inline rol/ror implementation }
       {$ifdef cpurox}
       {$if defined(m68k)}
         if CPUM68K_HAS_ROLROR in cpu_capabilities[init_settings.cputype] then