Intermediate changes

11 files changed, 11 insertions, 307 deletions

diff --git a/contrib/go/_std_1.21/src/net/http/cgi/ya.make b/contrib/go/_std_1.21/src/net/http/cgi/ya.make
index 4e4539d285..24f19f0603 100644
--- a/contrib/go/_std_1.21/src/net/http/cgi/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/cgi/ya.make
@@ -1,25 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		child.go
-		host.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		child.go
-		host.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		child.go
-		host.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		child.go
-		host.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		child.go
 		host.go
diff --git a/contrib/go/_std_1.21/src/net/http/cookiejar/ya.make b/contrib/go/_std_1.21/src/net/http/cookiejar/ya.make
index cc5be5b198..2dba61b24c 100644
--- a/contrib/go/_std_1.21/src/net/http/cookiejar/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/cookiejar/ya.make
@@ -1,25 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		jar.go
-		punycode.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		jar.go
-		punycode.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		jar.go
-		punycode.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		jar.go
-		punycode.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		jar.go
 		punycode.go
diff --git a/contrib/go/_std_1.21/src/net/http/fcgi/ya.make b/contrib/go/_std_1.21/src/net/http/fcgi/ya.make
index 843eaa8164..4de8bb0917 100644
--- a/contrib/go/_std_1.21/src/net/http/fcgi/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/fcgi/ya.make
@@ -1,25 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		child.go
-		fcgi.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		child.go
-		fcgi.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		child.go
-		fcgi.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		child.go
-		fcgi.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		child.go
 		fcgi.go
diff --git a/contrib/go/_std_1.21/src/net/http/httptest/ya.make b/contrib/go/_std_1.21/src/net/http/httptest/ya.make
index d5726ffd3c..06e966bc41 100644
--- a/contrib/go/_std_1.21/src/net/http/httptest/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/httptest/ya.make
@@ -1,29 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		httptest.go
-		recorder.go
-		server.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		httptest.go
-		recorder.go
-		server.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		httptest.go
-		recorder.go
-		server.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		httptest.go
-		recorder.go
-		server.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		httptest.go
 		recorder.go
diff --git a/contrib/go/_std_1.21/src/net/http/httptrace/ya.make b/contrib/go/_std_1.21/src/net/http/httptrace/ya.make
index d06d80bb28..c5b885afc7 100644
--- a/contrib/go/_std_1.21/src/net/http/httptrace/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/httptrace/ya.make
@@ -1,21 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		trace.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		trace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		trace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		trace.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		trace.go
     )
diff --git a/contrib/go/_std_1.21/src/net/http/httputil/ya.make b/contrib/go/_std_1.21/src/net/http/httputil/ya.make
index fbc2a774f5..d40d3d286a 100644
--- a/contrib/go/_std_1.21/src/net/http/httputil/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/httputil/ya.make
@@ -1,33 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		dump.go
-		httputil.go
-		persist.go
-		reverseproxy.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		dump.go
-		httputil.go
-		persist.go
-		reverseproxy.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		dump.go
-		httputil.go
-		persist.go
-		reverseproxy.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		dump.go
-		httputil.go
-		persist.go
-		reverseproxy.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		dump.go
 		httputil.go
diff --git a/contrib/go/_std_1.21/src/net/http/internal/ascii/ya.make b/contrib/go/_std_1.21/src/net/http/internal/ascii/ya.make
index 2126a2e08a..16d4206f5c 100644
--- a/contrib/go/_std_1.21/src/net/http/internal/ascii/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/internal/ascii/ya.make
@@ -1,21 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		print.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		print.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		print.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		print.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		print.go
     )
diff --git a/contrib/go/_std_1.21/src/net/http/internal/testcert/ya.make b/contrib/go/_std_1.21/src/net/http/internal/testcert/ya.make
index 29b67101e5..50da206fc9 100644
--- a/contrib/go/_std_1.21/src/net/http/internal/testcert/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/internal/testcert/ya.make
@@ -1,21 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		testcert.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		testcert.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		testcert.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		testcert.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		testcert.go
     )
diff --git a/contrib/go/_std_1.21/src/net/http/internal/ya.make b/contrib/go/_std_1.21/src/net/http/internal/ya.make
index 81ef1d1d0d..3ffd8b8800 100644
--- a/contrib/go/_std_1.21/src/net/http/internal/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/internal/ya.make
@@ -1,21 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		chunked.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		chunked.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		chunked.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		chunked.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		chunked.go
     )
diff --git a/contrib/go/_std_1.21/src/net/http/pprof/ya.make b/contrib/go/_std_1.21/src/net/http/pprof/ya.make
index 3b6671c8e8..71c44fe191 100644
--- a/contrib/go/_std_1.21/src/net/http/pprof/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/pprof/ya.make
@@ -1,21 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		pprof.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		pprof.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		pprof.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		pprof.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		pprof.go
     )
diff --git a/contrib/go/_std_1.21/src/net/http/ya.make b/contrib/go/_std_1.21/src/net/http/ya.make
index de73451061..1d9d825c3b 100644
--- a/contrib/go/_std_1.21/src/net/http/ya.make
+++ b/contrib/go/_std_1.21/src/net/http/ya.make
@@ -1,109 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		client.go
-		clone.go
-		cookie.go
-		doc.go
-		filetransport.go
-		fs.go
-		h2_bundle.go
-		h2_error.go
-		header.go
-		http.go
-		jar.go
-		method.go
-		request.go
-		response.go
-		responsecontroller.go
-		roundtrip.go
-		server.go
-		sniff.go
-		socks_bundle.go
-		status.go
-		transfer.go
-		transport.go
-		transport_default_other.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		client.go
-		clone.go
-		cookie.go
-		doc.go
-		filetransport.go
-		fs.go
-		h2_bundle.go
-		h2_error.go
-		header.go
-		http.go
-		jar.go
-		method.go
-		request.go
-		response.go
-		responsecontroller.go
-		roundtrip.go
-		server.go
-		sniff.go
-		socks_bundle.go
-		status.go
-		transfer.go
-		transport.go
-		transport_default_other.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		client.go
-		clone.go
-		cookie.go
-		doc.go
-		filetransport.go
-		fs.go
-		h2_bundle.go
-		h2_error.go
-		header.go
-		http.go
-		jar.go
-		method.go
-		request.go
-		response.go
-		responsecontroller.go
-		roundtrip.go
-		server.go
-		sniff.go
-		socks_bundle.go
-		status.go
-		transfer.go
-		transport.go
-		transport_default_other.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		client.go
-		clone.go
-		cookie.go
-		doc.go
-		filetransport.go
-		fs.go
-		h2_bundle.go
-		h2_error.go
-		header.go
-		http.go
-		jar.go
-		method.go
-		request.go
-		response.go
-		responsecontroller.go
-		roundtrip.go
-		server.go
-		sniff.go
-		socks_bundle.go
-		status.go
-		transfer.go
-		transport.go
-		transport_default_other.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		client.go
 		clone.go