From e7422b05915759a8e4a8f38382ffd4d38d4fa2ea Mon Sep 17 00:00:00 2001
From: Dan Peterson <danp@danp.net>
Date: Sun, 6 Nov 2022 17:03:00 -0400
Subject: [PATCH] net: adjust build tags for darwin libc calls

Support for direct libc calls was added in CL 446178 but the build
tags weren't quite activating it when cgo was not enabled. Adjust them
and add a new supporting file for darwin.

This should use the new direct libc calls with both CGO_ENABLED=0 and
CGO_ENABLED=1 when building for darwin.

Updates #12524

Change-Id: Ieee4b298dee13f389ed3a63c0a4a3a18c9180163
Reviewed-on: https://go-review.googlesource.com/c/go/+/448020
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Dan Peterson <danp@danp.net>
Auto-Submit: Ian Lance Taylor <iant@google.com>
---
 src/net/cgo_bsd.go          | 2 +-
 src/net/cgo_darwin.go       | 9 +++++++++
 src/net/cgo_stub.go         | 2 +-
 src/net/cgo_unix.go         | 2 +-
 src/net/cgo_unix_syscall.go | 2 +-
 src/net/cgo_unix_test.go    | 2 +-
 src/net/netgo.go            | 4 ++--
 src/net/netgo_unix_test.go  | 2 +-
 8 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 src/net/cgo_darwin.go

diff --git a/src/net/cgo_bsd.go b/src/net/cgo_bsd.go
index 1456289b0691b..082e91faa8afb 100644
--- a/src/net/cgo_bsd.go
+++ b/src/net/cgo_bsd.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 && !netgo && (darwin || dragonfly || freebsd)
+//go:build cgo && !netgo && (dragonfly || freebsd)
 
 package net
 
diff --git a/src/net/cgo_darwin.go b/src/net/cgo_darwin.go
new file mode 100644
index 0000000000000..129dd937fe077
--- /dev/null
+++ b/src/net/cgo_darwin.go
@@ -0,0 +1,9 @@
+// Copyright 2022 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package net
+
+import "internal/syscall/unix"
+
+const cgoAddrInfoFlags = (unix.AI_CANONNAME | unix.AI_V4MAPPED | unix.AI_ALL) & unix.AI_MASK
diff --git a/src/net/cgo_stub.go b/src/net/cgo_stub.go
index 298d829f6fa6d..c901d4bb80abd 100644
--- a/src/net/cgo_stub.go
+++ b/src/net/cgo_stub.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 || netgo
+//go:build (!cgo && !darwin) || netgo
 
 package net
 
diff --git a/src/net/cgo_unix.go b/src/net/cgo_unix.go
index a94472733815f..4ca0fbee73ea2 100644
--- a/src/net/cgo_unix.go
+++ b/src/net/cgo_unix.go
@@ -7,7 +7,7 @@
 // Instead of C.foo it uses _C_foo, which is defined in either
 // cgo_unix_cgo.go or cgo_unix_syscall.go
 
-//go:build cgo && !netgo && unix
+//go:build !netgo && ((cgo && unix) || darwin)
 
 package net
 
diff --git a/src/net/cgo_unix_syscall.go b/src/net/cgo_unix_syscall.go
index 7170f14c466bd..c5c27967b1350 100644
--- a/src/net/cgo_unix_syscall.go
+++ b/src/net/cgo_unix_syscall.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 && !netgo && darwin
+//go:build !netgo && darwin
 
 package net
 
diff --git a/src/net/cgo_unix_test.go b/src/net/cgo_unix_test.go
index af9f9dc3f2c8f..86726dd7e5c70 100644
--- a/src/net/cgo_unix_test.go
+++ b/src/net/cgo_unix_test.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 && !netgo && unix
+//go:build (cgo || darwin) && !netgo && unix
 
 package net
 
diff --git a/src/net/netgo.go b/src/net/netgo.go
index 75baa880354c5..e478c88b30358 100644
--- a/src/net/netgo.go
+++ b/src/net/netgo.go
@@ -4,9 +4,9 @@
 
 // Default netGo to true if the netgo build tag is being used, or the
 // C library DNS routines are not available. Note that the C library
-// routines are always available on Windows.
+// routines are always available on Darwin and Windows.
 
-//go:build netgo || (!cgo && !windows)
+//go:build netgo || (!cgo && !darwin && !windows)
 
 package net
 
diff --git a/src/net/netgo_unix_test.go b/src/net/netgo_unix_test.go
index 019772aa6aaab..5ddebab143759 100644
--- a/src/net/netgo_unix_test.go
+++ b/src/net/netgo_unix_test.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 || netgo) && (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris)
+//go:build (!cgo || netgo) && (dragonfly || freebsd || linux || netbsd || openbsd || solaris)
 
 package net