[gcc-6] 345/401: * Apply the header changes for PR libstdc++/64735 on armel as well, conditionalized to keep the header unchanged for other architectures. Closes: #851273.
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:50:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.
commit 22cadb301ea7b9e1c220dc769d6f7482bfe2a578
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Fri Jan 13 17:38:27 2017 +0000
* Apply the header changes for PR libstdc++/64735 on armel as well,
conditionalized to keep the header unchanged for other architectures.
Closes: #851273.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9225 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 3 +
debian/patches/pr64735-headers.diff | 60 +++++++++++++++
debian/patches/pr64735.diff | 146 ++++++++++++++++++------------------
debian/rules.patch | 1 +
4 files changed, 137 insertions(+), 73 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 67d914c..2700f93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ gcc-6 (6.3.0-3) UNRELEASED; urgency=medium
* Don't add the configured prefix to libcc1's compiler name.
Closes: #851146.
* Update the Linaro support to the 6.3-2017.01 snapshot.
+ * Apply the header changes for PR libstdc++/64735 on armel as well,
+ conditionalized to keep the header unchanged for other architectures.
+ Closes: #851273.
-- Matthias Klose <doko at debian.org> Thu, 12 Jan 2017 13:04:12 +0100
diff --git a/debian/patches/pr64735-headers.diff b/debian/patches/pr64735-headers.diff
new file mode 100644
index 0000000..d50cdff
--- /dev/null
+++ b/debian/patches/pr64735-headers.diff
@@ -0,0 +1,60 @@
+--- a/src/libstdc++-v3/include/std/future
++++ b/src/libstdc++-v3/include/std/future
+@@ -183,7 +183,7 @@
+ async(_Fn&& __fn, _Args&&... __args);
+
+ #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
+- && (ATOMIC_INT_LOCK_FREE > 1)
++ && ((ATOMIC_INT_LOCK_FREE > 1) || (defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)))
+
+ /// Base class and enclosing scope.
+ struct __future_base
+--- a/src/libstdc++-v3/libsupc++/exception_ptr.h
++++ b/src/libstdc++-v3/libsupc++/exception_ptr.h
+@@ -36,9 +36,11 @@
+ #include <bits/c++config.h>
+ #include <bits/exception_defines.h>
+
++#if !(defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP))
+ #if ATOMIC_INT_LOCK_FREE < 2
+ # error This platform does not support exception propagation.
+ #endif
++#endif
+
+ extern "C++" {
+
+--- a/src/libstdc++-v3/libsupc++/nested_exception.h
++++ b/src/libstdc++-v3/libsupc++/nested_exception.h
+@@ -39,9 +39,11 @@
+ #include <bits/c++config.h>
+ #include <bits/move.h>
+
++#if !(defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP))
+ #if ATOMIC_INT_LOCK_FREE < 2
+ # error This platform does not support exception propagation.
+ #endif
++#endif
+
+ extern "C++" {
+
+--- a/src/libstdc++-v3/libsupc++/exception
++++ b/src/libstdc++-v3/libsupc++/exception
+@@ -35,7 +35,9 @@
+ #pragma GCC visibility push(default)
+
+ #include <bits/c++config.h>
++#if !(defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP))
+ #include <bits/atomic_lockfree_defines.h>
++#endif
+
+ extern "C++" {
+
+@@ -166,7 +168,7 @@
+
+ #pragma GCC visibility pop
+
+-#if (__cplusplus >= 201103L) && (ATOMIC_INT_LOCK_FREE > 1)
++#if (__cplusplus >= 201103L) && ((ATOMIC_INT_LOCK_FREE > 1) || (defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)))
+ #include <bits/exception_ptr.h>
+ #include <bits/nested_exception.h>
+ #endif
diff --git a/debian/patches/pr64735.diff b/debian/patches/pr64735.diff
index 372eec9..6baf406 100644
--- a/debian/patches/pr64735.diff
+++ b/debian/patches/pr64735.diff
@@ -34,28 +34,28 @@ Date: Fri Dec 16 15:22:21 2016 +0000
* testsuite/30_threads/promise/*: Likewise.
* testsuite/30_threads/shared_future/*: Likewise.
-Index: b/src/libstdc++-v3/include/std/future
-===================================================================
---- a/src/libstdc++-v3/include/std/future
-+++ b/src/libstdc++-v3/include/std/future
-@@ -182,8 +182,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- future<__async_result_of<_Fn, _Args...>>
- async(_Fn&& __fn, _Args&&... __args);
-
--#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
-- && (ATOMIC_INT_LOCK_FREE > 1)
-+#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
-
- /// Base class and enclosing scope.
- struct __future_base
-@@ -1745,7 +1744,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-
- #endif // _GLIBCXX_ASYNC_ABI_COMPAT
- #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
-- // && ATOMIC_INT_LOCK_FREE
-
- // @} group futures
- _GLIBCXX_END_NAMESPACE_VERSION
+#Index: b/src/libstdc++-v3/include/std/future
+#===================================================================
+#--- a/src/libstdc++-v3/include/std/future
+#+++ b/src/libstdc++-v3/include/std/future
+#@@ -182,8 +182,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+# future<__async_result_of<_Fn, _Args...>>
+# async(_Fn&& __fn, _Args&&... __args);
+#
+#-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
+#- && (ATOMIC_INT_LOCK_FREE > 1)
+#+#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+#
+# /// Base class and enclosing scope.
+# struct __future_base
+#@@ -1745,7 +1744,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+#
+# #endif // _GLIBCXX_ASYNC_ABI_COMPAT
+# #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
+#- // && ATOMIC_INT_LOCK_FREE
+#
+# // @} group futures
+# _GLIBCXX_END_NAMESPACE_VERSION
Index: b/src/libstdc++-v3/libsupc++/eh_atomics.h
===================================================================
--- /dev/null
@@ -256,42 +256,42 @@ Index: b/src/libstdc++-v3/libsupc++/eh_tm.cc
__cxa_free_exception (h + 1);
}
-Index: b/src/libstdc++-v3/libsupc++/exception
-===================================================================
---- a/src/libstdc++-v3/libsupc++/exception
-+++ b/src/libstdc++-v3/libsupc++/exception
-@@ -35,7 +35,6 @@
- #pragma GCC visibility push(default)
-
- #include <bits/c++config.h>
--#include <bits/atomic_lockfree_defines.h>
-
- extern "C++" {
-
-@@ -166,7 +165,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
-
- #pragma GCC visibility pop
-
--#if (__cplusplus >= 201103L) && (ATOMIC_INT_LOCK_FREE > 1)
-+#if (__cplusplus >= 201103L)
- #include <bits/exception_ptr.h>
- #include <bits/nested_exception.h>
- #endif
-Index: b/src/libstdc++-v3/libsupc++/exception_ptr.h
-===================================================================
---- a/src/libstdc++-v3/libsupc++/exception_ptr.h
-+++ b/src/libstdc++-v3/libsupc++/exception_ptr.h
-@@ -36,10 +36,6 @@
- #include <bits/c++config.h>
- #include <bits/exception_defines.h>
-
--#if ATOMIC_INT_LOCK_FREE < 2
--# error This platform does not support exception propagation.
--#endif
--
- extern "C++" {
-
- namespace std
+#Index: b/src/libstdc++-v3/libsupc++/exception
+#===================================================================
+#--- a/src/libstdc++-v3/libsupc++/exception
+#+++ b/src/libstdc++-v3/libsupc++/exception
+#@@ -35,7 +35,6 @@
+# #pragma GCC visibility push(default)
+#
+# #include <bits/c++config.h>
+#-#include <bits/atomic_lockfree_defines.h>
+#
+# extern "C++" {
+#
+#@@ -166,7 +165,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
+#
+# #pragma GCC visibility pop
+#
+#-#if (__cplusplus >= 201103L) && (ATOMIC_INT_LOCK_FREE > 1)
+#+#if (__cplusplus >= 201103L)
+# #include <bits/exception_ptr.h>
+# #include <bits/nested_exception.h>
+# #endif
+#Index: b/src/libstdc++-v3/libsupc++/exception_ptr.h
+#===================================================================
+#--- a/src/libstdc++-v3/libsupc++/exception_ptr.h
+#+++ b/src/libstdc++-v3/libsupc++/exception_ptr.h
+#@@ -36,10 +36,6 @@
+# #include <bits/c++config.h>
+# #include <bits/exception_defines.h>
+#
+#-#if ATOMIC_INT_LOCK_FREE < 2
+#-# error This platform does not support exception propagation.
+#-#endif
+#-
+# extern "C++" {
+#
+# namespace std
Index: b/src/libstdc++-v3/libsupc++/guard.cc
===================================================================
--- a/src/libstdc++-v3/libsupc++/guard.cc
@@ -316,21 +316,21 @@ Index: b/src/libstdc++-v3/libsupc++/nested_exception.cc
nested_exception::~nested_exception() noexcept = default;
-#endif
} // namespace std
-Index: b/src/libstdc++-v3/libsupc++/nested_exception.h
-===================================================================
---- a/src/libstdc++-v3/libsupc++/nested_exception.h
-+++ b/src/libstdc++-v3/libsupc++/nested_exception.h
-@@ -39,10 +39,6 @@
- #include <bits/c++config.h>
- #include <bits/move.h>
-
--#if ATOMIC_INT_LOCK_FREE < 2
--# error This platform does not support exception propagation.
--#endif
--
- extern "C++" {
-
- namespace std
+#Index: b/src/libstdc++-v3/libsupc++/nested_exception.h
+#===================================================================
+#--- a/src/libstdc++-v3/libsupc++/nested_exception.h
+#+++ b/src/libstdc++-v3/libsupc++/nested_exception.h
+#@@ -39,10 +39,6 @@
+# #include <bits/c++config.h>
+# #include <bits/move.h>
+#
+#-#if ATOMIC_INT_LOCK_FREE < 2
+#-# error This platform does not support exception propagation.
+#-#endif
+#-
+# extern "C++" {
+#
+# namespace std
Index: b/src/libstdc++-v3/src/c++11/future.cc
===================================================================
--- a/src/libstdc++-v3/src/c++11/future.cc
diff --git a/debian/rules.patch b/debian/rules.patch
index 62cb094..d015d69 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -237,6 +237,7 @@ ifeq ($(DEB_TARGET_ARCH),alpha)
endif
endif
+debian_patches += pr64735-headers
ifeq ($(DEB_TARGET_ARCH),armel)
debian_patches += pr64735
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git
More information about the Reproducible-commits
mailing list