-
Notifications
You must be signed in to change notification settings - Fork 183
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update GCC12 to latest commit; sync changes from gcc13 branch
- Loading branch information
Showing
28 changed files
with
282 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- a/CepGen/Utils/Drawer.h.orig 2023-06-05 11:45:35.916095554 +0200 | ||
| +++ b/CepGen/Utils/Drawer.h 2023-06-05 11:46:11.721935669 +0200 | ||
| @@ -20,6 +20,7 @@ | ||
| #define CepGen_Utils_Drawer_h | ||
|
|
||
| #include "CepGen/Modules/NamedModule.h" | ||
| +#include <cstdint> | ||
|
|
||
| namespace cepgen { | ||
| namespace utils { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --- grpc/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc.orig 2023-06-12 13:50:04.615712549 +0200 | ||
| +++ grpc/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc 2023-06-12 13:50:21.878566886 +0200 | ||
| @@ -37,6 +37,7 @@ | ||
|
|
||
| #include <algorithm> | ||
| #include <array> | ||
| +#include <limits> | ||
| #include "absl/base/internal/hide_ptr.h" | ||
| #include "absl/base/internal/raw_logging.h" | ||
| #include "absl/base/internal/spinlock.h" | ||
| --- grpc/third_party/abseil-cpp/absl/copts/GENERATED_AbseilCopts.cmake.orig 2023-06-12 13:50:35.303453601 +0200 | ||
| +++ grpc/third_party/abseil-cpp/absl/copts/GENERATED_AbseilCopts.cmake 2023-06-12 13:51:05.358200009 +0200 | ||
| @@ -202,6 +202,7 @@ | ||
|
|
||
| list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS | ||
| "-march=armv8-a+crypto" | ||
| + "-mno-outline-atomics" | ||
| ) | ||
|
|
||
| list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS | ||
| --- grpc/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.orig 2023-06-12 13:51:27.063016878 +0200 | ||
| +++ grpc/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2023-06-12 13:52:05.133695671 +0200 | ||
| @@ -125,7 +125,7 @@ | ||
| #else | ||
| const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; | ||
| #endif | ||
| - size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; | ||
| + size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask; | ||
| #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \ | ||
| defined(THREAD_SANITIZER) | ||
| // Account for sanitizer instrumentation requiring additional stack space. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| %define PipPreBuild export CARGO_HOME=%{_tmppath}/cargo_home | ||
| %define PipPreBuild export CARGO_HOME=%{_tmppath}/cargo_home; export CARGO_HTTP_CAINFO=/etc/ssl/cert.pem | ||
| BuildRequires: rust | ||
| Requires: py3-setuptools-rust py3-cffi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| From e3675f9c8dc3b35caeadc087fa7653ffefc3e0e9 Mon Sep 17 00:00:00 2001 | ||
| From: Arthur O'Dwyer <[email protected]> | ||
| Date: Thu, 17 Jun 2021 11:02:09 -0400 | ||
| Subject: [PATCH] Stop using std::iterator (deprecated in C++17). | ||
|
|
||
| --- | ||
| src/google/protobuf/reflection.h | 9 +++++-- | ||
| src/google/protobuf/repeated_field.h | 36 +++++++++++++++++++++------- | ||
| 2 files changed, 35 insertions(+), 10 deletions(-) | ||
|
|
||
| diff --git a/src/google/protobuf/reflection.h b/src/google/protobuf/reflection.h | ||
| index af8eb00ef84..bb41fbaeb52 100644 | ||
| --- a/src/google/protobuf/reflection.h | ||
| +++ b/src/google/protobuf/reflection.h | ||
| @@ -392,13 +392,18 @@ class PROTOBUF_EXPORT RepeatedFieldAccessor { | ||
|
|
||
| // Implement (Mutable)RepeatedFieldRef::iterator | ||
| template <typename T> | ||
| -class RepeatedFieldRefIterator | ||
| - : public std::iterator<std::forward_iterator_tag, T> { | ||
| +class RepeatedFieldRefIterator { | ||
| typedef typename RefTypeTraits<T>::AccessorValueType AccessorValueType; | ||
| typedef typename RefTypeTraits<T>::IteratorValueType IteratorValueType; | ||
| typedef typename RefTypeTraits<T>::IteratorPointerType IteratorPointerType; | ||
|
|
||
| public: | ||
| + using iterator_category = std::forward_iterator_tag; | ||
| + using value_type = T; | ||
| + using pointer = T*; | ||
| + using reference = T&; | ||
| + using difference_type = std::ptrdiff_t; | ||
| + | ||
| // Constructor for non-message fields. | ||
| RepeatedFieldRefIterator(const void* data, | ||
| const RepeatedFieldAccessor* accessor, bool begin) | ||
| diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h | ||
| index 3e3f601d7eb..c8fe9333dee 100644 | ||
| --- a/src/google/protobuf/repeated_field.h | ||
| +++ b/src/google/protobuf/repeated_field.h | ||
| @@ -2740,9 +2740,14 @@ RepeatedPtrField<Element>::pointer_end() const { | ||
| namespace internal { | ||
| // A back inserter for RepeatedField objects. | ||
| template <typename T> | ||
| -class RepeatedFieldBackInsertIterator | ||
| - : public std::iterator<std::output_iterator_tag, T> { | ||
| +class RepeatedFieldBackInsertIterator { | ||
| public: | ||
| + using iterator_category = std::output_iterator_tag; | ||
| + using value_type = T; | ||
| + using pointer = void; | ||
| + using reference = void; | ||
| + using difference_type = std::ptrdiff_t; | ||
| + | ||
| explicit RepeatedFieldBackInsertIterator( | ||
| RepeatedField<T>* const mutable_field) | ||
| : field_(mutable_field) {} | ||
| @@ -2762,9 +2767,14 @@ class RepeatedFieldBackInsertIterator | ||
|
|
||
| // A back inserter for RepeatedPtrField objects. | ||
| template <typename T> | ||
| -class RepeatedPtrFieldBackInsertIterator | ||
| - : public std::iterator<std::output_iterator_tag, T> { | ||
| +class RepeatedPtrFieldBackInsertIterator { | ||
| public: | ||
| + using iterator_category = std::output_iterator_tag; | ||
| + using value_type = T; | ||
| + using pointer = void; | ||
| + using reference = void; | ||
| + using difference_type = std::ptrdiff_t; | ||
| + | ||
| RepeatedPtrFieldBackInsertIterator(RepeatedPtrField<T>* const mutable_field) | ||
| : field_(mutable_field) {} | ||
| RepeatedPtrFieldBackInsertIterator<T>& operator=(const T& value) { | ||
| @@ -2793,9 +2803,14 @@ class RepeatedPtrFieldBackInsertIterator | ||
| // A back inserter for RepeatedPtrFields that inserts by transferring ownership | ||
| // of a pointer. | ||
| template <typename T> | ||
| -class AllocatedRepeatedPtrFieldBackInsertIterator | ||
| - : public std::iterator<std::output_iterator_tag, T> { | ||
| +class AllocatedRepeatedPtrFieldBackInsertIterator { | ||
| public: | ||
| + using iterator_category = std::output_iterator_tag; | ||
| + using value_type = T; | ||
| + using pointer = void; | ||
| + using reference = void; | ||
| + using difference_type = std::ptrdiff_t; | ||
| + | ||
| explicit AllocatedRepeatedPtrFieldBackInsertIterator( | ||
| RepeatedPtrField<T>* const mutable_field) | ||
| : field_(mutable_field) {} | ||
| @@ -2817,9 +2832,14 @@ class AllocatedRepeatedPtrFieldBackInsertIterator | ||
| // Almost identical to AllocatedRepeatedPtrFieldBackInsertIterator. This one | ||
| // uses the UnsafeArenaAddAllocated instead. | ||
| template <typename T> | ||
| -class UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator | ||
| - : public std::iterator<std::output_iterator_tag, T> { | ||
| +class UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator { | ||
| public: | ||
| + using iterator_category = std::output_iterator_tag; | ||
| + using value_type = T; | ||
| + using pointer = void; | ||
| + using reference = void; | ||
| + using difference_type = std::ptrdiff_t; | ||
| + | ||
| explicit UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator( | ||
| RepeatedPtrField<T>* const mutable_field) | ||
| : field_(mutable_field) {} |
Oops, something went wrong.