Просмотр исходного кода

Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 1 of 2.

orivej 3 лет назад
Родитель
Сommit
718c552901

+ 1 - 1
build/conf/license.conf

@@ -249,7 +249,7 @@ LICENSES_PERMISSIVE= \
     IJG \
     Intel-Simplified \
     ISC \
-    JSON \
+    JSON \ 
     Khronos \
     Libpbm \
     LicenseRef-scancode-bitstream \

+ 11 - 11
build/external_resources/swift-demangle/ya.make

@@ -1,12 +1,12 @@
-RESOURCES_LIBRARY()
-
+RESOURCES_LIBRARY() 
+ 
 OWNER(orivej dancingelf rodion-m dmitrtol)
-
-DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-    SWIFT_DEMANGLE
-    sbr:2216593352 FOR LINUX
-    sbr:2218209370 FOR DARWIN
-    sbr:2218209370 FOR DARWIN-ARM64
-)
-
-END()
+ 
+DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+    SWIFT_DEMANGLE 
+    sbr:2216593352 FOR LINUX 
+    sbr:2218209370 FOR DARWIN 
+    sbr:2218209370 FOR DARWIN-ARM64 
+) 
+ 
+END() 

+ 1 - 1
build/external_resources/ya.make

@@ -5,7 +5,7 @@ RECURSE(
     antlr4
     gradle
     maven
-    swift-demangle
+    swift-demangle 
 )
 
 IF (OS_ANDROID)

+ 27 - 27
build/platform/clang/arch.cmake

@@ -1,27 +1,27 @@
-# See https://github.com/llvm/llvm-project/blob/master/compiler-rt/cmake/builtin-config-ix.cmake
-
-IF (ARCH_I386 OR ARCH_I686)
-    SET(CLANG_ARCH i386)
-ELSEIF (ARCH_X86_64)
-    SET(CLANG_ARCH x86_64)
-ELSEIF (ARCH_ARM7 OR ARCH_ARM7_NEON)
-    SET(CLANG_ARCH armv7)
-ELSEIF (ARCH_ARM64 OR ARCH_AARCH64)
-    IF (OS_DARWIN OR OS_IOS)
-        SET(CLANG_ARCH arm64)
-    ELSE()
-        SET(CLANG_ARCH aarch64)
-    ENDIF()
-ELSEIF (ARCH_PPC64LE)
-    SET(CLANG_ARCH powerpc64le)
-ELSE()
-    MESSAGE(FATAL_ERROR "Unknown architecture")
-ENDIF()
-
-IF (OS_DARWIN)
-    SET(CLANG_RT_SUFFIX "_osx")
-    SET(CLANG_RT_DLLSUFFIX "_osx_dynamic")
-ELSE()
-    SET(CLANG_RT_SUFFIX "-${CLANG_ARCH}")
-    SET(CLANG_RT_DLLSUFFIX "-${CLANG_ARCH}")
-ENDIF()
+# See https://github.com/llvm/llvm-project/blob/master/compiler-rt/cmake/builtin-config-ix.cmake 
+ 
+IF (ARCH_I386 OR ARCH_I686) 
+    SET(CLANG_ARCH i386) 
+ELSEIF (ARCH_X86_64) 
+    SET(CLANG_ARCH x86_64) 
+ELSEIF (ARCH_ARM7 OR ARCH_ARM7_NEON) 
+    SET(CLANG_ARCH armv7) 
+ELSEIF (ARCH_ARM64 OR ARCH_AARCH64) 
+    IF (OS_DARWIN OR OS_IOS) 
+        SET(CLANG_ARCH arm64) 
+    ELSE() 
+        SET(CLANG_ARCH aarch64) 
+    ENDIF() 
+ELSEIF (ARCH_PPC64LE) 
+    SET(CLANG_ARCH powerpc64le) 
+ELSE() 
+    MESSAGE(FATAL_ERROR "Unknown architecture") 
+ENDIF() 
+ 
+IF (OS_DARWIN) 
+    SET(CLANG_RT_SUFFIX "_osx") 
+    SET(CLANG_RT_DLLSUFFIX "_osx_dynamic") 
+ELSE() 
+    SET(CLANG_RT_SUFFIX "-${CLANG_ARCH}") 
+    SET(CLANG_RT_DLLSUFFIX "-${CLANG_ARCH}") 
+ENDIF() 

+ 31 - 31
build/platform/clang/clang-windows.sh

@@ -1,31 +1,31 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-version="${1:-11.0.0}"
-major="${version%%.*}"
-
-arcadia="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../../.. && pwd)"
-tmp="${TMPDIR:-/tmp}/clang"
-exe="LLVM-${version}-win64.exe"
-dir="clang-${version}-win"
-tar="${dir}.tar.gz"
-
-set -x
-
-mkdir -p "$tmp"
-cd "$tmp"
-test -e "$exe" || wget "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${exe}"
-
-rm -rf "$dir"
-mkdir -p "$dir"
-cd "$dir"
-7z x ../"$exe"
-
-"$arcadia"/ya \
-    make "$arcadia"/contrib/libs/llvm${major}/tools/{llvm-as,llvm-link,opt} \
-    -DNO_DEBUGINFO -r --target-platform=windows --no-src-links -I bin
-
-tar czf "../$tar" *
-
-printf '%q ' ya upload "$tmp/$tar" -d "Clang $version for Windows" --ttl inf --owner BUILD_TOOLS --type CLANG_TOOLKIT --attr platform=win32 --attr "version=$version"
-echo
+#!/usr/bin/env bash 
+set -euo pipefail 
+ 
+version="${1:-11.0.0}" 
+major="${version%%.*}" 
+ 
+arcadia="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../../.. && pwd)" 
+tmp="${TMPDIR:-/tmp}/clang" 
+exe="LLVM-${version}-win64.exe" 
+dir="clang-${version}-win" 
+tar="${dir}.tar.gz" 
+ 
+set -x 
+ 
+mkdir -p "$tmp" 
+cd "$tmp" 
+test -e "$exe" || wget "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${exe}" 
+ 
+rm -rf "$dir" 
+mkdir -p "$dir" 
+cd "$dir" 
+7z x ../"$exe" 
+ 
+"$arcadia"/ya \ 
+    make "$arcadia"/contrib/libs/llvm${major}/tools/{llvm-as,llvm-link,opt} \ 
+    -DNO_DEBUGINFO -r --target-platform=windows --no-src-links -I bin 
+ 
+tar czf "../$tar" * 
+ 
+printf '%q ' ya upload "$tmp/$tar" -d "Clang $version for Windows" --ttl inf --owner BUILD_TOOLS --type CLANG_TOOLKIT --attr platform=win32 --attr "version=$version" 
+echo 

+ 14 - 14
build/platform/clang/ya.make

@@ -4,21 +4,21 @@ LICENSE(BSD-3-Clause)
 
 OWNER(g:contrib)
 
-IF (CLANG10BC AND CLANG10 AND HOST_OS_LINUX)
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        CLANG # Clang 10
-        sbr:1871274282 FOR LINUX
-        sbr:1844539535 FOR DARWIN
-    )
-ELSE()
+IF (CLANG10BC AND CLANG10 AND HOST_OS_LINUX) 
+    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+        CLANG # Clang 10 
+        sbr:1871274282 FOR LINUX 
+        sbr:1844539535 FOR DARWIN 
+    ) 
+ELSE() 
     # Remove -std=c++17 flag from LLVM_COMPILE_CXX and CLANG_EMIT_AST_CXX macro when update clang to 11
     # DEVTOOLS-7845
-    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
-        CLANG # Clang 7
-        sbr:707372498 FOR LINUX # In 942524429 and 958916803 llvm-link does not run.
-        sbr:942053644 FOR DARWIN
-        sbr:1006151596 FOR WIN32 # Generated by ./clang-windows.sh 7.1.0
-    )
-ENDIF()
+    DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( 
+        CLANG # Clang 7 
+        sbr:707372498 FOR LINUX # In 942524429 and 958916803 llvm-link does not run. 
+        sbr:942053644 FOR DARWIN 
+        sbr:1006151596 FOR WIN32 # Generated by ./clang-windows.sh 7.1.0 
+    ) 
+ENDIF() 
 
 END()

+ 10 - 10
build/platform/cuda/ya.make

@@ -16,13 +16,13 @@ IF (USE_ARCADIA_CUDA)
             ELSEIF (CUDA_VERSION == "11.3")
                 DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2213063565) # CUDA Toolkit 11.3.1 for Linux x86-64
             ELSEIF (CUDA_VERSION == "11.2")
-                DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2073566375) # CUDA Toolkit 11.2.2 for Linux x86-64
-            ELSEIF (CUDA_VERSION == "11.1")
+                DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2073566375) # CUDA Toolkit 11.2.2 for Linux x86-64 
+            ELSEIF (CUDA_VERSION == "11.1") 
                 DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1882836946) # CUDA Toolkit 11.1.1 for Linux x86-64
             ELSEIF (CUDA_VERSION == "11.0")
                 DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1647896014) # CUDA Toolkit 11.0.2 for Linux x86-64
             ELSEIF (CUDA_VERSION == "10.1")
-                DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2077988857) # CUDA Toolkit 10.1.168 for Linux x86-64
+                DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2077988857) # CUDA Toolkit 10.1.168 for Linux x86-64 
             ELSE()
                 ENABLE(CUDA_NOT_FOUND)
             ENDIF()
@@ -125,12 +125,12 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER)
 
     ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
         IF (OS_WINDOWS AND ARCH_X86_64)
-            # To create this toolchain, install MSVS on Windows and run:
-            # devtools/tools_build/pack_sdk.py msvc out.tar
-            # Note: it will contain patched "VC/Auxiliary/Build/vcvarsall.bat"
-            # to prevent "nvcc fatal   : Host compiler targets unsupported OS."
+            # To create this toolchain, install MSVS on Windows and run: 
+            # devtools/tools_build/pack_sdk.py msvc out.tar 
+            # Note: it will contain patched "VC/Auxiliary/Build/vcvarsall.bat" 
+            # to prevent "nvcc fatal   : Host compiler targets unsupported OS." 
             IF (CUDA_HOST_MSVC_VERSION == "14.28.29910")
-                DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:2153212401)
+                DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:2153212401) 
             ELSE()
                 MESSAGE(FATAL_ERROR "Unexpected or unspecified Microsoft Visual C++ CUDA host compiler version")
             ENDIF()
@@ -187,9 +187,9 @@ IF (CUDA_REQUIRED)
 ENDIF()
 
 IF (HOST_OS_WINDOWS)
-    LDFLAGS(cudadevrt.lib cudart_static.lib)
+    LDFLAGS(cudadevrt.lib cudart_static.lib) 
 ELSE()
-    EXTRALIBS(-lcudadevrt -lcudart_static -lculibos)
+    EXTRALIBS(-lcudadevrt -lcudart_static -lculibos) 
 ENDIF()
 
 END()

+ 3 - 3
build/platform/gold/ya.make

@@ -5,8 +5,8 @@ OWNER(somov)
 INCLUDE(${ARCADIA_ROOT}/build/platform/binutils/binutils.resource)
 
 LDFLAGS(
-    -fuse-ld=$BINUTILS_ROOT_RESOURCE_GLOBAL/bin/ld.gold
-    -Wl,-z,noexecstack
-)
+    -fuse-ld=$BINUTILS_ROOT_RESOURCE_GLOBAL/bin/ld.gold 
+    -Wl,-z,noexecstack 
+) 
 
 END()

+ 4 - 4
build/platform/java/jstyle_lib/ya.make

@@ -1,11 +1,11 @@
 RESOURCES_LIBRARY()
-
+ 
 OWNER(heretic)
-
-IF (USE_SYSTEM_JSTYLE_LIB)
+ 
+IF (USE_SYSTEM_JSTYLE_LIB) 
     MESSAGE(WARNING System java codestyle library $USE_SYSTEM_JSTYLE_LIB will be used)
 ELSE()
     DECLARE_EXTERNAL_RESOURCE(JSTYLE_LIB sbr:2525400095)
 ENDIF()
-
+ 
 END()

+ 20 - 20
build/platform/lld/ya.make

@@ -6,29 +6,29 @@ 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)
+        # 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()
-
+    ENDIF() 
+ENDIF() 
+ 
 IF (OS_ANDROID)
-    # Use LLD shipped with Android NDK.
+    # 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_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)
     IF (HOST_OS_LINUX)
         IF (HOST_ARCH_PPC64LE)
@@ -56,7 +56,7 @@ ELSE()
         ENDIF()
     ENDIF()
 
-    LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment")
-ENDIF()
+    LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment") 
+ENDIF() 
 
 END()

Некоторые файлы не были показаны из-за большого количества измененных файлов