diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-05-13 13:54:49 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-05-13 13:54:49 +0300 |
| commit | 42156b5190f4fa150e1fab6777eb81e69d4db8c9 (patch) | |
| tree | 3bf47de81cf1f89892789535a036d2d55d93a136 /debian/patches/pr64735-headers.diff | |
| download | gcc-6-debian.tar.gz | |
Imported gcc-6 (6.3.0-17)debian/6.3.0-17debian
Diffstat (limited to 'debian/patches/pr64735-headers.diff')
| -rw-r--r-- | debian/patches/pr64735-headers.diff | 60 |
1 files changed, 60 insertions, 0 deletions
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 |