From d0b57535edee1c6e0d613a2a8d5e69f4badcc162 Mon Sep 17 00:00:00 2001
From: xushiwei <x@goplus.org>
Date: Thu, 11 Jul 2024 18:20:12 +0800
Subject: [PATCH] support: internal/oserror, io, io/fs

---
 cl/import.go                      |  2 +-
 internal/build/build.go           | 26 ++++++++++++++------------
 internal/lib/{io => _io}/fs/fs.go |  0
 internal/lib/{io => _io}/io.go    |  0
 4 files changed, 15 insertions(+), 13 deletions(-)
 rename internal/lib/{io => _io}/fs/fs.go (100%)
 rename internal/lib/{io => _io}/io.go (100%)

diff --git a/cl/import.go b/cl/import.go
index 388aa57e..88a60938 100644
--- a/cl/import.go
+++ b/cl/import.go
@@ -531,7 +531,7 @@ func ignoreName(name string) bool {
 
 func supportedInternal(name string) bool {
 	return strings.HasPrefix(name, "abi.") || strings.HasPrefix(name, "bytealg.") ||
-		strings.HasPrefix(name, "reflectlite.")
+		strings.HasPrefix(name, "oserror.") || strings.HasPrefix(name, "reflectlite.")
 }
 
 // -----------------------------------------------------------------------------
diff --git a/internal/build/build.go b/internal/build/build.go
index cf3d5847..363598c5 100644
--- a/internal/build/build.go
+++ b/internal/build/build.go
@@ -664,6 +664,8 @@ func canSkipToBuild(pkgPath string) bool {
 	switch pkgPath {
 	case "unsafe":
 		return true
+	case "internal/oserror":
+		return false
 	default:
 		return strings.HasPrefix(pkgPath, "internal/") ||
 			strings.HasPrefix(pkgPath, "runtime/internal/")
@@ -678,18 +680,18 @@ var hasAltPkg = map[string]none{
 	"internal/abi":         {},
 	"internal/bytealg":     {},
 	"internal/reflectlite": {},
-	"io":                   {},
-	"io/fs":                {},
-	"math":                 {},
-	"math/cmplx":           {},
-	"reflect":              {},
-	"sync":                 {},
-	"sync/atomic":          {},
-	"syscall":              {},
-	"time":                 {},
-	"os":                   {},
-	"os/exec":              {},
-	"runtime":              {},
+	//"io":                 {},
+	//"io/fs":              {},
+	"math":        {},
+	"math/cmplx":  {},
+	"reflect":     {},
+	"sync":        {},
+	"sync/atomic": {},
+	"syscall":     {},
+	"time":        {},
+	"os":          {},
+	"os/exec":     {},
+	"runtime":     {},
 }
 
 var overlayFiles = map[string]string{
diff --git a/internal/lib/io/fs/fs.go b/internal/lib/_io/fs/fs.go
similarity index 100%
rename from internal/lib/io/fs/fs.go
rename to internal/lib/_io/fs/fs.go
diff --git a/internal/lib/io/io.go b/internal/lib/_io/io.go
similarity index 100%
rename from internal/lib/io/io.go
rename to internal/lib/_io/io.go