diff options
| author | solovyev <[email protected]> | 2022-02-10 16:47:59 +0300 |
|---|---|---|
| committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:47:59 +0300 |
| commit | 91c4b97806f457b48841073e04a34cfe3c8e2857 (patch) | |
| tree | b222e5ac2e2e98872661c51ccceee5da0d291e13 | |
| parent | 4091299584d0f33c8e0420e204dba6bbd10ba0cb (diff) | |
Restoring authorship annotation for <[email protected]>. Commit 2 of 2.
| -rw-r--r-- | contrib/libs/openssl/crypto/armcap.c | 4 | ||||
| -rw-r--r-- | contrib/libs/openssl/crypto/ya.make | 10 | ||||
| -rw-r--r-- | contrib/libs/openssl/ya.make | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/contrib/libs/openssl/crypto/armcap.c b/contrib/libs/openssl/crypto/armcap.c index 3554ef1e645..a96804c706f 100644 --- a/contrib/libs/openssl/crypto/armcap.c +++ b/contrib/libs/openssl/crypto/armcap.c @@ -234,13 +234,13 @@ void OPENSSL_cpuid_setup(void) } # endif - #ifndef ARCADIA_OPENSSL_DISABLE_ARMV7_TICK + #ifndef ARCADIA_OPENSSL_DISABLE_ARMV7_TICK /* Things that getauxval didn't tell us */ if (sigsetjmp(ill_jmp, 1) == 0) { _armv7_tick(); OPENSSL_armcap_P |= ARMV7_TICK; } - #endif + #endif sigaction(SIGILL, &ill_oact, NULL); sigprocmask(SIG_SETMASK, &oset, NULL); diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make index b8b3e55c283..3acfb0cac7d 100644 --- a/contrib/libs/openssl/crypto/ya.make +++ b/contrib/libs/openssl/crypto/ya.make @@ -1381,14 +1381,14 @@ IF (OS_ANDROID AND ARCH_I686) ENDIF() IF (OS_ANDROID 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 + 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() + ENDIF() CFLAGS( -DOPENSSL_PIC -DOPENSSL_BN_ASM_GF2m diff --git a/contrib/libs/openssl/ya.make b/contrib/libs/openssl/ya.make index bc04a99e95b..060d0697855 100644 --- a/contrib/libs/openssl/ya.make +++ b/contrib/libs/openssl/ya.make @@ -349,14 +349,14 @@ IF (OS_ANDROID AND ARCH_ARM64) ) ENDIF() -# mitigate SIGILL on some armv7 platforms -# https://github.com/openssl/openssl/issues/17009 -IF (ARCADIA_OPENSSL_DISABLE_ARMV7_TICK) - CFLAGS( +# mitigate SIGILL on some armv7 platforms +# https://github.com/openssl/openssl/issues/17009 +IF (ARCADIA_OPENSSL_DISABLE_ARMV7_TICK) + CFLAGS( -DARCADIA_OPENSSL_DISABLE_ARMV7_TICK - ) -ENDIF() - + ) +ENDIF() + END() IF (NOT DLL_FOR AND NOT OS_IOS) |