Message ID | 20230301071703.24640-1-bindudaniel1996@gmail.com |
---|---|
State | New |
Headers | show |
Series | [dunfell] gcc: Fix inconsistent noexcept specifier for valarray in libstdc++ | expand |
lgtm On Tue, Feb 28, 2023 at 11:17 PM BINDU <bindudaniel1996@gmail.com> wrote: > > From: Virendra Thakur <virendrak@kpit.com> > > Backport of gcc upstream commit 2b2d97fc545635a0f6aa9c9ee3b017394bc494bf > to gcc release 9.5.0. This fix is available to all release-branches > except releases/gcc-9 because upstream do not support gcc-9 now. > > Signed-off-by: Virendra Thakur <virendrak@kpit.com> > --- > meta/recipes-devtools/gcc/gcc-9.5.inc | 1 + > ...nsistent-noexcept-specific-for-valar.patch | 44 +++++++++++++++++++ > 2 files changed, 45 insertions(+) > create mode 100644 meta/recipes-devtools/gcc/gcc-9.5/0002-libstdc-Fix-inconsistent-noexcept-specific-for-valar.patch > > diff --git a/meta/recipes-devtools/gcc/gcc-9.5.inc b/meta/recipes-devtools/gcc/gcc-9.5.inc > index 6a0a892b10..ec28246bf3 100644 > --- a/meta/recipes-devtools/gcc/gcc-9.5.inc > +++ b/meta/recipes-devtools/gcc/gcc-9.5.inc > @@ -69,6 +69,7 @@ SRC_URI = "\ > file://0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch \ > file://0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ > file://0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch \ > + file://0002-libstdc-Fix-inconsistent-noexcept-specific-for-valar.patch \ > " > S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" > SRC_URI[sha256sum] = "27769f64ef1d4cd5e2be8682c0c93f9887983e6cfd1a927ce5a0a2915a95cf8f" > diff --git a/meta/recipes-devtools/gcc/gcc-9.5/0002-libstdc-Fix-inconsistent-noexcept-specific-for-valar.patch b/meta/recipes-devtools/gcc/gcc-9.5/0002-libstdc-Fix-inconsistent-noexcept-specific-for-valar.patch > new file mode 100644 > index 0000000000..506064bfc2 > --- /dev/null > +++ b/meta/recipes-devtools/gcc/gcc-9.5/0002-libstdc-Fix-inconsistent-noexcept-specific-for-valar.patch > @@ -0,0 +1,44 @@ > +From 60d966708d7cf105dccf128d2b7a38b0b2580a1a Mon Sep 17 00:00:00 2001 > +From: Jonathan Wakely <jwakely@redhat.com> > +Date: Fri, 5 Nov 2021 21:42:20 +0000 > +Subject: [PATCH] libstdc++: Fix inconsistent noexcept-specific for valarray > + begin/end > + > +These declarations should be noexcept after I added it to the > +definitions in <valarray>. > + > +libstdc++-v3/ChangeLog: > + > + * include/bits/range_access.h (begin(valarray), end(valarray)): > + Add noexcept. > + > +(cherry picked from commit 2b2d97fc545635a0f6aa9c9ee3b017394bc494bf) > + > +Upstream-Status: Backport [https://github.com/hkaelber/gcc/commit/2b2d97fc545635a0f6aa9c9ee3b017394bc494bf] > +Signed-off-by: Virendra Thakur <virendrak@kpit.com> > + > +--- > + libstdc++-v3/include/bits/range_access.h | 8 ++++---- > + 1 file changed, 4 insertions(+), 4 deletions(-) > + > +diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h > +index 3d99ea92027..4736e75fda1 100644 > +--- a/libstdc++-v3/include/bits/range_access.h > ++++ b/libstdc++-v3/include/bits/range_access.h > +@@ -101,10 +101,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > + > + template<typename _Tp> class valarray; > + // These overloads must be declared for cbegin and cend to use them. > +- template<typename _Tp> _Tp* begin(valarray<_Tp>&); > +- template<typename _Tp> const _Tp* begin(const valarray<_Tp>&); > +- template<typename _Tp> _Tp* end(valarray<_Tp>&); > +- template<typename _Tp> const _Tp* end(const valarray<_Tp>&); > ++ template<typename _Tp> _Tp* begin(valarray<_Tp>&) noexcept; > ++ template<typename _Tp> const _Tp* begin(const valarray<_Tp>&) noexcept; > ++ template<typename _Tp> _Tp* end(valarray<_Tp>&) noexcept; > ++ template<typename _Tp> const _Tp* end(const valarray<_Tp>&) noexcept; > + > + /** > + * @brief Return an iterator pointing to the first element of > +-- > +2.25.1 > \ No newline at end of file > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#177870): https://lists.openembedded.org/g/openembedded-core/message/177870 > Mute This Topic: https://lists.openembedded.org/mt/97309533/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-devtools/gcc/gcc-9.5.inc b/meta/recipes-devtools/gcc/gcc-9.5.inc index 6a0a892b10..ec28246bf3 100644 --- a/meta/recipes-devtools/gcc/gcc-9.5.inc +++ b/meta/recipes-devtools/gcc/gcc-9.5.inc @@ -69,6 +69,7 @@ SRC_URI = "\ file://0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch \ file://0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ file://0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch \ + file://0002-libstdc-Fix-inconsistent-noexcept-specific-for-valar.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[sha256sum] = "27769f64ef1d4cd5e2be8682c0c93f9887983e6cfd1a927ce5a0a2915a95cf8f" diff --git a/meta/recipes-devtools/gcc/gcc-9.5/0002-libstdc-Fix-inconsistent-noexcept-specific-for-valar.patch b/meta/recipes-devtools/gcc/gcc-9.5/0002-libstdc-Fix-inconsistent-noexcept-specific-for-valar.patch new file mode 100644 index 0000000000..506064bfc2 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.5/0002-libstdc-Fix-inconsistent-noexcept-specific-for-valar.patch @@ -0,0 +1,44 @@ +From 60d966708d7cf105dccf128d2b7a38b0b2580a1a Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <jwakely@redhat.com> +Date: Fri, 5 Nov 2021 21:42:20 +0000 +Subject: [PATCH] libstdc++: Fix inconsistent noexcept-specific for valarray + begin/end + +These declarations should be noexcept after I added it to the +definitions in <valarray>. + +libstdc++-v3/ChangeLog: + + * include/bits/range_access.h (begin(valarray), end(valarray)): + Add noexcept. + +(cherry picked from commit 2b2d97fc545635a0f6aa9c9ee3b017394bc494bf) + +Upstream-Status: Backport [https://github.com/hkaelber/gcc/commit/2b2d97fc545635a0f6aa9c9ee3b017394bc494bf] +Signed-off-by: Virendra Thakur <virendrak@kpit.com> + +--- + libstdc++-v3/include/bits/range_access.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h +index 3d99ea92027..4736e75fda1 100644 +--- a/libstdc++-v3/include/bits/range_access.h ++++ b/libstdc++-v3/include/bits/range_access.h +@@ -101,10 +101,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + + template<typename _Tp> class valarray; + // These overloads must be declared for cbegin and cend to use them. +- template<typename _Tp> _Tp* begin(valarray<_Tp>&); +- template<typename _Tp> const _Tp* begin(const valarray<_Tp>&); +- template<typename _Tp> _Tp* end(valarray<_Tp>&); +- template<typename _Tp> const _Tp* end(const valarray<_Tp>&); ++ template<typename _Tp> _Tp* begin(valarray<_Tp>&) noexcept; ++ template<typename _Tp> const _Tp* begin(const valarray<_Tp>&) noexcept; ++ template<typename _Tp> _Tp* end(valarray<_Tp>&) noexcept; ++ template<typename _Tp> const _Tp* end(const valarray<_Tp>&) noexcept; + + /** + * @brief Return an iterator pointing to the first element of +-- +2.25.1 \ No newline at end of file