GithubHelp home page GithubHelp logo

clickhouse / boost Goto Github PK

View Code? Open in Web Editor NEW
1.0 16.0 25.0 197.3 MB

Minimized boost lib

License: Boost Software License 1.0

C++ 59.70% C 0.53% Perl 0.01% HTML 38.02% Assembly 0.13% Shell 0.04% Python 0.28% M4 0.01% Batchfile 0.01% CMake 0.18% CSS 0.24% Max 0.01% XSLT 0.16% Cuda 0.03% Makefile 0.06% Eiffel 0.01% D 0.01% JavaScript 0.54% TeX 0.02% CWeb 0.04%

boost's Issues

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.

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.