Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update pinned clang to clang-14 #1487

Closed
wants to merge 4 commits into from
Closed

Update pinned clang to clang-14 #1487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10890b8
Update version of clang used for building to match ubuntu 22.04
greg7mdp Aug 12, 2023
7f5dbd8
Update version and link.
greg7mdp Aug 12, 2023
3ce04be
We use `libc++`, so disable check for `libstdc++`
greg7mdp Aug 12, 2023
94a5122
When building with clang-14 it seems that we have to add some paths!
greg7mdp Aug 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/pinned_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export CORE_SYM='EOS'
DEP_DIR="$(realpath "$1")"
LEAP_DIR="$2"
JOBS="$3"
CLANG_VER=11.0.1
CLANG_VER=14.0.0
LLVM_VER=11.0.1
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )";
START_DIR="$(pwd)"
Expand Down Expand Up @@ -68,7 +68,7 @@ install_clang() {
if [ ! -d "${CLANG_DIR}" ]; then
echo "Installing Clang ${CLANG_VER} @ ${CLANG_DIR}"
mkdir -p "${CLANG_DIR}"
CLANG_FN="clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-16.04.tar.xz"
CLANG_FN="clang+llvm-${CLANG_VER}-x86_64-linux-gnu-ubuntu-18.04.tar.xz"
try wget -O "${CLANG_FN}" "https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VER}/${CLANG_FN}"
try tar -xvf "${CLANG_FN}" -C "${CLANG_DIR}"
pushdir "${CLANG_DIR}"
Expand Down
5 changes: 3 additions & 2 deletions scripts/pinned_toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ set(CMAKE_C_COMPILER_WORKS 1)
set(CMAKE_CXX_COMPILER_WORKS 1)
set(CMAKE_C_COMPILER ${CLANG_DIR}/bin/clang)
set(CMAKE_CXX_COMPILER ${CLANG_DIR}/bin/clang++)
set(LLVM_ENABLE_LIBCXX 1)

set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CLANG_DIR}/include/c++/v1 /usr/local/include /usr/include)
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CLANG_DIR}/include/c++/v1 ${CLANG_DIR}/include/x86_64-unknown-linux-gnu/c++/v1 /usr/local/include /usr/include)

set(CMAKE_C_FLAGS_INIT "-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie")
set(CMAKE_CXX_FLAGS_INIT "-nostdinc++ -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie")
Expand All @@ -16,4 +17,4 @@ endif()

set(CMAKE_SHARED_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++")
set(CMAKE_MODULE_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++")
set(CMAKE_CXX_STANDARD_LIBRARIES "${CLANG_DIR}/lib/libc++.a ${CLANG_DIR}/lib/libc++abi.a")
set(CMAKE_CXX_STANDARD_LIBRARIES "${CLANG_DIR}/lib/x86_64-unknown-linux-gnu/libc++.a ${CLANG_DIR}/lib/x86_64-unknown-linux-gnu/libc++abi.a")
145 changes: 145 additions & 0 deletions xx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
./programs/cleos/help_text.cpp.in: fc::to_string(log.get_context().get_line_number()) + " " +
./programs/cleos/main.cpp: return fc::to_string(fc::time_point::now().time_since_epoch().count());
./unittests/wasm-spec-tests/generator/eosio_test_generator.cpp: string name = "sub_apply_" + to_string(sub_apply_index);
./unittests/wasm-spec-tests/generator/eosio_test_generator.cpp: string name = "sub_apply_" + to_string(sub_apply_index);
./wasm-spec-tests/generator/eosio_test_generator.cpp: string name = "sub_apply_" + to_string(sub_apply_index);
./wasm-spec-tests/generator/eosio_test_generator.cpp: string name = "sub_apply_" + to_string(sub_apply_index);
./plugins/net_plugin/include/eosio/net_plugin/auto_bp_peering.hpp: static std::string to_string(const Container<account_name, Rest...>& peers) {
./plugins/net_plugin/include/eosio/net_plugin/auto_bp_peering.hpp: ("pending_downstream_neighbors", to_string(pending_downstream_neighbors)));
./plugins/net_plugin/include/eosio/net_plugin/auto_bp_peering.hpp: ("active_neighbors", to_string(active_neighbors)));
./plugins/net_plugin/include/eosio/net_plugin/auto_bp_peering.hpp: fc_dlog(self()->get_logger(), "peers_to_stay: ${peers_to_stay}", ("peers_to_stay", to_string(peers_to_stay)));
./plugins/net_plugin/include/eosio/net_plugin/auto_bp_peering.hpp: fc_dlog(self()->get_logger(), "peers to drop: ${peers_to_drop}", ("peers_to_drop", to_string(peers_to_drop)));
./libraries/libfc/include/fc/crypto/private_key.hpp: std::string to_string(const fc::yield_function_t& yield = fc::yield_function_t()) const;
./libraries/libfc/include/fc/crypto/public_key.hpp: std::string to_string(const fc::yield_function_t& yield = fc::yield_function_t()) const;
./libraries/libfc/include/fc/crypto/signature.hpp: std::string to_string(const fc::yield_function_t& yield = fc::yield_function_t()) const;
./libraries/libfc/include/fc/reflect/reflect.hpp: static const char* to_string(ENUM elem) { \
./libraries/libfc/include/fc/reflect/reflect.hpp: fc::throw_bad_enum_cast( fc::to_string(int64_t(elem)).c_str(), BOOST_PP_STRINGIZE(ENUM) ); \
./libraries/libfc/include/fc/reflect/reflect.hpp: static const char* to_string(int64_t i) { \
./libraries/libfc/include/fc/reflect/reflect.hpp: return to_string(ENUM(i)); \
./libraries/libfc/include/fc/reflect/reflect.hpp: return fc::to_string(int64_t(elem)); \
./libraries/libfc/include/fc/exception/exception.hpp: std::string to_string( log_level ll = log_level::info )const;
./libraries/libfc/include/fc/log/log_message.hpp: std::string to_string()const;
./libraries/libfc/include/fc/log/log_message.hpp: std::string to_string()const;
./libraries/libfc/include/fc/io/json.hpp: static std::string to_string( const variant& v, const yield_function_t& yield, const output_formatting format = output_formatting::stringify_large_ints_and_doubles);
./libraries/libfc/include/fc/io/json.hpp: static std::string to_string( const T& v, const fc::time_point& deadline, const output_formatting format = output_formatting::stringify_large_ints_and_doubles, const uint64_t max_len = max_length_limit )
./libraries/libfc/include/fc/io/json.hpp: return to_string( variant(v), yield, format );
./libraries/libfc/include/fc/io/enum_type.hpp: operator std::string()const { return fc::reflector<EnumType>::to_string(value); }
./libraries/libfc/include/fc/network/listener.hpp:inline std::string to_string(const boost::asio::ip::tcp::endpoint& endpoint) {
./libraries/libfc/include/fc/network/listener.hpp: info = fc::to_string(endpoint) + " resolved from " + local_address;
./libraries/libfc/include/fc/string.hpp: std::string to_string( double );
./libraries/libfc/include/fc/string.hpp: std::string to_string( uint64_t );
./libraries/libfc/include/fc/string.hpp: std::string to_string( int64_t );
./libraries/libfc/include/fc/string.hpp: std::string to_string( uint16_t );
./libraries/libfc/include/fc/string.hpp: inline std::string to_string( int32_t v ) { return to_string( int64_t(v) ); }
./libraries/libfc/include/fc/string.hpp: inline std::string to_string( uint32_t v ){ return to_string( uint64_t(v) ); }
./libraries/libfc/include/fc/string.hpp: inline std::string to_string( size_t s) { return to_string(uint64_t(s)); }
./libraries/libfc/include/fc/array.hpp: static std::string _name = std::string("fc::array<")+std::string(fc::get_typename<T>::name())+","+ fc::to_string(N) + ">";
./libraries/libfc/src/crypto/private_key.cpp: std::string private_key::to_string(const fc::yield_function_t& yield) const
./libraries/libfc/src/crypto/public_key.cpp: std::string public_key::to_string(const fc::yield_function_t& yield) const
./libraries/libfc/src/crypto/signature.cpp: std::string signature::to_string(const fc::yield_function_t& yield) const
./libraries/libfc/src/string.cpp: std::string to_string(double d)
./libraries/libfc/src/string.cpp: std::string to_string( uint64_t d)
./libraries/libfc/src/string.cpp: std::string to_string( int64_t d)
./libraries/libfc/src/string.cpp: std::string to_string( uint16_t d)
./libraries/libfc/src/exception.cpp: std::string exception::to_string( log_level ll )const
./libraries/libfc/src/exception.cpp: ss << "<- exception in to_string.\n";
./libraries/libfc/src/exception.cpp: ss << "<- timeout exception in to_string: " << e.what();
./libraries/libfc/src/exception.cpp: ss << "<- exception in to_string.\n";
./libraries/libfc/src/exception.cpp: ss << "<- exception in to_string.\n";
./libraries/libfc/src/log/gelf_appender.cpp: gelf_message["_log_id"] = fc::to_string(++gelf_log_counter);
./libraries/libfc/src/log/console_appender.cpp: file_line += fixed_size( 6, fc::to_string( context.get_line_number() ) );
./libraries/libfc/src/log/logger_config.cpp: thread_name = std::string( "thread-" ) + fc::to_string( thread_count++ );
./libraries/libfc/src/log/log_message.cpp: std::string log_context::to_string()const
./libraries/libfc/src/log/log_message.cpp: return my->thread_name + " " + my->file + ":" + fc::to_string(my->line) + " " + my->method;
./libraries/libfc/src/log/log_message.cpp: std::string log_level::to_string()const {
./libraries/libfc/src/io/json.cpp: auto s = to_string(v, yield, format);
./libraries/libfc/src/variant.cpp: return to_string(*reinterpret_cast<const double*>(this));
./libraries/libfc/src/variant.cpp: return to_string(*reinterpret_cast<const int64_t*>(this));
./libraries/libfc/src/variant.cpp: return to_string(*reinterpret_cast<const uint64_t*>(this));
./libraries/libfc/src/variant.cpp: // clean_append not needed as to_string is valid utf8
./libraries/libfc/src/time.cpp: std::string padded_ms = fc::to_string((uint64_t)(msec + 1000ULL)).substr(1);
./libraries/libfc/test/io/test_json.cpp:BOOST_AUTO_TEST_CASE(to_string_test)
./libraries/libfc/test/io/test_json.cpp: { // to_string( const variant& v, const fc::time_point& deadline, const uint64_t max_len = max_length_limit, output_formatting format = stringify_large_ints_and_doubles);
./libraries/libfc/test/io/test_json.cpp: { // to_string( const variant& v, const yield_function_t& yield, output_formatting format = stringify_large_ints_and_doubles);
./libraries/libfc/test/io/test_json.cpp: { // to_string template call
./libraries/testing/include/eosio/testing/tester.hpp: static string to_string(fc::variant x);
./libraries/testing/tester.cpp: string base_tester::to_string(fc::variant x) {
./libraries/chain/include/eosio/chain/authority.hpp: std::string to_string() const {
./libraries/chain/include/eosio/chain/name.hpp: std::string to_string()const;
./libraries/chain/include/eosio/chain/symbol.hpp: string ret = eosio::chain::to_string(p);
./libraries/chain/include/eosio/chain/symbol.hpp: string to_string() const { return string(*this); }
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp:inline std::string to_string( uint32_t field ) {
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp:inline std::string to_string( uint64_t field ) {
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp:inline std::string to_string( blocktype field ) {
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp:inline std::string to_string( memoryoptype field ) {
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp:inline std::string to_string( memarg field ) {
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp:inline std::string to_string( branchtabletype field ) {
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp: static auto to_string(Field& f) { return std::string(" ")+
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp: eosio::chain::wasm_ops::to_string(f); }
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp: static auto to_string(voidtype& f) { return ""; }
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp: std::string to_string() override { \
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp: return std::string(BOOST_PP_STRINGIZE(OP))+field_specific_params<DATA>::to_string( field ); \
./libraries/chain/include/eosio/chain/wasm_eosio_binary_ops.hpp: virtual std::string to_string() { return "instr"; }
./libraries/chain/name.cpp: EOS_ASSERT(to_string() == str, name_type_exception,
./libraries/chain/name.cpp: ("name", std::string(str))("normalized", to_string()));
./libraries/chain/name.cpp: // keep in sync with name::to_string() in contract definition for name
./libraries/chain/name.cpp: std::string name::to_string()const {
./libraries/chain/asset.cpp:string asset::to_string()const {
./libraries/chain/asset.cpp: string result = fc::to_string( static_cast<int64_t>(abs_amount) / precision());
./libraries/chain/asset.cpp: result += "." + fc::to_string(precision() + fract).erase(0,1);
./libraries/chain/asset.cpp: precision_digit_str = eosio::chain::to_string(amount_str.size() - dot_pos - 1);
./libraries/fc/include/fc/crypto/private_key.hpp: std::string to_string(const fc::yield_function_t& yield = fc::yield_function_t()) const;
./libraries/fc/include/fc/crypto/public_key.hpp: std::string to_string(const fc::yield_function_t& yield = fc::yield_function_t()) const;
./libraries/fc/include/fc/crypto/signature.hpp: std::string to_string(const fc::yield_function_t& yield = fc::yield_function_t()) const;
./libraries/fc/include/fc/reflect/reflect.hpp: static const char* to_string(ENUM elem) { \
./libraries/fc/include/fc/reflect/reflect.hpp: fc::throw_bad_enum_cast( fc::to_string(int64_t(elem)).c_str(), BOOST_PP_STRINGIZE(ENUM) ); \
./libraries/fc/include/fc/reflect/reflect.hpp: static const char* to_string(int64_t i) { \
./libraries/fc/include/fc/reflect/reflect.hpp: return to_string(ENUM(i)); \
./libraries/fc/include/fc/reflect/reflect.hpp: return fc::to_string(int64_t(elem)); \
./libraries/fc/include/fc/exception/exception.hpp: std::string to_string( log_level ll = log_level::info )const;
./libraries/fc/include/fc/log/log_message.hpp: string to_string()const;
./libraries/fc/include/fc/log/log_message.hpp: string to_string()const;
./libraries/fc/include/fc/io/json.hpp: static string to_string( const variant& v, const yield_function_t& yield, const output_formatting format = output_formatting::stringify_large_ints_and_doubles);
./libraries/fc/include/fc/io/json.hpp: static string to_string( const T& v, const fc::time_point& deadline, const output_formatting format = output_formatting::stringify_large_ints_and_doubles, const uint64_t max_len = max_length_limit )
./libraries/fc/include/fc/io/json.hpp: return to_string( variant(v), yield, format );
./libraries/fc/include/fc/io/enum_type.hpp: operator std::string()const { return fc::reflector<EnumType>::to_string(value); }
./libraries/fc/include/fc/string.hpp: fc::string to_string( double );
./libraries/fc/include/fc/string.hpp: fc::string to_string( uint64_t );
./libraries/fc/include/fc/string.hpp: fc::string to_string( int64_t );
./libraries/fc/include/fc/string.hpp: fc::string to_string( uint16_t );
./libraries/fc/include/fc/string.hpp: inline fc::string to_string( int32_t v ) { return to_string( int64_t(v) ); }
./libraries/fc/include/fc/string.hpp: inline fc::string to_string( uint32_t v ){ return to_string( uint64_t(v) ); }
./libraries/fc/include/fc/string.hpp: inline fc::string to_string( size_t s) { return to_string(uint64_t(s)); }
./libraries/fc/include/fc/string.hpp: fc::string to_string( double );
./libraries/fc/include/fc/string.hpp: fc::string to_string( uint64_t );
./libraries/fc/include/fc/string.hpp: fc::string to_string( int64_t );
./libraries/fc/include/fc/array.hpp: static std::string _name = std::string("fc::array<")+std::string(fc::get_typename<T>::name())+","+ fc::to_string(N) + ">";
./libraries/fc/src/crypto/pke.cpp: if( init ) { ERR_load_crypto_strings(); init = false; }
./libraries/fc/src/crypto/private_key.cpp: std::string private_key::to_string(const fc::yield_function_t& yield) const
./libraries/fc/src/crypto/public_key.cpp: std::string public_key::to_string(const fc::yield_function_t& yield) const
./libraries/fc/src/crypto/signature.cpp: std::string signature::to_string(const fc::yield_function_t& yield) const
./libraries/fc/src/string.cpp: fc::string to_string(double d)
./libraries/fc/src/string.cpp: fc::string to_string( uint64_t d)
./libraries/fc/src/string.cpp: fc::string to_string( int64_t d)
./libraries/fc/src/string.cpp: fc::string to_string( uint16_t d)
./libraries/fc/src/exception.cpp: string exception::to_string( log_level ll )const
./libraries/fc/src/exception.cpp: ss << "<- exception in to_string.\n";
./libraries/fc/src/exception.cpp: ss << "<- timeout exception in to_string: " << e.what();
./libraries/fc/src/exception.cpp: ss << "<- exception in to_string.\n";
./libraries/fc/src/exception.cpp: ss << "<- exception in to_string.\n";
./libraries/fc/src/log/gelf_appender.cpp: gelf_message["_log_id"] = fc::to_string(++gelf_log_counter);
./libraries/fc/src/log/console_appender.cpp: file_line += fixed_size( 6, fc::to_string( context.get_line_number() ) );
./libraries/fc/src/log/logger_config.cpp: thread_name = string( "thread-" ) + fc::to_string( thread_count++ );
./libraries/fc/src/log/log_message.cpp: fc::string log_context::to_string()const
./libraries/fc/src/log/log_message.cpp: return my->thread_name + " " + my->file + ":" + fc::to_string(my->line) + " " + my->method;
./libraries/fc/src/log/log_message.cpp: string log_level::to_string()const {
./libraries/fc/src/io/json.cpp: auto s = to_string(v, yield, format);
./libraries/fc/src/variant.cpp: return to_string(*reinterpret_cast<const double*>(this));
./libraries/fc/src/variant.cpp: return to_string(*reinterpret_cast<const int64_t*>(this));
./libraries/fc/src/variant.cpp: return to_string(*reinterpret_cast<const uint64_t*>(this));
./libraries/fc/src/variant.cpp: // clean_append not needed as to_string is valid utf8
./libraries/fc/src/time.cpp: string padded_ms = to_string((uint64_t)(msec + 1000ULL)).substr(1);
./libraries/fc/test/io/test_json.cpp:BOOST_AUTO_TEST_CASE(to_string_test)
./libraries/fc/test/io/test_json.cpp: { // to_string( const variant& v, const fc::time_point& deadline, const uint64_t max_len = max_length_limit, output_formatting format = stringify_large_ints_and_doubles);
./libraries/fc/test/io/test_json.cpp: { // to_string( const variant& v, const yield_function_t& yield, output_formatting format = stringify_large_ints_and_doubles);
./libraries/fc/test/io/test_json.cpp: { // to_string template call