diff --git a/ansible/roles/build-test-v8/files/gcc-bug-113960.patch b/ansible/roles/build-test-v8/files/gcc-bug-113960.patch deleted file mode 100644 index f833dba45..000000000 --- a/ansible/roles/build-test-v8/files/gcc-bug-113960.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/usr/include/c++/12/bits/stl_algobase.h -+++ b/usr/include/c++/12/bits/stl_algobase.h -@@ -1778,11 +1778,14 @@ - } - - #if __cpp_lib_three_way_comparison -- // Iter points to a contiguous range of unsigned narrow character type -- // or std::byte, suitable for comparison by memcmp. -- template -- concept __is_byte_iter = contiguous_iterator<_Iter> -- && __is_memcmp_ordered>::__value; -+ // Both iterators refer to contiguous ranges of unsigned narrow characters, -+ // or std::byte, or big-endian unsigned integers, suitable for comparison -+ // using memcmp. -+ template -+ concept __memcmp_ordered_with -+ = (__is_memcmp_ordered_with, -+ iter_value_t<_Iter2>>::__value) -+ && contiguous_iterator<_Iter1> && contiguous_iterator<_Iter2>; - - // Return a struct with two members, initialized to the smaller of x and y - // (or x if they compare equal) and the result of the comparison x <=> y. -@@ -1832,20 +1835,20 @@ - if (!std::__is_constant_evaluated()) - if constexpr (same_as<_Comp, __detail::_Synth3way> - || same_as<_Comp, compare_three_way>) -- if constexpr (__is_byte_iter<_InputIter1>) -- if constexpr (__is_byte_iter<_InputIter2>) -- { -- const auto [__len, __lencmp] = _GLIBCXX_STD_A:: -- __min_cmp(__last1 - __first1, __last2 - __first2); -- if (__len) -- { -- const auto __c -- = __builtin_memcmp(&*__first1, &*__first2, __len) <=> 0; -- if (__c != 0) -- return __c; -- } -- return __lencmp; -- } -+ if constexpr (__memcmp_ordered_with<_InputIter1, _InputIter2>) -+ { -+ const auto [__len, __lencmp] = _GLIBCXX_STD_A:: -+ __min_cmp(__last1 - __first1, __last2 - __first2); -+ if (__len) -+ { -+ const auto __blen = __len * sizeof(*__first1); -+ const auto __c -+ = __builtin_memcmp(&*__first1, &*__first2, __blen) <=> 0; -+ if (__c != 0) -+ return __c; -+ } -+ return __lencmp; -+ } - - while (__first1 != __last1) - { diff --git a/ansible/roles/build-test-v8/tasks/partials/rhel8-s390x.yml b/ansible/roles/build-test-v8/tasks/partials/rhel8-s390x.yml index 03c52cbd5..be0f8c7f1 100644 --- a/ansible/roles/build-test-v8/tasks/partials/rhel8-s390x.yml +++ b/ansible/roles/build-test-v8/tasks/partials/rhel8-s390x.yml @@ -7,7 +7,7 @@ # Older V8 builds still require Python 2. - name: install packages required to build V8 ansible.builtin.dnf: - name: ['GConf2-devel', 'python2', 'python2-pip', 'patch'] + name: ['GConf2-devel', 'python2', 'python2-pip'] state: present notify: package updated @@ -28,11 +28,3 @@ executable: pip-3 name: ['httplib2', 'six'] state: present - -- name: temporary patch for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113960 - ansible.posix.patch: - basedir: /opt/rh/gcc-toolset-12/root/ - ignore_whitespace: true - src: gcc-bug-113960.patch - strip: 1 - become: true