Intermediate changes

9 files changed, 10 insertions, 260 deletions

diff --git a/contrib/go/_std_1.21/src/runtime/coverage/ya.make b/contrib/go/_std_1.21/src/runtime/coverage/ya.make
index 96fc316a11..eca6740acd 100644
--- a/contrib/go/_std_1.21/src/runtime/coverage/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/coverage/ya.make
@@ -1,37 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		apis.go
-		dummy.s
-		emit.go
-		hooks.go
-		testsupport.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		apis.go
-		dummy.s
-		emit.go
-		hooks.go
-		testsupport.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		apis.go
-		dummy.s
-		emit.go
-		hooks.go
-		testsupport.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		apis.go
-		dummy.s
-		emit.go
-		hooks.go
-		testsupport.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(
 		apis.go
 		dummy.s
diff --git a/contrib/go/_std_1.21/src/runtime/debug/ya.make b/contrib/go/_std_1.21/src/runtime/debug/ya.make
index 51c6e58f85..bdb1a4f46d 100644
--- a/contrib/go/_std_1.21/src/runtime/debug/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/debug/ya.make
@@ -1,37 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		debug.s
-		garbage.go
-		mod.go
-		stack.go
-		stubs.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		debug.s
-		garbage.go
-		mod.go
-		stack.go
-		stubs.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		debug.s
-		garbage.go
-		mod.go
-		stack.go
-		stubs.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		debug.s
-		garbage.go
-		mod.go
-		stack.go
-		stubs.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(
 		debug.s
 		garbage.go
diff --git a/contrib/go/_std_1.21/src/runtime/internal/atomic/ya.make b/contrib/go/_std_1.21/src/runtime/internal/atomic/ya.make
index 8acd81948b..0f9ae51525 100644
--- a/contrib/go/_std_1.21/src/runtime/internal/atomic/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/internal/atomic/ya.make
@@ -1,5 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		atomic_arm64.go
 		atomic_arm64.s
@@ -9,37 +9,7 @@ IF (OS_DARWIN AND ARCH_ARM64)
 		types_64bit.go
 		unaligned.go
     )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		atomic_amd64.go
-		atomic_amd64.s
-		doc.go
-		stubs.go
-		types.go
-		types_64bit.go
-		unaligned.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		atomic_arm64.go
-		atomic_arm64.s
-		doc.go
-		stubs.go
-		types.go
-		types_64bit.go
-		unaligned.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		atomic_amd64.go
-		atomic_amd64.s
-		doc.go
-		stubs.go
-		types.go
-		types_64bit.go
-		unaligned.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+ELSEIF (OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		atomic_amd64.go
 		atomic_amd64.s
diff --git a/contrib/go/_std_1.21/src/runtime/internal/math/ya.make b/contrib/go/_std_1.21/src/runtime/internal/math/ya.make
index 65b75f3a16..fad4a66318 100644
--- a/contrib/go/_std_1.21/src/runtime/internal/math/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/internal/math/ya.make
@@ -1,21 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		math.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		math.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		math.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		math.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(
 		math.go
     )
diff --git a/contrib/go/_std_1.21/src/runtime/internal/startlinetest/ya.make b/contrib/go/_std_1.21/src/runtime/internal/startlinetest/ya.make
index 9428d8dd05..8dbcca0acf 100644
--- a/contrib/go/_std_1.21/src/runtime/internal/startlinetest/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/internal/startlinetest/ya.make
@@ -1,15 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		func_amd64.go
-		func_amd64.s
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		func_amd64.go
-		func_amd64.s
-    )
-ELSEIF (OS_WINDOWS AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_X86_64 OR OS_WINDOWS AND ARCH_X86_64)
     SRCS(
 		func_amd64.go
 		func_amd64.s
diff --git a/contrib/go/_std_1.21/src/runtime/internal/sys/ya.make b/contrib/go/_std_1.21/src/runtime/internal/sys/ya.make
index ef9cdc3c1b..dbec7c1b27 100644
--- a/contrib/go/_std_1.21/src/runtime/internal/sys/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/internal/sys/ya.make
@@ -1,41 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		consts.go
-		consts_norace.go
-		intrinsics.go
-		nih.go
-		sys.go
-		zversion.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		consts.go
-		consts_norace.go
-		intrinsics.go
-		nih.go
-		sys.go
-		zversion.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		consts.go
-		consts_norace.go
-		intrinsics.go
-		nih.go
-		sys.go
-		zversion.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		consts.go
-		consts_norace.go
-		intrinsics.go
-		nih.go
-		sys.go
-		zversion.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(
 		consts.go
 		consts_norace.go
diff --git a/contrib/go/_std_1.21/src/runtime/metrics/ya.make b/contrib/go/_std_1.21/src/runtime/metrics/ya.make
index 297efb81bd..5d8109dda5 100644
--- a/contrib/go/_std_1.21/src/runtime/metrics/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/metrics/ya.make
@@ -1,37 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		description.go
-		doc.go
-		histogram.go
-		sample.go
-		value.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		description.go
-		doc.go
-		histogram.go
-		sample.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		description.go
-		doc.go
-		histogram.go
-		sample.go
-		value.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		description.go
-		doc.go
-		histogram.go
-		sample.go
-		value.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(
 		description.go
 		doc.go
diff --git a/contrib/go/_std_1.21/src/runtime/pprof/ya.make b/contrib/go/_std_1.21/src/runtime/pprof/ya.make
index f5f8979bf8..5e4864eabf 100644
--- a/contrib/go/_std_1.21/src/runtime/pprof/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/pprof/ya.make
@@ -1,47 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		elf.go
-		label.go
-		map.go
-		pe.go
-		pprof.go
-		pprof_rusage.go
-		proto.go
-		proto_other.go
-		protobuf.go
-		protomem.go
-		runtime.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		elf.go
-		label.go
-		map.go
-		pe.go
-		pprof.go
-		pprof_rusage.go
-		proto.go
-		proto_other.go
-		protobuf.go
-		protomem.go
-		runtime.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		elf.go
-		label.go
-		map.go
-		pe.go
-		pprof.go
-		pprof_rusage.go
-		proto.go
-		proto_other.go
-		protobuf.go
-		protomem.go
-		runtime.go
-    )
-ELSEIF (OS_LINUX 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)
     SRCS(
 		elf.go
 		label.go
diff --git a/contrib/go/_std_1.21/src/runtime/trace/ya.make b/contrib/go/_std_1.21/src/runtime/trace/ya.make
index 5783d5ff36..08531f1530 100644
--- a/contrib/go/_std_1.21/src/runtime/trace/ya.make
+++ b/contrib/go/_std_1.21/src/runtime/trace/ya.make
@@ -1,25 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		annotation.go
-		trace.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		annotation.go
-		trace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		annotation.go
-		trace.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		annotation.go
-		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(
 		annotation.go
 		trace.go