diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-10 19:57:24 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-10 19:57:24 +0300 |
| commit | dccbf1e50d0dfc98bb611af8a4611312806f1664 (patch) | |
| tree | 2e0c08d3d2497c37c0ce02d2f42703250311e90d | |
| parent | 48a7383de78f9548e18c2bac8db285fe00886cc0 (diff) | |
| download | ydb-dccbf1e50d0dfc98bb611af8a4611312806f1664.tar.gz | |
intermediate changes
ref:bbe986d1f7c2465be047a3bc69b8e068fb0c2fe9
| -rw-r--r-- | build/platform/lld/ya.make | 26 | ||||
| -rw-r--r-- | contrib/libs/apache/ya.make | 6 | ||||
| -rw-r--r-- | contrib/libs/llvm12/ya.make | 16 | ||||
| -rw-r--r-- | contrib/libs/ya.make | 1 | ||||
| -rw-r--r-- | library/cpp/monlib/encode/buffered/string_pool.h | 4 |
5 files changed, 21 insertions, 32 deletions
diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make index c046e89098..c34e8be1a7 100644 --- a/build/platform/lld/ya.make +++ b/build/platform/lld/ya.make @@ -4,32 +4,11 @@ LICENSE(Service-Prebuilt-Tool) OWNER(somov) -IF (USE_LTO OR USE_THINLTO) - IF (CLANG7 OR CLANG8) - # Use LLD 8 for old Clang because its IR code fails LLD 11 validation. - ENABLE(USE_LLD8) - ELSEIF (CLANG11) - # DEVTOOLSSUPPORT-9065 - ENABLE(USE_LLD11) - ENDIF() -ENDIF() - IF (OS_ANDROID) # Use LLD shipped with Android NDK. LDFLAGS("-fuse-ld=lld") -ELSEIF (USE_LLD8) - IF (HOST_OS_LINUX) - IF (HOST_ARCH_PPC64LE) - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1610790447) - ELSE() - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1063258680) - ENDIF() - ELSEIF (HOST_OS_DARWIN) - DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1063258537) - ENDIF() - - LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld") -ELSEIF (USE_LLD11) +ELSEIF (USE_PREVIOUS_LLD_VERSION) + # Use LLD 11 IF (HOST_OS_LINUX) IF (HOST_ARCH_PPC64LE) DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843381106) @@ -42,6 +21,7 @@ ELSEIF (USE_LLD11) LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment") ELSE() + # Use LLD 12 IF (HOST_OS_LINUX) IF (HOST_ARCH_PPC64LE) DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283417120) diff --git a/contrib/libs/apache/ya.make b/contrib/libs/apache/ya.make index 31f70e39c5..0a05eec097 100644 --- a/contrib/libs/apache/ya.make +++ b/contrib/libs/apache/ya.make @@ -1,5 +1,11 @@ +OWNER( + g:contrib + g:cpp-contrib +) + RECURSE( arrow avro orc + serf ) diff --git a/contrib/libs/llvm12/ya.make b/contrib/libs/llvm12/ya.make index 50b4d51565..d193c043a4 100644 --- a/contrib/libs/llvm12/ya.make +++ b/contrib/libs/llvm12/ya.make @@ -1,7 +1,14 @@ -# Generated by devtools/yamaker from nixpkgs 9ee8bd188933750be0584f285daf9a295d0c8930. +# Generated by devtools/yamaker from nixpkgs 21.11. LIBRARY() +LICENSE( + Apache-2.0 WITH LLVM-exception AND + NCSA +) + +LICENSE_TEXTS(.yandex_meta/licenses.list.txt) + OWNER( orivej g:cpp-contrib @@ -11,13 +18,6 @@ VERSION(12.0.1) ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/llvm-12.0.1.src.tar.xz) -LICENSE( - Apache-2.0 WITH LLVM-exception AND - NCSA -) - -LICENSE_TEXTS(.yandex_meta/licenses.list.txt) - ADDINCL( GLOBAL ${ARCADIA_BUILD_ROOT}/contrib/libs/llvm12/include GLOBAL contrib/libs/llvm12/include diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make index 9eccaa9653..f49afe35b4 100644 --- a/contrib/libs/ya.make +++ b/contrib/libs/ya.make @@ -298,7 +298,6 @@ RECURSE( sasl sctp sentencepiece - serf snappy sophos sparrowhawk diff --git a/library/cpp/monlib/encode/buffered/string_pool.h b/library/cpp/monlib/encode/buffered/string_pool.h index 00e5644608..7630cee353 100644 --- a/library/cpp/monlib/encode/buffered/string_pool.h +++ b/library/cpp/monlib/encode/buffered/string_pool.h @@ -82,6 +82,10 @@ namespace NMonitoring { return Index_.size(); } + size_t SizeBytes() const { + return Index_.capacity() * sizeof(TStringBuf); + } + private: void InitIndex(const char* data, ui32 size); |