Revert "no cgo everything in fakecgo"

This reverts commit 3adbdc7.
TotallyGamerJet · Apr 28, 2024 · 7af1ebf · 7af1ebf
1 parent ce45caf
commit 7af1ebf
Show file tree

Hide file tree

Showing 25 changed files with 15 additions and 41 deletions.
diff --git a/internal/fakecgo/callbacks.go b/internal/fakecgo/callbacks.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 package fakecgo
 

diff --git a/internal/fakecgo/doc.go b/internal/fakecgo/doc.go
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 // Package fakecgo implements the Cgo runtime (runtime/cgo) entirely in Go.
 // This allows code that calls into C to function properly when CGO_ENABLED=0.

diff --git a/internal/fakecgo/gen.go b/internal/fakecgo/gen.go
@@ -20,7 +20,7 @@ const templateSymbols = `// Code generated by 'go generate' with gen.go. DO NOT
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 package fakecgo
 
@@ -88,7 +88,7 @@ const templateTrampolinesStubs = `// Code generated by 'go generate' with gen.go
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 #include "textflag.h"
 
@@ -105,8 +105,6 @@ const templateSymbolsGoos = `// Code generated by 'go generate' with gen.go. DO
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo
-
 package fakecgo
 
 {{- range $location := . }}

diff --git a/internal/fakecgo/go_darwin_amd64.go b/internal/fakecgo/go_darwin_amd64.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !cgo
-
 package fakecgo
 
 import "unsafe"

diff --git a/internal/fakecgo/go_darwin_arm64.go b/internal/fakecgo/go_darwin_arm64.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !cgo
-
 package fakecgo
 
 import "unsafe"

diff --git a/internal/fakecgo/go_freebsd_amd64.go b/internal/fakecgo/go_freebsd_amd64.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !cgo
-
 package fakecgo
 
 import "unsafe"

diff --git a/internal/fakecgo/go_freebsd_arm64.go b/internal/fakecgo/go_freebsd_arm64.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !cgo
-
 package fakecgo
 
 import "unsafe"
@@ -16,7 +14,7 @@ func _cgo_sys_thread_start(ts *ThreadStart) {
 	var size size_t
 	var err int
 
-	// fprintf(stderr, "runtime/cgo: _cgo_sys_thread_start: fn=%p, g=%p\n", ts->fn, ts->g); // debug
+	//fprintf(stderr, "runtime/cgo: _cgo_sys_thread_start: fn=%p, g=%p\n", ts->fn, ts->g); // debug
 	sigfillset(&ign)
 	pthread_sigmask(SIG_SETMASK, &ign, &oset)
 

diff --git a/internal/fakecgo/go_libinit.go b/internal/fakecgo/go_libinit.go
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 package fakecgo
 

diff --git a/internal/fakecgo/go_linux_amd64.go b/internal/fakecgo/go_linux_amd64.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !cgo
-
 package fakecgo
 
 import "unsafe"

diff --git a/internal/fakecgo/go_linux_arm64.go b/internal/fakecgo/go_linux_arm64.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !cgo
-
 package fakecgo
 
 import "unsafe"

diff --git a/internal/fakecgo/go_setenv.go b/internal/fakecgo/go_setenv.go
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 package fakecgo
 

diff --git a/internal/fakecgo/go_util.go b/internal/fakecgo/go_util.go
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 package fakecgo
 

diff --git a/internal/fakecgo/iscgo.go b/internal/fakecgo/iscgo.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 // The runtime package contains an uninitialized definition
 // for runtime·iscgo. Override it to tell the runtime we're here.

diff --git a/internal/fakecgo/libcgo.go b/internal/fakecgo/libcgo.go
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 package fakecgo
 

diff --git a/internal/fakecgo/libcgo_darwin.go b/internal/fakecgo/libcgo_darwin.go
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo
-
 package fakecgo
 
 type (

diff --git a/internal/fakecgo/libcgo_freebsd.go b/internal/fakecgo/libcgo_freebsd.go
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo
-
 package fakecgo
 
 type (

diff --git a/internal/fakecgo/libcgo_linux.go b/internal/fakecgo/libcgo_linux.go
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo
-
 package fakecgo
 
 type (

diff --git a/internal/fakecgo/setenv.go b/internal/fakecgo/setenv.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 package fakecgo
 

diff --git a/internal/fakecgo/symbols.go b/internal/fakecgo/symbols.go
diff --git a/internal/fakecgo/symbols_darwin.go b/internal/fakecgo/symbols_darwin.go
diff --git a/internal/fakecgo/symbols_freebsd.go b/internal/fakecgo/symbols_freebsd.go
diff --git a/internal/fakecgo/symbols_linux.go b/internal/fakecgo/symbols_linux.go
diff --git a/internal/fakecgo/trampolines_amd64.s b/internal/fakecgo/trampolines_amd64.s
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || linux || freebsd)
+//go:build darwin || linux || freebsd
 
 /*
 trampoline for emulating required C functions for cgo in go (see cgo.go)

diff --git a/internal/fakecgo/trampolines_arm64.s b/internal/fakecgo/trampolines_arm64.s
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 #include "textflag.h"
 #include "go_asm.h"

diff --git a/internal/fakecgo/trampolines_stubs.s b/internal/fakecgo/trampolines_stubs.s
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2022 The Ebitengine Authors
 
-//go:build !cgo && (darwin || freebsd || linux)
+//go:build darwin || freebsd || linux
 
 #include "textflag.h"