Stop using prebuilt contrib/tools/yasm

5 files changed, 130 insertions, 141 deletions

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 4a28310160..eb72cde6df 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -4134,6 +4134,7 @@ macro NO_SANITIZE_COVERAGE() {
 ###
 ### Disable heavyweight clang coverage for the module. Clang coverage instrumentation is enabled by the --clang-coverage option.
 macro NO_CLANG_COVERAGE() {
+    DISABLE(NEED_PROFILE_RUNTIME)
     DISABLE(CLANG_COVERAGE)
 }
 
diff --git a/contrib/tools/yasm/bin/BSD.txt b/contrib/tools/yasm/BSD.txt
index 03476b75b5..03476b75b5 100644
--- a/contrib/tools/yasm/bin/BSD.txt
+++ b/contrib/tools/yasm/BSD.txt
diff --git a/contrib/tools/yasm/bin/COPYING b/contrib/tools/yasm/COPYING
index 430673b7d1..430673b7d1 100644
--- a/contrib/tools/yasm/bin/COPYING
+++ b/contrib/tools/yasm/COPYING
diff --git a/contrib/tools/yasm/bin/ya.make b/contrib/tools/yasm/bin/ya.make
deleted file mode 100644
index 7640ab6657..0000000000
--- a/contrib/tools/yasm/bin/ya.make
+++ /dev/null
@@ -1,134 +0,0 @@
-PROGRAM(yasm)
-
-LICENSE(
-    Artistic-1.0 AND
-    Artistic-1.0-Perl AND
-    Artistic-2.0 AND
-    BSD-2-Clause AND
-    BSD-3-Clause AND
-    GPL-1.0-or-later AND
-    LGPL-2.0-or-later AND
-    LicenseRef-scancode-warranty-disclaimer AND
-    Public-Domain
-)
-
-LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-
-IF (MUSL)
-    PEERDIR(
-        contrib/libs/musl_extra
-        contrib/libs/jemalloc
-    )
-    DISABLE(USE_ASMLIB)
-    NO_RUNTIME()
-    ENABLE(MUSL_LITE)
-ELSE()
-    NO_PLATFORM()
-ENDIF()
-
-NO_CLANG_COVERAGE()
-
-NO_COMPILER_WARNINGS()
-
-NO_UTIL()
-
-NO_SANITIZE()
-
-ALLOCATOR(FAKE)
-
-ADDINCL(
-    contrib/tools/yasm
-    contrib/tools/yasm/frontends/yasm
-    contrib/tools/yasm/modules
-)
-
-CFLAGS(
-    -DHAVE_CONFIG_H
-    -DYASM_LIB_SOURCE
-)
-
-SRCDIR(contrib/tools/yasm)
-
-SRCS(
-    frontends/yasm/yasm-options.c
-    frontends/yasm/yasm.c
-    libyasm/assocdat.c
-    libyasm/bc-align.c
-    libyasm/bc-data.c
-    libyasm/bc-incbin.c
-    libyasm/bc-org.c
-    libyasm/bc-reserve.c
-    libyasm/bitvect.c
-    libyasm/bytecode.c
-    libyasm/cmake-module.c
-    libyasm/errwarn.c
-    libyasm/expr.c
-    libyasm/file.c
-    libyasm/floatnum.c
-    libyasm/hamt.c
-    libyasm/insn.c
-    libyasm/intnum.c
-    libyasm/inttree.c
-    libyasm/linemap.c
-    libyasm/md5.c
-    libyasm/mergesort.c
-    libyasm/phash.c
-    libyasm/replace_path.c
-    libyasm/section.c
-    libyasm/strcasecmp.c
-    libyasm/strsep.c
-    libyasm/symrec.c
-    libyasm/valparam.c
-    libyasm/value.c
-    libyasm/xmalloc.c
-    libyasm/xstrdup.c
-    modules/arch/lc3b/lc3barch.c
-    modules/arch/lc3b/lc3bbc.c
-    modules/arch/x86/x86arch.c
-    modules/arch/x86/x86bc.c
-    modules/arch/x86/x86expr.c
-    modules/arch/x86/x86id.c
-    modules/dbgfmts/codeview/cv-dbgfmt.c
-    modules/dbgfmts/codeview/cv-symline.c
-    modules/dbgfmts/codeview/cv-type.c
-    modules/dbgfmts/dwarf2/dwarf2-aranges.c
-    modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c
-    modules/dbgfmts/dwarf2/dwarf2-info.c
-    modules/dbgfmts/dwarf2/dwarf2-line.c
-    modules/dbgfmts/null/null-dbgfmt.c
-    modules/dbgfmts/stabs/stabs-dbgfmt.c
-    modules/gas-token.c
-    modules/init_plugin.c
-    modules/lc3bid.c
-    modules/listfmts/nasm/nasm-listfmt.c
-    modules/nasm-token.c
-    modules/objfmts/bin/bin-objfmt.c
-    modules/objfmts/coff/coff-objfmt.c
-    modules/objfmts/coff/win64-except.c
-    modules/objfmts/dbg/dbg-objfmt.c
-    modules/objfmts/elf/elf-objfmt.c
-    modules/objfmts/elf/elf-x86-amd64.c
-    modules/objfmts/elf/elf-x86-x32.c
-    modules/objfmts/elf/elf-x86-x86.c
-    modules/objfmts/elf/elf.c
-    modules/objfmts/macho/macho-objfmt.c
-    modules/objfmts/rdf/rdf-objfmt.c
-    modules/objfmts/xdf/xdf-objfmt.c
-    modules/parsers/gas/gas-parse-intel.c
-    modules/parsers/gas/gas-parse.c
-    modules/parsers/gas/gas-parser.c
-    modules/parsers/nasm/nasm-parse.c
-    modules/parsers/nasm/nasm-parser.c
-    modules/preprocs/cpp/cpp-preproc.c
-    modules/preprocs/gas/gas-eval.c
-    modules/preprocs/gas/gas-preproc.c
-    modules/preprocs/nasm/nasm-eval.c
-    modules/preprocs/nasm/nasm-pp.c
-    modules/preprocs/nasm/nasm-preproc.c
-    modules/preprocs/nasm/nasmlib.c
-    modules/preprocs/raw/raw-preproc.c
-    modules/x86cpu.c
-    modules/x86regtmod.c
-)
-
-END()
diff --git a/contrib/tools/yasm/ya.make b/contrib/tools/yasm/ya.make
index 79da84c6da..3c73fc38e5 100644
--- a/contrib/tools/yasm/ya.make
+++ b/contrib/tools/yasm/ya.make
@@ -3,16 +3,138 @@
 #    linux-x86_64
 #    windows-x86_64
 
+PROGRAM(yasm)
+
 VERSION(1.3.0)
 
-IF (USE_PREBUILT_TOOLS)
-    INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/yasm/ya.make.prebuilt)
-ENDIF()
+LICENSE(
+    Artistic-1.0 AND
+    Artistic-1.0-Perl AND
+    Artistic-2.0 AND
+    BSD-2-Clause AND
+    BSD-3-Clause AND
+    GPL-1.0-or-later AND
+    LGPL-2.0-or-later AND
+    LicenseRef-scancode-warranty-disclaimer AND
+    Public-Domain
+)
+
+LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-IF (NOT PREBUILT)
-    INCLUDE(${ARCADIA_ROOT}/contrib/tools/yasm/bin/ya.make)
+IF (MUSL)
+    PEERDIR(
+        contrib/libs/musl_extra
+        contrib/libs/jemalloc
+    )
+    DISABLE(USE_ASMLIB)
+    ENABLE(MUSL_LITE)
+ELSE()
+    NO_PLATFORM()
 ENDIF()
 
-RECURSE(
-    bin
+NO_CLANG_COVERAGE()
+
+NO_COMPILER_WARNINGS()
+
+NO_RUNTIME()
+
+NO_SANITIZE()
+
+ALLOCATOR(FAKE)
+
+ADDINCL(
+    contrib/tools/yasm
+    contrib/tools/yasm/frontends/yasm
+    contrib/tools/yasm/modules
+)
+
+CFLAGS(
+    -DHAVE_CONFIG_H
+    -DYASM_LIB_SOURCE
 )
+
+SRCDIR(contrib/tools/yasm)
+
+SRCS(
+    frontends/yasm/yasm-options.c
+    frontends/yasm/yasm.c
+    libyasm/assocdat.c
+    libyasm/bc-align.c
+    libyasm/bc-data.c
+    libyasm/bc-incbin.c
+    libyasm/bc-org.c
+    libyasm/bc-reserve.c
+    libyasm/bitvect.c
+    libyasm/bytecode.c
+    libyasm/cmake-module.c
+    libyasm/errwarn.c
+    libyasm/expr.c
+    libyasm/file.c
+    libyasm/floatnum.c
+    libyasm/hamt.c
+    libyasm/insn.c
+    libyasm/intnum.c
+    libyasm/inttree.c
+    libyasm/linemap.c
+    libyasm/md5.c
+    libyasm/mergesort.c
+    libyasm/phash.c
+    libyasm/replace_path.c
+    libyasm/section.c
+    libyasm/strcasecmp.c
+    libyasm/strsep.c
+    libyasm/symrec.c
+    libyasm/valparam.c
+    libyasm/value.c
+    libyasm/xmalloc.c
+    libyasm/xstrdup.c
+    modules/arch/lc3b/lc3barch.c
+    modules/arch/lc3b/lc3bbc.c
+    modules/arch/x86/x86arch.c
+    modules/arch/x86/x86bc.c
+    modules/arch/x86/x86expr.c
+    modules/arch/x86/x86id.c
+    modules/dbgfmts/codeview/cv-dbgfmt.c
+    modules/dbgfmts/codeview/cv-symline.c
+    modules/dbgfmts/codeview/cv-type.c
+    modules/dbgfmts/dwarf2/dwarf2-aranges.c
+    modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c
+    modules/dbgfmts/dwarf2/dwarf2-info.c
+    modules/dbgfmts/dwarf2/dwarf2-line.c
+    modules/dbgfmts/null/null-dbgfmt.c
+    modules/dbgfmts/stabs/stabs-dbgfmt.c
+    modules/gas-token.c
+    modules/init_plugin.c
+    modules/lc3bid.c
+    modules/listfmts/nasm/nasm-listfmt.c
+    modules/nasm-token.c
+    modules/objfmts/bin/bin-objfmt.c
+    modules/objfmts/coff/coff-objfmt.c
+    modules/objfmts/coff/win64-except.c
+    modules/objfmts/dbg/dbg-objfmt.c
+    modules/objfmts/elf/elf-objfmt.c
+    modules/objfmts/elf/elf-x86-amd64.c
+    modules/objfmts/elf/elf-x86-x32.c
+    modules/objfmts/elf/elf-x86-x86.c
+    modules/objfmts/elf/elf.c
+    modules/objfmts/macho/macho-objfmt.c
+    modules/objfmts/rdf/rdf-objfmt.c
+    modules/objfmts/xdf/xdf-objfmt.c
+    modules/parsers/gas/gas-parse-intel.c
+    modules/parsers/gas/gas-parse.c
+    modules/parsers/gas/gas-parser.c
+    modules/parsers/nasm/nasm-parse.c
+    modules/parsers/nasm/nasm-parser.c
+    modules/preprocs/cpp/cpp-preproc.c
+    modules/preprocs/gas/gas-eval.c
+    modules/preprocs/gas/gas-preproc.c
+    modules/preprocs/nasm/nasm-eval.c
+    modules/preprocs/nasm/nasm-pp.c
+    modules/preprocs/nasm/nasm-preproc.c
+    modules/preprocs/nasm/nasmlib.c
+    modules/preprocs/raw/raw-preproc.c
+    modules/x86cpu.c
+    modules/x86regtmod.c
+)
+
+END()