mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-08 02:40:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor fixes

Browse source
This commit is contained in:
Farid Zakaria 2023-07-08 20:02:40 +00:00
parent 640d1aec04
commit 6bc04598bf
4 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
third_party/libcxx/span vendored
View file

@ -1,8 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
<<<<<<< HEAD
// clang-format off // clang-format off
=======
>>>>>>> 80151924e (wip)
//===------------------------------ span ---------------------------------===// //===------------------------------ span ---------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@ -133,17 +130,10 @@ template<class Container>
*/ */
#include "third_party/libcxx/__config" #include "third_party/libcxx/__config"
<<<<<<< HEAD
#include "third_party/libcxx/iterator" // for iterators #include "third_party/libcxx/iterator" // for iterators
#include "third_party/libcxx/array" // for array #include "third_party/libcxx/array" // for array
#include "third_party/libcxx/type_traits" // for remove_cv, etc #include "third_party/libcxx/type_traits" // for remove_cv, etc
#include "third_party/libcxx/cstddef" // for byte #include "third_party/libcxx/cstddef" // for byte
=======
#include "third_party/libcxx/cstddef" // for ptrdiff_t
#include "third_party/libcxx/iterator" // for iterators
#include "third_party/libcxx/array" // for array
#include "third_party/libcxx/type_traits" // for remove_cv, etc
>>>>>>> 80151924e (wip)
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header #pragma GCC system_header
@ -598,8 +588,4 @@ template<class _Container>
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
<<<<<<< HEAD
#endif // _LIBCPP_SPAN #endif // _LIBCPP_SPAN
=======
#endif // _LIBCPP_SPAN
>>>>>>> 80151924e (wip)

3
third_party/mold/fake_tbb.h vendored
View file

@ -3,6 +3,9 @@
namespace tbb { namespace tbb {
template <typename T>
using concurrent_vector = std::vector<T>;
template<typename InputIterator, typename Function> template<typename InputIterator, typename Function>
void parallel_for_each(InputIterator first, InputIterator last, const Function& f) { void parallel_for_each(InputIterator first, InputIterator last, const Function& f) {
} }

4
third_party/mold/mold.mk vendored
View file

@ -13,6 +13,10 @@ THIRD_PARTY_MOLD_OBJS = $(THIRD_PARTY_MOLD_SRCS:%.cc=o/$(MODE)/%.o)
THIRD_PARTY_MOLD_A_DIRECTDEPS = \ THIRD_PARTY_MOLD_A_DIRECTDEPS = \
THIRD_PARTY_LIBCXX \ THIRD_PARTY_LIBCXX \
LIBC_STR \
LIBC_INTRIN \
LIBC_STDIO \
LIBC_RUNTIME \
THIRD_PARTY_ZSTD \ THIRD_PARTY_ZSTD \
THIRD_PARTY_XXHASH \ THIRD_PARTY_XXHASH \
THIRD_PARTY_GETOPT \ THIRD_PARTY_GETOPT \

6
third_party/mold/perf.cc vendored
View file

@ -1,9 +1,11 @@
// clang-format off // clang-format off
#include "third_party/mold/common.h" #include "third_party/mold/common.h"
#include "third_party/mold/fake_tbb.h"
#include "third_party/libcxx/functional" #include "third_party/libcxx/functional"
#include "third_party/libcxx/iomanip" #include "third_party/libcxx/iomanip"
#include "third_party/libcxx/ios" #include "third_party/libcxx/ios"
#include "third_party/libcxx/numeric"
#ifndef _WIN32 #ifndef _WIN32
#include "libc/calls/calls.h" #include "libc/calls/calls.h"
@ -27,7 +29,9 @@
namespace mold { namespace mold {
i64 Counter::get_value() { i64 Counter::get_value() {
return values.combine(std::plus()); return std::accumulate(values.begin(), values.end(), 0, [](i64 a, const std::pair<Counter*, i64>& b) {
return a + b.second;
});
} }
void Counter::print() { void Counter::print() {