aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-10 15:16:12 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 15:58:17 +0300
commit27d9e7b019b403243c6e8f9a119e577447b6c729 (patch)
tree85c5ad4f43314665567b374f66cb77b6f9c41d9a /contrib
parent0eef543901a7710e104c6896930f164d24185d6e (diff)
downloadydb-27d9e7b019b403243c6e8f9a119e577447b6c729.tar.gz
intermediate changes
ref:2fa20c954dcd987f31c39b15c01decc881039597
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libs/libunwind/include/__libunwind_config.h8
-rw-r--r--contrib/libs/libunwind/include/unwind_arm_ehabi.h4
-rw-r--r--contrib/libs/libunwind/include/unwind_itanium.h4
3 files changed, 4 insertions, 12 deletions
diff --git a/contrib/libs/libunwind/include/__libunwind_config.h b/contrib/libs/libunwind/include/__libunwind_config.h
index c38458f0e2..e87bcf4003 100644
--- a/contrib/libs/libunwind/include/__libunwind_config.h
+++ b/contrib/libs/libunwind/include/__libunwind_config.h
@@ -32,12 +32,12 @@
# if defined(__linux__)
# define _LIBUNWIND_TARGET_LINUX 1
# endif
-# if defined(__i386__) || defined(_M_IX86)
+# if defined(__i386__)
# define _LIBUNWIND_TARGET_I386
# define _LIBUNWIND_CONTEXT_SIZE 8
# define _LIBUNWIND_CURSOR_SIZE 15
# define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_X86
-# elif defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64)
+# elif defined(__x86_64__)
# define _LIBUNWIND_TARGET_X86_64 1
# if defined(_WIN64)
# define _LIBUNWIND_CONTEXT_SIZE 54
@@ -61,7 +61,7 @@
# define _LIBUNWIND_CONTEXT_SIZE 117
# define _LIBUNWIND_CURSOR_SIZE 124
# define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_PPC
-# elif defined(__aarch64__) || defined(_M_ARM64)
+# elif defined(__aarch64__)
# define _LIBUNWIND_TARGET_AARCH64 1
# define _LIBUNWIND_CONTEXT_SIZE 66
# if defined(__SEH__)
@@ -70,7 +70,7 @@
# define _LIBUNWIND_CURSOR_SIZE 78
# endif
# define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_ARM64
-# elif defined(__arm__) || defined(_M_ARM)
+# elif defined(__arm__)
# define _LIBUNWIND_TARGET_ARM 1
# if defined(__SEH__)
# define _LIBUNWIND_CONTEXT_SIZE 42
diff --git a/contrib/libs/libunwind/include/unwind_arm_ehabi.h b/contrib/libs/libunwind/include/unwind_arm_ehabi.h
index 6e7f162f9f..6277a1457f 100644
--- a/contrib/libs/libunwind/include/unwind_arm_ehabi.h
+++ b/contrib/libs/libunwind/include/unwind_arm_ehabi.h
@@ -62,11 +62,7 @@ struct _Unwind_Control_Block {
} pr_cache;
long long int :0; /* Enforce the 8-byte alignment */
-#ifndef _MSC_VER
} __attribute__((__aligned__(8)));
-#else
-} __declspec(align(8));
-#endif
typedef _Unwind_Reason_Code (*_Unwind_Personality_Fn)(
_Unwind_State state, _Unwind_Exception *exceptionObject,
diff --git a/contrib/libs/libunwind/include/unwind_itanium.h b/contrib/libs/libunwind/include/unwind_itanium.h
index 6094ad733a..d94a6183be 100644
--- a/contrib/libs/libunwind/include/unwind_itanium.h
+++ b/contrib/libs/libunwind/include/unwind_itanium.h
@@ -38,11 +38,7 @@ struct _Unwind_Exception {
// The Itanium ABI requires that _Unwind_Exception objects are "double-word
// aligned". GCC has interpreted this to mean "use the maximum useful
// alignment for the target"; so do we.
-#ifndef _MSC_VER
} __attribute__((__aligned__));
-#else
-} __declspec(align(8));
-#endif
typedef _Unwind_Reason_Code (*_Unwind_Personality_Fn)(
int version, _Unwind_Action actions, uint64_t exceptionClass,