Merge pull request #14512 from ydb-platform/merge-libs-250213-0050

14 files changed, 41 insertions, 153 deletions

diff --git a/build/conf/licenses.json b/build/conf/licenses.json
index 792f8e829b..42627fda61 100644
--- a/build/conf/licenses.json
+++ b/build/conf/licenses.json
@@ -4,7 +4,6 @@
             "AFL-2.0",
             "Amazon-SL",
             "APSL-1.0",
-            "Artistic-2.0",
             "ASM-BSD-3-Clause",
             "BCL",
             "Bison-Exception",
@@ -39,7 +38,6 @@
             "CC-BY-SA-4.0",
             "CDDL",
             "CECILL-B",
-            "ClArtistic",
             "DSO-1.1",
             "Elastic-License-2.0",
             "FSFUL",
@@ -159,6 +157,7 @@
             "AGPL-3.0-or-later",
             "Artistic-1.0",
             "Artistic-1.0-Perl",
+            "ClArtistic",
             "confluent-community-1.0",
             "Moderne-Source-Available-License"
         ]
@@ -180,6 +179,7 @@
             "Apache-2.0",
             "Apache-2.0 WITH LLVM-exception",
             "APSL-2.0",
+            "Artistic-2.0",
             "Beerware",
             "blessing",
             "Brian-Gladman-3-Clause",
@@ -213,6 +213,7 @@
             "Cmu-Computing-Services",
             "CUP-Parser",
             "curl",
+            "Custom-clarified-artistic-proofread",
             "Custom-eigen",
             "Custom-fft2d",
             "Custom-fft4g",
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
index 2aa0f93b60..79006c21ab 100644
--- a/build/conf/linkers/ld.conf
+++ b/build/conf/linkers/ld.conf
@@ -354,13 +354,6 @@ _LD_LINK_LIB_EXTRA_INPUT=
 _LD_TAIL_LINK_LIB=$AUTO_INPUT $_LD_LINK_LIB_EXTRA_INPUT ${hide;kv:"p AR"} $TOOLCHAIN_ENV ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
 _LD_ARCHIVER=$YMAKE_PYTHON ${input:"build/scripts/link_lib.py"} ${quo:AR_TOOL} $AR_TYPE $_LD_LLVM_AR_FORMAT $ARCADIA_BUILD_ROOT $_LD_AR_PLUGIN -- $_LD_ARCHIVER_KV_PLUGIN --
 
-when ($MAPSMOBI_BUILD_TARGET == "yes") {
-    _LD_ARCHIVER+= "no-openssl3"
-}
-otherwise {
-    _LD_ARCHIVER+= "enable-openssl3"
-}
-
 _LD_LIB_GENERATE_MF=$GENERATE_MF &&
 when ($TIDY == "yes") {
     _LD_ARCHIVER=$YMAKE_PYTHON ${input:"build/scripts/clang_tidy_arch.py"} --source-root $ARCADIA_ROOT --build-root $ARCADIA_BUILD_ROOT --output-file
diff --git a/build/export_generators/cmake/build/scripts/create_recursive_library_for_cmake.py b/build/export_generators/cmake/build/scripts/create_recursive_library_for_cmake.py
index 4eb8013a91..001faecaa3 100644
--- a/build/export_generators/cmake/build/scripts/create_recursive_library_for_cmake.py
+++ b/build/export_generators/cmake/build/scripts/create_recursive_library_for_cmake.py
@@ -145,6 +145,8 @@ class FilesCombiner(object):
             'gnu',  # llvm_ar_format, used only if arch_type == 'LLVM_AR'
             opts.parsed_args.project_binary_dir,
             'None',  # plugin. Unused for now
+            '--',  # for plugins. Unused for now
+            '--',
         ]
         # the remaining archiving cmd args are [output, .. input .. ]
 
diff --git a/build/export_generators/cmake/generator.toml b/build/export_generators/cmake/generator.toml
index 9343bd58cb..b25cf88c35 100644
--- a/build/export_generators/cmake/generator.toml
+++ b/build/export_generators/cmake/generator.toml
@@ -209,12 +209,12 @@ copy=["cmake/FindJNITarget.cmake"]
 add_values=[{attr="includes", values=["cmake/FindJNITarget.cmake"]}]
 
 [[rules]]
-attrs=["target_commands-macro=run_antlr"]
+attrs=["custom_runs-command=run_antlr"]
 copy=["cmake/antlr.cmake"]
 add_values=[{attr="includes", values=["cmake/antlr.cmake"]}]
 
 [[rules]]
-attrs=["target_commands-macro=run_antlr4"]
+attrs=["custom_runs-command=run_antlr4"]
 copy=["cmake/antlr4.cmake"]
 add_values=[{attr="includes", values=["cmake/antlr4.cmake"]}]
 
diff --git a/build/export_generators/cmake/target_commands.jinja b/build/export_generators/cmake/target_commands.jinja
index ebc1ef6c13..6d28dce80d 100644
--- a/build/export_generators/cmake/target_commands.jinja
+++ b/build/export_generators/cmake/target_commands.jinja
@@ -21,7 +21,6 @@
 {%- if current_target.custom_runs|length -%}
 {%-     for custom_run in current_target.custom_runs %}
 {%-         set first_arg = custom_run.command|first %}
-{%-         set tail_args = custom_run.command|slice(1, custom_run.command|length - 1) %}
 {%-         if (first_arg == "run_antlr") or (first_arg == "run_antlr4") %}
 {{ first_arg }}(
 {%-             if custom_run.outputs|length %}
@@ -34,14 +33,16 @@
   WORKING_DIRECTORY
   {{ custom_run.cwd }}
 {%-             endif -%}
-{%-             if tail_args|length %}
-  ANTLR_ARGS
-{%-                 for tail_arg in tail_args %}
-  {{ tail_arg }}
+{%-             if custom_run.command|length > 1 %}
+  ANTLER_ARGS
+{%-                 for arg in custom_run.command -%}
+{%-                     if not loop.first %}
+  {{ arg }}
+{%-                     endif -%}
 {%-                 endfor -%}
-{%-             endif -%}
+{%-             endif %}
 )
-{%-         else %}
+{%          else %}
 add_custom_command(
 {%-             if custom_run.outputs|length %}
   OUTPUT
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index f7754c5849..7340df7db4 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -1,6 +1,7 @@
 {
     "bottles": {},
     "resources": {
+        "8018811524": "https://devtools-registry.s3.yandex.net/8018811524",
         "6277415836": "https://devtools-registry.s3.yandex.net/6277415836",
         "2214720943": "https://devtools-registry.s3.yandex.net/2214720943",
         "2214542408": "https://devtools-registry.s3.yandex.net/2214542408",
@@ -1065,8 +1066,11 @@
         "7512103615": "https://devtools-registry.s3.yandex.net/7512103615",
         "7324464594": "https://devtools-registry.s3.yandex.net/7324464594",
         "7654921682": "https://devtools-registry.s3.yandex.net/7654921682",
+        "8013116004": "https://devtools-registry.s3.yandex.net/8013116004",
+        "8013130168": "https://devtools-registry.s3.yandex.net/8013130168",
         "7487656957": "https://devtools-registry.s3.yandex.net/7487656957",
         "7458707245": "https://devtools-registry.s3.yandex.net/7458707245",
+        "8013150302": "https://devtools-registry.s3.yandex.net/8013150302",
         "7414146467": "https://devtools-registry.s3.yandex.net/7414146467",
         "7654793679": "https://devtools-registry.s3.yandex.net/7654793679",
         "7487672728": "https://devtools-registry.s3.yandex.net/7487672728",
@@ -1587,6 +1591,7 @@
         "5545691160": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5559524010": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5572005924": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+        "8018811524": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5675381622": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5683487438": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5707396874": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
@@ -2292,8 +2297,11 @@
         "7512103615": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/29fcd2aa-e0b5-481e-83c8-b7ff5e0157c9/yfm-docs.tar",
         "7324464594": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/32cc8c74-decd-44a8-bc8c-f8f0d7edfffe/yfm-docs.tar",
         "7654921682": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/33b2cf15-eb2e-44b8-a074-0c6f60f97a04/yfm-docs.tar",
+        "8013116004": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/33d7c3cf-e76f-40cb-9e98-59084b60928c/yfm-docs.tar",
+        "8013130168": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/47070d89-f0a5-4aed-a017-3bd4f9d1518f/yfm-docs.tar",
         "7487656957": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/4b747fb6-2d4e-4a7b-bbed-abb9a1e21761/yfm-docs.tar",
         "7458707245": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/4e7df89f-3762-4eba-ba73-562ccaeae548/yfm-docs.tar",
+        "8013150302": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/5af5fdb2-854a-4889-8d34-beb85f4a7c30/yfm-docs.tar",
         "7414146467": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/66167d72-07fa-444c-8493-dea0a39d034e/yfm-docs.tar",
         "7654793679": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/68b3d50f-8068-40b2-8e3c-96653135fcb5/yfm-docs.tar",
         "7487672728": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/68c62602-dfe7-4bea-873f-cae85e13071f/yfm-docs.tar",
diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc
index bb9b3abec6..4399fb5d13 100644
--- a/build/platform/test_tool/host.ya.make.inc
+++ b/build/platform/test_tool/host.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994789266)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018525488)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994784587)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018523316)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994797288)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018529985)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994780427)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018521599)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994793586)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018527620)
 
 ENDIF()
diff --git a/build/platform/test_tool/host_os.ya.make.inc b/build/platform/test_tool/host_os.ya.make.inc
index a43a6004b0..1b8adbc03a 100644
--- a/build/platform/test_tool/host_os.ya.make.inc
+++ b/build/platform/test_tool/host_os.ya.make.inc
@@ -1,12 +1,12 @@
 IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994642530)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018808572)
 ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994640050)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018807025)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994647367)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018811524)
 ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994637838)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018805118)
 ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
-    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994644702)
+    DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018809911)
 
 ENDIF()
diff --git a/build/plugins/_common.py b/build/plugins/_common.py
index 7925543cd2..e116d158f6 100644
--- a/build/plugins/_common.py
+++ b/build/plugins/_common.py
@@ -1,5 +1,4 @@
 import six
-import sys
 import hashlib
 import base64
 
@@ -61,15 +60,6 @@ def tobuilddir(fname):
         return fname
 
 
-def before(s, ss):
-    p = s.find(ss)
-
-    if p == -1:
-        return s
-
-    return s[:p]
-
-
 def sort_by_keywords(keywords, args):
     flat = []
     res = {}
@@ -115,30 +105,10 @@ def resolve_common_const(path):
     return path
 
 
-def resolve_to_abs_path(path, source_root, build_root):
-    if path.startswith('$S') and source_root is not None:
-        return path.replace('$S', source_root, 1)
-    if path.startswith('$B') and build_root is not None:
-        return path.replace('$B', build_root, 1)
-    return path
-
-
-def resolve_to_ymake_path(path):
-    return resolve_to_abs_path(path, '${ARCADIA_ROOT}', '${ARCADIA_BUILD_ROOT}')
-
-
 def get(fun, num):
     return fun()[num][0]
 
 
-def make_tuples(arg_list):
-    def tpl():
-        for x in arg_list:
-            yield (x, [])
-
-    return list(tpl())
-
-
 def resolve_includes(unit, src, paths):
     return unit.resolve_include([src] + paths) if paths else []
 
@@ -169,13 +139,6 @@ def skip_build_root(x):
     return x
 
 
-def get_interpreter_path():
-    interpreter_path = [sys.executable]
-    if 'ymake' in interpreter_path[0]:
-        interpreter_path.append('--python')
-    return interpreter_path
-
-
 def filter_out_by_keyword(test_data, keyword):
     def _iterate():
         i = 0
diff --git a/build/plugins/nots.py b/build/plugins/nots.py
index e3f8ab9f0a..7d7f151ae1 100644
--- a/build/plugins/nots.py
+++ b/build/plugins/nots.py
@@ -2,6 +2,7 @@ import os
 from enum import auto, StrEnum
 from typing import Any, Literal, TYPE_CHECKING
 
+
 # noinspection PyUnresolvedReferences
 import ymake
 
diff --git a/build/scripts/link_exe.py b/build/scripts/link_exe.py
index 89695f2b98..de5e215ab5 100644
--- a/build/scripts/link_exe.py
+++ b/build/scripts/link_exe.py
@@ -27,9 +27,6 @@ def get_leaks_suppressions(cmd):
     return supp, newcmd
 
 
-MUSL_LIBS = '-lc', '-lcrypt', '-ldl', '-lm', '-lpthread', '-lrt', '-lutil'
-
-
 CUDA_LIBRARIES = {
     '-lcublas_static': '-lcublas',
     '-lcublasLt_static': '-lcublasLt',
@@ -258,14 +255,6 @@ def fix_sanitize_flag(cmd, opts):
     return flags
 
 
-def fix_cmd_for_musl(cmd):
-    flags = []
-    for flag in cmd:
-        if flag not in MUSL_LIBS:
-            flags.append(flag)
-    return flags
-
-
 def fix_cmd_for_dynamic_cuda(cmd):
     flags = []
     for flag in cmd:
@@ -325,7 +314,6 @@ def fix_blas_resolving(cmd):
 def parse_args(args):
     parser = optparse.OptionParser()
     parser.disable_interspersed_args()
-    parser.add_option('--musl', action='store_true')
     parser.add_option('--custom-step')
     parser.add_option('--python')
     parser.add_option('--source-root')
@@ -364,9 +352,6 @@ if __name__ == '__main__':
     cmd = fix_blas_resolving(args)
     cmd = fix_py2(cmd)
     cmd = remove_excessive_flags(cmd)
-    if opts.musl:
-        cmd = fix_cmd_for_musl(cmd)
-
     cmd = fix_sanitize_flag(cmd, opts)
 
     if opts.dynamic_cuda:
diff --git a/build/scripts/link_lib.py b/build/scripts/link_lib.py
index b792540fd0..5db51d7c69 100644
--- a/build/scripts/link_lib.py
+++ b/build/scripts/link_lib.py
@@ -25,9 +25,8 @@ class Opts(object):
         self.llvm_ar_format = args[2]
         self.build_root = args[3]
         self.plugin = args[4]
-        self.enable_openssl3 = args[5]
-        self.output = args[6]
-        auto_input = args[7:]
+        self.output = args[5]
+        auto_input = args[6:]
 
         self.need_modify = False
         self.extra_args = []
@@ -66,68 +65,6 @@ def get_opts(args):
     return Opts(args)
 
 
-def run(*args):
-    return subprocess.check_output(list(args), shell=False).strip()
-
-
-def gen_renames_1(d):
-    for l in d.split('\n'):
-        l = l.strip()
-
-        if ' ' in l:
-            yield l.split(' ')[-1]
-
-
-def have_prefix(l, p):
-    for x in l:
-        if not x.startswith(p):
-            return False
-
-    return True
-
-
-def gen_renames_2(p, d):
-    l = list(gen_renames_1(d))
-    a = have_prefix(l, '_')
-
-    for s in l:
-        if 'asan_globals' in s:
-            continue
-
-        if s in ['HMAC', 'SHA1', 'SHA256', 'SHA256', 'SHA512', 'RC4', 'MD5', 'SHA384']:
-            continue
-
-        if a and s[1:] in ['HMAC', 'SHA1', 'SHA256', 'SHA256', 'SHA512', 'RC4', 'MD5', 'SHA384']:
-            continue
-
-        if a:
-            yield s + ' _' + p + s[1:]
-        else:
-            yield s + ' ' + p + s
-
-
-def gen_renames(p, d):
-    return '\n'.join(gen_renames_2(p, d)).strip() + '\n'
-
-
-def rename_syms(where, ret):
-    p = 'v1_'
-
-    # find symbols to rename
-    syms = run(where + 'llvm-nm', '--extern-only', '--defined-only', '-A', ret)
-
-    # prepare rename plan
-    renames = gen_renames(p, syms)
-    tmp = ret + '.syms'
-
-    with open(tmp, 'w') as f:
-        f.write(renames)
-
-    # rename symbols
-    run(where + 'llvm-objcopy', '--redefine-syms=' + tmp, ret)
-    os.unlink(tmp)
-
-
 if __name__ == "__main__":
     opts = get_opts(sys.argv[1:])
 
@@ -176,8 +113,5 @@ if __name__ == "__main__":
     if exit_code != 0:
         raise Exception('{0} returned non-zero exit code {1}. Stop.'.format(' '.join(cmd), exit_code))
 
-    if opts.enable_openssl3 != 'no-openssl3' and os.path.basename(opts.output) in ['libcontrib-libs-openssl.a', 'liblibs-openssl-crypto.a']:
-        rename_syms(os.path.dirname(opts.archiver) + '/', opts.output)
-
     if opts.ar_plugin:
         subprocess.check_call([sys.executable, opts.ar_plugin, opts.output, '--'] + sys.argv[1:])
diff --git a/build/sysincl/linux-headers.yml b/build/sysincl/linux-headers.yml
index 27a924b0a6..f26a0b2d6e 100644
--- a/build/sysincl/linux-headers.yml
+++ b/build/sysincl/linux-headers.yml
@@ -857,6 +857,7 @@
   - linux/prctl.h
   - linux/psample.h
   - linux/psci.h
+  - linux/psp-dbc.h
   - linux/psp-sev.h
   - linux/ptp_clock.h
   - linux/ptrace.h
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index e29b47c469..34a2f5dbb2 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -770,7 +770,6 @@ module _BASE_UNIT: _BARE_UNIT {
     when ($MUSL == "yes") {
         CFLAGS += -D_musl_
         LINK_DYN_LIB_FLAGS += --musl
-        LINK_SCRIPT_EXE_FLAGS += --musl
         PEERDIR+=contrib/libs/musl/include
     }
 
@@ -4568,10 +4567,10 @@ macro RUN_PYTHON3(ScriptPath, IN{input}[], IN_NOPARSE{input}[], OUT{output}[], O
 }
 
 # tag:java-specific
-macro _RUN_ANTLR_BASE(IN{input}[], IN_NOPARSE{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], INDUCED_DEPS[], TOOL[], STDOUT="", STDOUT_NOAUTO="", CWD="", JAR[], SEM="run_java", SEM_ARGS_PREFIX="", ENV[], HIDE_OUTPUT?"stderr2stdout":"stdout2stderr", Args...) {
+macro _RUN_ANTLR_BASE(IN{input}[], IN_NOPARSE{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], INDUCED_DEPS[], TOOL[], STDOUT="", STDOUT_NOAUTO="", CWD="", JAR[], SEM="run_java", ENV[], HIDE_OUTPUT?"stderr2stdout":"stdout2stderr", Args...) {
     PEERDIR(build/platform/java/jdk $JDK_RESOURCE_PEERDIR)
     .CMD=${cwd:CWD} ${env:ENV} $YMAKE_PYTHON ${input;pre=build/scripts/:HIDE_OUTPUT.py} $JDK_RESOURCE/bin/java $JAR $Args ${hide;tool:TOOL} ${hide;input:IN} ${hide;context=TEXT;input:IN_NOPARSE} ${hide;output_include:OUTPUT_INCLUDES} $INDUCED_DEPS ${hide;output:OUT} ${hide;noauto;output:OUT_NOAUTO} ${stdout;output:STDOUT} ${stdout;noauto;output:STDOUT_NOAUTO} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
-    .SEM=custom_runs-ITEM && custom_runs-depends ${input:IN} && custom_runs-command $SEM $Args && custom_runs-outputs ${output:OUT} ${noauto;output:OUT_NOAUTO} ${pre=&& custom_runs-cwd :CWD}
+    .SEM=custom_runs-ITEM && custom_runs-depends ${input:IN} && custom_runs-command $SEM && custom_runs-command $Args && custom_runs-outputs ${output:OUT} ${noauto;output:OUT_NOAUTO} ${pre=&& custom_runs-cwd :CWD}
 }
 
 ### @usage: FROM_SANDBOX([FILE] resource_id [AUTOUPDATED script] [RENAME <resource files>] OUT_[NOAUTO] <output files> [EXECUTABLE] [OUTPUT_INCLUDES <include files>] [INDUCED_DEPS $VARs...])
@@ -4930,14 +4929,14 @@ macro ASM_PREINCLUDE(PREINCLUDES...) {
 ###
 ### Macro to invoke ANTLR3 generator (general case)
 macro RUN_ANTLR(IN[], IN_NOPARSE[], OUT[], OUT_NOAUTO[], OUTPUT_INCLUDES[], INDUCED_DEPS[], CWD="", Args...) {
-    _RUN_ANTLR_BASE($Args IN $IN IN_NOPARSE $IN_NOPARSE OUT $OUT OUT_NOAUTO $OUT_NOAUTO OUTPUT_INCLUDES $OUTPUT_INCLUDES INDUCED_DEPS $INDUCED_DEPS ${pre=CWD :CWD} JAR -jar ${input:"contrib/java/antlr/antlr3/antlr.jar"} SEM run_antlr SEM_ARGS_PREFIX ANTLER_ARGS)
+    _RUN_ANTLR_BASE($Args IN $IN IN_NOPARSE $IN_NOPARSE OUT $OUT OUT_NOAUTO $OUT_NOAUTO OUTPUT_INCLUDES $OUTPUT_INCLUDES INDUCED_DEPS $INDUCED_DEPS ${pre=CWD :CWD} JAR -jar ${input:"contrib/java/antlr/antlr3/antlr.jar"} SEM run_antlr)
 }
 
 ### @usage: RUN_ANTLR4(Args...)
 ###
 ### Macro to invoke ANTLR4 generator (general case)
 macro RUN_ANTLR4(IN[], IN_NOPARSE[], OUT[], OUT_NOAUTO[], OUTPUT_INCLUDES[], INDUCED_DEPS[], CWD="", Args...) {
-    _RUN_ANTLR_BASE($Args IN $IN IN_NOPARSE $IN_NOPARSE OUT $OUT OUT_NOAUTO $OUT_NOAUTO OUTPUT_INCLUDES $OUTPUT_INCLUDES INDUCED_DEPS $INDUCED_DEPS ${pre=CWD :CWD} JAR -jar ${input:"contrib/java/antlr/antlr4/antlr.jar"} SEM run_antlr4 SEM_ARGS_PREFIX ANTLER_ARGS)
+    _RUN_ANTLR_BASE($Args IN $IN IN_NOPARSE $IN_NOPARSE OUT $OUT OUT_NOAUTO $OUT_NOAUTO OUTPUT_INCLUDES $OUTPUT_INCLUDES INDUCED_DEPS $INDUCED_DEPS ${pre=CWD :CWD} JAR -jar ${input:"contrib/java/antlr/antlr4/antlr.jar"} SEM run_antlr4)
 }
 
 _ANTLR4_LISTENER_GRAMMAR=-listener