clickhouse/boost

Minimized boost lib

Boost C++ Libraries

The Boost project provides free peer-reviewed portable C++ source libraries.

We emphasize libraries that work well with the C++ Standard Library. Boost libraries are intended to be widely useful, and usable across a broad spectrum of applications. The Boost license encourages both commercial and non-commercial use and does not require attribution for binary use.

The project website is www.boost.org, where you can obtain more information and download the current release.

boost's Issues

Add support for RISC-V

boostorg/context@c8fb4a4 contains some changes required for boost context to compile on risc-v. Clickhouse's bundled boost based on older version and doesn't have this commit yet.

About boost:date_time and boost::thread

I have seen the boost::date_time and boost::thread in the add_boost_thread branch.
When will they be merged into the master? @nikitamikhaylov

libs/context/src/asm/make_riscv64_sysv_elf_gas.S git confict mark

Trying to build ClickHouse with RISC-V target.

cd ClickHouse
mkdir build-riscv64
CC=clang-14 CXX=clang++-14 cmake . -Bbuild-riscv64 -G Ninja -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-riscv64.cmake -DGLIBC_COMPATIBILITY=OFF -DENABLE_LDAP=OFF  -DOPENSSL_NO_ASM=ON -DENABLE_JEMALLOC=ON -DENABLE_PARQUET=OFF -DENABLE_ORC=OFF -DUSE_UNWIND=OFF -DENABLE_GRPC=OFF -DENABLE_HDFS=OFF -DENABLE_MYSQL=OFF
ninja -C build-riscv64

Getting following error:

ninja: Entering directory `build-riscv64'
[0/2] Re-checking globbed directories...
[162/7673] Building ASM object contrib/boost-cmake/CMakeFiles/_boost_context.dir/__/boost/libs/context/src/asm/make_riscv64_sysv_elf_gas.S.o
FAILED: contrib/boost-cmake/CMakeFiles/_boost_context.dir/__/boost/libs/context/src/asm/make_riscv64_sysv_elf_gas.S.o 
/usr/bin/clang-14 -target riscv64-linux-gnu --sysroot=/src/ClickHouse/cmake/linux/../../contrib/sysroot/linux-riscv64 -DHAS_RESERVED_IDENTIFIER -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS -I/src/ClickHouse/contrib/boost -isystem /src/ClickHouse/contrib/libcxx/include -isystem /src/ClickHouse/contrib/libcxx/src -isystem /src/ClickHouse/contrib/libcxxabi/include --gcc-toolchain=/src/ClickHouse/cmake/linux/../../contrib/sysroot/linux-riscv64 --gcc-toolchain=/src/ClickHouse/cmake/linux/../../contrib/sysroot/linux-riscv64 -ffile-prefix-map=/src/ClickHouse=.  -gdwarf-aranges -pipe -fasynchronous-unwind-tables -ffile-prefix-map=/src/ClickHouse=. -falign-functions=32  -O2 -g -DNDEBUG -O3 -g -gdwarf-4    -D OS_LINUX -Werror -MD -MT contrib/boost-cmake/CMakeFiles/_boost_context.dir/__/boost/libs/context/src/asm/make_riscv64_sysv_elf_gas.S.o -MF contrib/boost-cmake/CMakeFiles/_boost_context.dir/__/boost/libs/context/src/asm/make_riscv64_sysv_elf_gas.S.o.d -o contrib/boost-cmake/CMakeFiles/_boost_context.dir/__/boost/libs/context/src/asm/make_riscv64_sysv_elf_gas.S.o -c /src/ClickHouse/contrib/boost/libs/context/src/asm/make_riscv64_sysv_elf_gas.S
/src/ClickHouse/contrib/boost/libs/context/src/asm/make_riscv64_sysv_elf_gas.S:78:1: error: version control conflict marker in file
<<<<<<< HEAD
^
/src/ClickHouse/contrib/boost/libs/context/src/asm/make_riscv64_sysv_elf_gas.S:91:1: error: version control conflict marker in file
<<<<<<< HEAD
^
2 errors generated.
[195/7673] Building CXX object contrib/boost-cmake/CMakeFiles/_boost_regex.dir/__/boost/libs/regex/src/wide_posix_api.cpp.o
ninja: build stopped: subcommand failed.

boost/libs/context/src/asm/make_riscv64_sysv_elf_gas.S

Lines 60 to 96 in c0807e8

	.file "make_riscv64_sysv_elf_gas.S"
	.text
	.align 1
	.global make_fcontext
	.type make_fcontext, %function
	make_fcontext:
	# shift address in a0 (allocated stack) to lower 16 byte boundary
	andi a0, a0, ~0xF
	# reserve space for context-data on context-stack
	addi a0, a0, -0xd0
	# third arg of make_fcontext() == address of context-function
	# store address as a PC to jump in
	sd a2, 0xc8(a0)
	# save address of finish as return-address for context-function
	# will be entered after context-function returns (RA register)
	<<<<<<< HEAD
	la a4, finish
	=======
	lla a4, finish
	>>>>>>> d0b4a3b3 (Update libs to 1.78.0 and remove extras)
	sd a4, 0xc0(a0)
	ret // return pointer to context-data (a0)
	finish:
	# exit code is zero
	li a0, 0
	# exit application
	<<<<<<< HEAD
	tail _exit
	=======
	tail _exit@plt
	>>>>>>> d0b4a3b3 (Update libs to 1.78.0 and remove extras)

cc @Algunenano @alexey-milovidov

Bad merge?

I've tried to fix it, but I don't know C++/ASM/RISCV at all, so someone should take alook:

diff --git a/libs/context/src/asm/make_riscv64_sysv_elf_gas.S b/libs/context/src/asm/make_riscv64_sysv_elf_gas.S
index 8b8620e7..5322e0fd 100644
--- a/libs/context/src/asm/make_riscv64_sysv_elf_gas.S
+++ b/libs/context/src/asm/make_riscv64_sysv_elf_gas.S
@@ -75,11 +75,7 @@ make_fcontext:
 
     # save address of finish as return-address for context-function
     # will be entered after context-function returns (RA register)
-<<<<<<< HEAD
-    la  a4, finish
-=======
     lla  a4, finish
->>>>>>> d0b4a3b3 (Update libs to 1.78.0 and remove extras)
     sd  a4, 0xc0(a0)
 
     ret // return pointer to context-data (a0)
@@ -88,11 +84,7 @@ finish:
     # exit code is zero
     li  a0, 0
     # exit application
-<<<<<<< HEAD
-    tail  _exit
-=======
     tail  _exit@plt
->>>>>>> d0b4a3b3 (Update libs to 1.78.0 and remove extras)
 
 .size   make_fcontext,.-make_fcontext
 # Mark that we don't need executable stack.