Library import 8 (#1074)

* Library import 8

* Add contrib/libs/cxxsupp/libcxx/include/__verbose_abort

4 files changed, 24 insertions, 3 deletions

diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 2980617c10..2de1678d8d 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -54,7 +54,7 @@ elsewhen ($PIE == "yes") {
 }
 
 when ($CLANG16 == "yes") {
-    CFLAGS+=-Wno-array-parameter -Wno-deprecate-lax-vec-conv-all -Wno-unqualified-std-cast-call -Wno-unused-but-set-parameter -Wno-unused-command-line-argument -Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-implicit-int -Wno-address-of-packed-member
+    CFLAGS+=-Wno-array-parameter -Wno-deprecate-lax-vec-conv-all -Wno-unqualified-std-cast-call -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-implicit-int -Wno-address-of-packed-member
 }
 
 when ($MSAN_TRACK_ORIGIN == "yes") {
@@ -67,6 +67,8 @@ when ($ARCH_XTENSA == "yes") {
 
 when ($OS_EMSCRIPTEN == "yes") {
     FSTACK=-fno-stack-protector
+    CFLAGS+=-D__EMSCRIPTEN__
+    CFLAGS+=-D_LIBCPP_HAS_MUSL_LIBC
 }
 
 CFLAGS+=$_C_FLAGS $DEBUG_INFO_FLAGS $_C_FOPTIONS $C_WARNING_OPTS $GCC_PREPROCESSOR_OPTS $USER_CFLAGS $USER_CFLAGS_GLOBAL
diff --git a/build/conf/java.conf b/build/conf/java.conf
index 1422fe9c6b..94e5835ab5 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -414,11 +414,26 @@ JDK_LATEST_VERSION=19
 JDK_LATEST_PEERDIR=build/platform/java/jdk/jdk${JDK_LATEST_VERSION}
 
 # tag:java-specific
+# Fill semantic by RUN_JAVA_PROGRAM()
+_SEM_RUN_JAVA_PROGRAM= \
+    && runs-ITEM \
+    && runs-args ${Args} \
+    && runs-classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} \
+    && runs-cwd ${cwd:CWD} \
+    && runs-in ${IN} \
+    && runs-in_dir ${IN_DIR} \
+    && runs-in_dirs_inputs ${IN_DIRS_INPUTS} \
+    && runs-in_noparse ${IN_NOPARSE} \
+    && runs-out ${OUT} \
+    && runs-out_dir ${OUT_DIR} \
+    && runs-tool ${TOOL}
+
 macro _DO_2_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq_", IN_DIRS_INPUTS[], IN{input}[], IN_NOPARSE{input}[], IN_DIR[], OUT_NOAUTO{output}[], OUT{output}[], TOOL{tool}[], OUT_DIR[], CLASSPATH[], ADD_SRCS_TO_CLASSPATH?"yes":"no", CWD="${ARCADIA_BUILD_ROOT}", STDOUT="", STDOUT_NOAUTO="", Args...) {
     _LATE_GLOB(${IN_DIRS_VAR} ${suf=/**/*:IN_DIR})
     _CHECK_RUN_JAVA_PROG_CLASSPATH($CLASSPATH)
     .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
     .CMD=${kv;hide:"p RJ"} ${kv;hide:"pc blue"} ${hide:JAVA_FAKEID} ${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/mkdir.py"} ${OUT_DIR} && ${cwd:CWD} $YMAKE_PYTHON ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON ${input:"build/scripts/stdout2stderr.py"} ${pre=--file=:STDOUT} ${output;hide:STDOUT} ${pre=--file=:STDOUT_NOAUTO} ${output;hide;noauto:STDOUT_NOAUTO} $YMAKE_PYTHON ${input:"build/scripts/fix_java_command_file_cp.py"} --build-root ${ARCADIA_BUILD_ROOT} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} ${Args} && $_GENTAR_HELPER($CLASSPATH $IN_DIR $IN $IN_NOPARSE $TOOL $Args OUT_DIR $OUT_DIR) ${input;hide:IN} ${input;context=TEXT;hide:IN_NOPARSE} ${output;noauto;hide:OUT_NOAUTO} ${output;hide:OUT} ${tool;hide:TOOL} ${IN_DIRS_INPUTS}
+    .SEM=_SEM_RUN_JAVA_PROGRAM
 }
 
 # tag:java-specific
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
index 8c191a251a..cf162a0db4 100644
--- a/build/conf/linkers/ld.conf
+++ b/build/conf/linkers/ld.conf
@@ -103,10 +103,10 @@ _C_SYSTEM_LIBRARIES=$_LD_USE_STDLIB $_LD_THREAD_LIBRARY $_LD_SYS_LIB -lc
 when ($MUSL == "yes") {
     _C_SYSTEM_LIBRARIES=-nostdlib
 }
-C_SYSTEM_LIBRARIES=$_C_SYSTEM_LIBRARIES
 when ($OS_EMSCRIPTEN == "yes") {
-    C_SYSTEM_LIBRARIES=-nostdlib
+    _C_SYSTEM_LIBRARIES=-nostdlib
 }
+C_SYSTEM_LIBRARIES=$_C_SYSTEM_LIBRARIES
 
 OBJADDE=
 
diff --git a/build/conf/sysincl.conf b/build/conf/sysincl.conf
index 6b2e9e97a8..0603fcdc4b 100644
--- a/build/conf/sysincl.conf
+++ b/build/conf/sysincl.conf
@@ -82,3 +82,7 @@ when ($ARCH_RISCV32) {
 when ($USE_ARCADIA_COMPILER_RUNTIME == "no") {
     SYSINCL+=build/sysincl/local-compiler-runtime.yml
 }
+
+when ($OS_EMSCRIPTEN) {
+    SYSINCL+=build/sysincl/emscripten.yml
+}