[gcc-7] 353/354: * Don't revert the fix for PR target/55947, fixed for GCC 7.

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:51:44 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 2014678fc52b01fe2fc2f54feabaa87a629b57b3
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Nov 22 19:46:38 2017 +0000

      * Don't revert the fix for PR target/55947, fixed for GCC 7.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9850 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                    |   1 +
 debian/patches/PR55947-revert.diff  | 350 ------------------------------------
 debian/patches/kfreebsd-unwind.diff |   8 +-
 debian/rules.patch                  |   1 -
 4 files changed, 5 insertions(+), 355 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf8bcec..1607600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gcc-7 (7.2.0-17) UNRELEASED; urgency=medium
   * Update sanitizer and libcc1 symbols.
   * Remove libgphobos symbols files.
   * libcc1: Fix setting the compiler name, taken from the trunk.
+  * Don't revert the fix for PR target/55947, fixed for GCC 7.
 
   [ Aurelien Jarno / Svante Signell ]
   * Do not enable go on GNU/kFreeBSD, it has been wrongly enabled in
diff --git a/debian/patches/PR55947-revert.diff b/debian/patches/PR55947-revert.diff
deleted file mode 100644
index 8010e7f..0000000
--- a/debian/patches/PR55947-revert.diff
+++ /dev/null
@@ -1,350 +0,0 @@
-# DP: Revert fix for PR target/55947, causing PR libstdc++/72813
-
-libstdc++-v3/
-
-2013-05-08  Andi Kleen  <ak at linux.intel.com>
-
-	PR target/55947
-	* libstdc++-v3/include/bits/atomic_base.h
-	(_GLIBCXX_ALWAYS_INLINE): Add new macro.
-	(atomic_thread_fence, atomic_signal_fence, test_and_set,
-	clear, store, load, exchange, compare_exchange_weak)
-	compare_exchange_strong, fetch_add, fetch_sub, fetch_and,
-	fetch_or, fetch_xor): Mark _GLIBCXX_ALWAYS_INLINE.
-
-Index: b/src/libstdc++-v3/include/bits/atomic_base.h
-===================================================================
---- a/src/libstdc++-v3/include/bits/atomic_base.h
-+++ b/src/libstdc++-v3/include/bits/atomic_base.h
-@@ -97,11 +97,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-       | (__m & __memory_order_modifier_mask));
-   }
- 
--  _GLIBCXX_ALWAYS_INLINE void
-+  inline void
-   atomic_thread_fence(memory_order __m) noexcept
-   { __atomic_thread_fence(__m); }
- 
--  _GLIBCXX_ALWAYS_INLINE void
-+  inline void
-   atomic_signal_fence(memory_order __m) noexcept
-   { __atomic_signal_fence(__m); }
- 
-@@ -170,19 +170,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-       : __atomic_flag_base{ _S_init(__i) }
-     { }
- 
--    _GLIBCXX_ALWAYS_INLINE bool
-+    bool
-     test_and_set(memory_order __m = memory_order_seq_cst) noexcept
-     {
-       return __atomic_test_and_set (&_M_i, __m);
-     }
- 
--    _GLIBCXX_ALWAYS_INLINE bool
-+    bool
-     test_and_set(memory_order __m = memory_order_seq_cst) volatile noexcept
-     {
-       return __atomic_test_and_set (&_M_i, __m);
-     }
- 
--    _GLIBCXX_ALWAYS_INLINE void
-+    void
-     clear(memory_order __m = memory_order_seq_cst) noexcept
-     {
-       memory_order __b = __m & __memory_order_mask;
-@@ -193,7 +193,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-       __atomic_clear (&_M_i, __m);
-     }
- 
--    _GLIBCXX_ALWAYS_INLINE void
-+    void
-     clear(memory_order __m = memory_order_seq_cst) volatile noexcept
-     {
-       memory_order __b = __m & __memory_order_mask;
-@@ -363,7 +363,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	    reinterpret_cast<void *>(-__alignof(_M_i)));
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE void
-+      void
-       store(__int_type __i, memory_order __m = memory_order_seq_cst) noexcept
-       {
- 	memory_order __b = __m & __memory_order_mask;
-@@ -374,7 +374,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	__atomic_store_n(&_M_i, __i, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE void
-+      void
-       store(__int_type __i,
- 	    memory_order __m = memory_order_seq_cst) volatile noexcept
-       {
-@@ -386,7 +386,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	__atomic_store_n(&_M_i, __i, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       load(memory_order __m = memory_order_seq_cst) const noexcept
-       {
- 	memory_order __b = __m & __memory_order_mask;
-@@ -396,7 +396,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_load_n(&_M_i, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       load(memory_order __m = memory_order_seq_cst) const volatile noexcept
-       {
- 	memory_order __b = __m & __memory_order_mask;
-@@ -406,7 +406,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_load_n(&_M_i, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       exchange(__int_type __i,
- 	       memory_order __m = memory_order_seq_cst) noexcept
-       {
-@@ -414,14 +414,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-       }
- 
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       exchange(__int_type __i,
- 	       memory_order __m = memory_order_seq_cst) volatile noexcept
-       {
- 	return __atomic_exchange_n(&_M_i, __i, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_weak(__int_type& __i1, __int_type __i2,
- 			    memory_order __m1, memory_order __m2) noexcept
-       {
-@@ -434,7 +434,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 1, __m1, __m2);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_weak(__int_type& __i1, __int_type __i2,
- 			    memory_order __m1,
- 			    memory_order __m2) volatile noexcept
-@@ -448,7 +448,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 1, __m1, __m2);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_weak(__int_type& __i1, __int_type __i2,
- 			    memory_order __m = memory_order_seq_cst) noexcept
-       {
-@@ -456,7 +456,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 				     __cmpexch_failure_order(__m));
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_weak(__int_type& __i1, __int_type __i2,
- 		   memory_order __m = memory_order_seq_cst) volatile noexcept
-       {
-@@ -464,7 +464,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 				     __cmpexch_failure_order(__m));
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_strong(__int_type& __i1, __int_type __i2,
- 			      memory_order __m1, memory_order __m2) noexcept
-       {
-@@ -477,7 +477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_strong(__int_type& __i1, __int_type __i2,
- 			      memory_order __m1,
- 			      memory_order __m2) volatile noexcept
-@@ -492,7 +492,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_strong(__int_type& __i1, __int_type __i2,
- 			      memory_order __m = memory_order_seq_cst) noexcept
-       {
-@@ -500,7 +500,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 				       __cmpexch_failure_order(__m));
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_strong(__int_type& __i1, __int_type __i2,
- 		 memory_order __m = memory_order_seq_cst) volatile noexcept
-       {
-@@ -508,52 +508,52 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 				       __cmpexch_failure_order(__m));
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_add(__int_type __i,
- 		memory_order __m = memory_order_seq_cst) noexcept
-       { return __atomic_fetch_add(&_M_i, __i, __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_add(__int_type __i,
- 		memory_order __m = memory_order_seq_cst) volatile noexcept
-       { return __atomic_fetch_add(&_M_i, __i, __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_sub(__int_type __i,
- 		memory_order __m = memory_order_seq_cst) noexcept
-       { return __atomic_fetch_sub(&_M_i, __i, __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_sub(__int_type __i,
- 		memory_order __m = memory_order_seq_cst) volatile noexcept
-       { return __atomic_fetch_sub(&_M_i, __i, __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_and(__int_type __i,
- 		memory_order __m = memory_order_seq_cst) noexcept
-       { return __atomic_fetch_and(&_M_i, __i, __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_and(__int_type __i,
- 		memory_order __m = memory_order_seq_cst) volatile noexcept
-       { return __atomic_fetch_and(&_M_i, __i, __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_or(__int_type __i,
- 	       memory_order __m = memory_order_seq_cst) noexcept
-       { return __atomic_fetch_or(&_M_i, __i, __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_or(__int_type __i,
- 	       memory_order __m = memory_order_seq_cst) volatile noexcept
-       { return __atomic_fetch_or(&_M_i, __i, __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_xor(__int_type __i,
- 		memory_order __m = memory_order_seq_cst) noexcept
-       { return __atomic_fetch_xor(&_M_i, __i, __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __int_type
-+      __int_type
-       fetch_xor(__int_type __i,
- 		memory_order __m = memory_order_seq_cst) volatile noexcept
-       { return __atomic_fetch_xor(&_M_i, __i, __m); }
-@@ -678,7 +678,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	    reinterpret_cast<void *>(-__alignof(_M_p)));
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE void
-+      void
-       store(__pointer_type __p,
- 	    memory_order __m = memory_order_seq_cst) noexcept
-       {
-@@ -691,7 +691,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	__atomic_store_n(&_M_p, __p, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE void
-+      void
-       store(__pointer_type __p,
- 	    memory_order __m = memory_order_seq_cst) volatile noexcept
-       {
-@@ -703,7 +703,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	__atomic_store_n(&_M_p, __p, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE __pointer_type
-+      __pointer_type
-       load(memory_order __m = memory_order_seq_cst) const noexcept
-       {
- 	memory_order __b = __m & __memory_order_mask;
-@@ -713,7 +713,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_load_n(&_M_p, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE __pointer_type
-+      __pointer_type
-       load(memory_order __m = memory_order_seq_cst) const volatile noexcept
-       {
- 	memory_order __b = __m & __memory_order_mask;
-@@ -723,7 +723,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_load_n(&_M_p, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE __pointer_type
-+      __pointer_type
-       exchange(__pointer_type __p,
- 	       memory_order __m = memory_order_seq_cst) noexcept
-       {
-@@ -731,14 +731,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-       }
- 
- 
--      _GLIBCXX_ALWAYS_INLINE __pointer_type
-+      __pointer_type
-       exchange(__pointer_type __p,
- 	       memory_order __m = memory_order_seq_cst) volatile noexcept
-       {
- 	return __atomic_exchange_n(&_M_p, __p, __m);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
- 			      memory_order __m1,
- 			      memory_order __m2) noexcept
-@@ -752,7 +752,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_compare_exchange_n(&_M_p, &__p1, __p2, 0, __m1, __m2);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE bool
-+      bool
-       compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
- 			      memory_order __m1,
- 			      memory_order __m2) volatile noexcept
-@@ -767,22 +767,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 	return __atomic_compare_exchange_n(&_M_p, &__p1, __p2, 0, __m1, __m2);
-       }
- 
--      _GLIBCXX_ALWAYS_INLINE __pointer_type
-+      __pointer_type
-       fetch_add(ptrdiff_t __d,
- 		memory_order __m = memory_order_seq_cst) noexcept
-       { return __atomic_fetch_add(&_M_p, _M_type_size(__d), __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __pointer_type
-+      __pointer_type
-       fetch_add(ptrdiff_t __d,
- 		memory_order __m = memory_order_seq_cst) volatile noexcept
-       { return __atomic_fetch_add(&_M_p, _M_type_size(__d), __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __pointer_type
-+      __pointer_type
-       fetch_sub(ptrdiff_t __d,
- 		memory_order __m = memory_order_seq_cst) noexcept
-       { return __atomic_fetch_sub(&_M_p, _M_type_size(__d), __m); }
- 
--      _GLIBCXX_ALWAYS_INLINE __pointer_type
-+      __pointer_type
-       fetch_sub(ptrdiff_t __d,
- 		memory_order __m = memory_order_seq_cst) volatile noexcept
-       { return __atomic_fetch_sub(&_M_p, _M_type_size(__d), __m); }
diff --git a/debian/patches/kfreebsd-unwind.diff b/debian/patches/kfreebsd-unwind.diff
index 261fe00..23158c3 100644
--- a/debian/patches/kfreebsd-unwind.diff
+++ b/debian/patches/kfreebsd-unwind.diff
@@ -4,7 +4,7 @@ Index: b/src/libgcc/config.host
 ===================================================================
 --- a/src/libgcc/config.host
 +++ b/src/libgcc/config.host
-@@ -620,7 +620,13 @@ i[34567]86-*-linux*)
+@@ -621,7 +621,13 @@ i[34567]86-*-linux*)
  	tm_file="${tm_file} i386/elf-lib.h"
  	md_unwind_header=i386/linux-unwind.h
  	;;
@@ -19,7 +19,7 @@ Index: b/src/libgcc/config.host
  	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
  	tmake_file="${tmake_file} i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules"
  	tm_file="${tm_file} i386/elf-lib.h"
-@@ -635,6 +641,7 @@ x86_64-*-kfreebsd*-gnu)
+@@ -636,6 +642,7 @@ x86_64-*-kfreebsd*-gnu)
  	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
  	tmake_file="${tmake_file} i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules"
  	tm_file="${tm_file} i386/elf-lib.h"
@@ -39,8 +39,8 @@ Index: b/src/libgcc/config/i386/freebsd-unwind.h
 +
  #include <sys/types.h>
  #include <signal.h>
- #include <sys/ucontext.h>
-@@ -171,3 +173,5 @@ x86_freebsd_fallback_frame_state
+ #include <unistd.h>
+@@ -210,3 +212,5 @@ x86_freebsd_fallback_frame_state
    return _URC_NO_REASON;
  }
  #endif /* ifdef __x86_64__  */
diff --git a/debian/rules.patch b/debian/rules.patch
index 1dadf04..e090d2e 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -67,7 +67,6 @@ debian_patches += \
 	pr66368 \
 	pr67590 \
 	libjit-ldflags \
-	PR55947-revert \
 	libffi-pax \
 	libffi-race-condition \
 	gcc-foffload-default \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git



More information about the Reproducible-commits mailing list