aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2024-02-18 16:37:01 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2024-02-18 16:47:54 +0300
commit197928bc601513bc326e8f196b8e41e860ac8afb (patch)
tree78da9f04e9ef2af148862c129ae394d4afa5f33f
parente57cf2593c195a3087088c9a4a74950da0ebf1be (diff)
downloadydb-197928bc601513bc326e8f196b8e41e860ac8afb.tar.gz
Intermediate changes
-rw-r--r--contrib/libs/openssl/crypto/ya.make20
-rw-r--r--contrib/libs/openssl/ya.make12
2 files changed, 0 insertions, 32 deletions
diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make
index 2137503359..be3f2b7328 100644
--- a/contrib/libs/openssl/crypto/ya.make
+++ b/contrib/libs/openssl/crypto/ya.make
@@ -151,17 +151,10 @@ IF (OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64)
)
ENDIF()
-IF (OS_DARWIN AND ARCH_X86_64)
- CFLAGS(
- -D_REENTRANT
- )
-ENDIF()
-
IF (OS_DARWIN AND ARCH_ARM64)
CFLAGS(
-DL_ENDIAN
-DOPENSSL_PIC
- -D_REENTRANT
)
ENDIF()
@@ -179,11 +172,6 @@ IF (OS_WINDOWS)
ENDIF()
CFLAGS(
-DOPENSSL_SYS_WIN32
- -DUNICODE
- -DWIN32_LEAN_AND_MEAN
- -D_CRT_SECURE_NO_DEPRECATE
- -D_UNICODE
- -D_WINSOCK_DEPRECATED_NO_WARNINGS
/GF
)
ENDIF()
@@ -937,14 +925,6 @@ IF (OS_DARWIN AND ARCH_ARM64)
ENDIF()
IF (OS_LINUX AND ARCH_ARM7)
- IF (CLANG)
- # XXX: This is a workarond for 'out of range immediate fixup value'
- # error with clang integrated assembler:
- # https://github.com/openssl/openssl/issues/7878
- CFLAGS(
- -mno-thumb
- )
- ENDIF()
CFLAGS(
-DOPENSSL_PIC
-DOPENSSL_BN_ASM_GF2m
diff --git a/contrib/libs/openssl/ya.make b/contrib/libs/openssl/ya.make
index 817efe54e1..e8d70a9a31 100644
--- a/contrib/libs/openssl/ya.make
+++ b/contrib/libs/openssl/ya.make
@@ -135,17 +135,10 @@ IF (OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64 OR OS_ANDROID)
)
ENDIF()
-IF (OS_DARWIN AND ARCH_X86_64)
- CFLAGS(
- -D_REENTRANT
- )
-ENDIF()
-
IF (OS_DARWIN AND ARCH_ARM64)
CFLAGS(
-DL_ENDIAN
-DOPENSSL_PIC
- -D_REENTRANT
)
ENDIF()
@@ -163,11 +156,6 @@ IF (OS_WINDOWS)
ENDIF()
CFLAGS(
-DOPENSSL_SYS_WIN32
- -DUNICODE
- -DWIN32_LEAN_AND_MEAN
- -D_CRT_SECURE_NO_DEPRECATE
- -D_UNICODE
- -D_WINSOCK_DEPRECATED_NO_WARNINGS
/GF
)
ENDIF()