diff --git a/cmake/modules/AutoGenGo.cmake b/cmake/modules/AutoGenGo.cmake
index fa695e6..b5ea13f 100644
--- a/cmake/modules/AutoGenGo.cmake
+++ b/cmake/modules/AutoGenGo.cmake
@@ -142,7 +142,7 @@
       ERROR_VARIABLE errmsg
       RESULT_VARIABLE exitstatus)
     if(${exitstatus} MATCHES 0)
-      file(APPEND ${outfile} "const CacheLineSize = ${result}")
+      file(APPEND ${outfile} "const CacheLinePadSize = ${result}")
     else()
       message(FATAL_ERROR "goarch.sh invocation failed: ${errmsg}")
     endif()
@@ -243,7 +243,7 @@
   file(APPEND ${outfile} "const version = ")
   emitversionstring(${outfile} ${srcroot})
   file(APPEND ${outfile} "\n")
-  file(APPEND ${outfile} "const stackGuardMultiplier = 1\n")
+  file(APPEND ${outfile} "const stackGuardMultiplierDefault = 1\n")
   file(APPEND ${outfile} "const goexperiment = ``\n")
 endfunction()
 
diff --git a/libgo/CMakeLists.txt b/libgo/CMakeLists.txt
index 821d171..a66021b 100644
--- a/libgo/CMakeLists.txt
+++ b/libgo/CMakeLists.txt
@@ -426,13 +426,11 @@
 
 # C files that happen to be living in other packages.
 list(APPEND runtimecfiles
-  "go/bytes/indexbyte.c"
   "go/internal/bytealg/bytealg.c"
   "go/log/syslog/syslog_c.c"
   "go/reflect/makefunc_ffi_c.c"
   "go/runtime/internal/atomic/atomic.c"
   "go/internal/cpu/cpu_gccgo.c"
-  "go/strings/indexbyte.c"
   "go/sync/atomic/atomic.c"
   "go/sync/cas.c"
   "go/syscall/errno.c"
@@ -563,6 +561,7 @@
 set(extra_check_libs_cmd_go_internal_generate "${libgo_binroot}/libgotool.a")
 set(extra_check_libs_cmd_go_internal_get "${libgo_binroot}/libgotool.a")
 set(extra_check_libs_cmd_go_internal_load "${libgo_binroot}/libgotool.a")
+set(extra_check_libs_cmd_go_internal_lockedfile "${libgo_binroot}/libgotool.a")
 set(extra_check_libs_cmd_go_internal_imports "${libgo_binroot}/libgotool.a")
 set(extra_check_libs_cmd_go_internal_modconv "${libgo_binroot}/libgotool.a")
 set(extra_check_libs_cmd_go_internal_modfetch "${libgo_binroot}/libgotool.a")