Merge branch 'mergelibs12' into main

1 files changed, 3 insertions, 46 deletions

diff --git a/contrib/go/_std_1.21/src/crypto/cipher/ya.make b/contrib/go/_std_1.21/src/crypto/cipher/ya.make
index 12c720606f..fef0aa8479 100644
--- a/contrib/go/_std_1.21/src/crypto/cipher/ya.make
+++ b/contrib/go/_std_1.21/src/crypto/cipher/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		cbc.go
-		cfb.go
-		cipher.go
-		ctr.go
-		gcm.go
-		io.go
-		ofb.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		cbc.go
-		cfb.go
-		cipher.go
-		ctr.go
-		gcm.go
-		io.go
-		ofb.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		cbc.go
 		cfb.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		io.go
 		ofb.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		cbc.go
 		cfb.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		io.go
 		ofb.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		cbc.go
 		cfb.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		io.go
 		ofb.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		cbc.go
-		cfb.go
-		cipher.go
-		ctr.go
-		gcm.go
-		io.go
-		ofb.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		cbc.go
-		cfb.go
-		cipher.go
-		ctr.go
-		gcm.go
-		io.go
-		ofb.go
-    )
 ENDIF()
 END()