Skip to contentSkip to conversation

boost: bump to version 1.63.0

PATCH New Jörg Krause 2 participants 2 messages Mar 12, 2017

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 boost: bump to version 1.63.0

Remove getchar() patch which has been applied upstream.

Add recommanded post-release patch from upstream to fix 64-bit atomic operations on 32-bit x86 with gcc versions older than 4.7.

Add a patch from upstream to fix FPE issue with uClibc-based toolchains.

---
v2:
* include FPE patch

---
 ...ted-register-usage-in-x86-DCAS-asm-blocks.patch |  65 +++++++++++
 ...fix-getchar-with-uclibc-and-gcc-bug-58952.patch |  45 --------
 package/boost/0005-fix-test-of-fpe-support.patch   | 119 +++++++++++++++++++++
 package/boost/boost.hash                           |   5 +-
 package/boost/boost.mk                             |   2 +-
 5 files changed, 187 insertions(+), 49 deletions(-)
 create mode 100644 package/boost/0004-Corrected-register-usage-in-x86-DCAS-asm-blocks.patch
 delete mode 100644 package/boost/0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch
 create mode 100644 package/boost/0005-fix-test-of-fpe-support.patch
package/boost/0004-Corrected-register-usage-in-x86-DCAS-asm-blocks.patch new file +65 -0
new file mode 100644
index 000000000..a955c1e2d
@@ -0,0 +1,65 @@
+From a67cc1b055cf09f371e2eca544884634a1ccc886 Mon Sep 17 00:00:00 2001
+From: Andrey Semashev <[email protected]>
+Date: Sun, 8 Jan 2017 18:09:12 +0300
+Subject: [PATCH] Corrected register usage in x86 DCAS asm blocks.
+
+In some of the asm blocks eax was modified as a result of cmpxchg8b but that
+was not reflected in the register constraints. This could cause incorrect code
+being generated.
+
+Fetch from:
+https://github.com/boostorg/atomic/commit/a67cc1b055cf09f371e2eca544884634a1ccc886
+
+[Adjust github patch to tarball release]
+Signed-off-by: J?rg Krause <[email protected]>
+---
+ boost/atomic/detail/ops_gcc_x86_dcas.hpp | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/boost/atomic/detail/ops_gcc_x86_dcas.hpp b/boost/atomic/detail/ops_gcc_x86_dcas.hpp
+index 2f51182..e356e8c 100644
+--- a/boost/atomic/detail/ops_gcc_x86_dcas.hpp
++++ b/boost/atomic/detail/ops_gcc_x86_dcas.hpp
+@@ -73,6 +73,7 @@ struct gcc_dcas_x86
+         {
+ #if !defined(BOOST_ATOMIC_DETAIL_NO_ASM_IMPLIED_ZERO_DISPLACEMENTS)
+ #if defined(__PIC__)
++            uint32_t v_lo = (uint32_t)v;
+             uint32_t scratch;
+             __asm__ __volatile__
+             (
+@@ -84,8 +85,8 @@ struct gcc_dcas_x86
+                 "1: lock; cmpxchg8b %[dest]\n\t"
+                 "jne 1b\n\t"
+                 "movl %[scratch], %%ebx\n\t"
+-                : [scratch] "=m" (scratch), [dest] "=o" (storage)
+-                : [value_lo] "a" ((uint32_t)v), "c" ((uint32_t)(v >> 32))
++                : [scratch] "=m" (scratch), [dest] "=o" (storage), [value_lo] "+a" (v_lo)
++                : "c" ((uint32_t)(v >> 32))
+                 : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC_COMMA "edx", "memory"
+             );
+ #else // defined(__PIC__)
+@@ -103,6 +104,7 @@ struct gcc_dcas_x86
+ #endif // defined(__PIC__)
+ #else // !defined(BOOST_ATOMIC_DETAIL_NO_ASM_IMPLIED_ZERO_DISPLACEMENTS)
+ #if defined(__PIC__)
++            uint32_t v_lo = (uint32_t)v;
+             uint32_t scratch;
+             __asm__ __volatile__
+             (
+@@ -115,11 +117,11 @@ struct gcc_dcas_x86
+                 "jne 1b\n\t"
+                 "movl %[scratch], %%ebx\n\t"
+ #if !defined(BOOST_ATOMIC_DETAIL_NO_ASM_CONSTRAINT_ALTERNATIVES)
+-                : [scratch] "=m,m" (scratch)
+-                : [value_lo] "a,a" ((uint32_t)v), "c,c" ((uint32_t)(v >> 32)), [dest] "D,S" (&storage)
++                : [scratch] "=m,m" (scratch), [value_lo] "+a,a" (v_lo)
++                : "c,c" ((uint32_t)(v >> 32)), [dest] "D,S" (&storage)
+ #else
+-                : [scratch] "=m" (scratch)
+-                : [value_lo] "a" ((uint32_t)v), "c" ((uint32_t)(v >> 32)), [dest] "D" (&storage)
++                : [scratch] "=m" (scratch), [value_lo] "+a" (v_lo)
++                : "c" ((uint32_t)(v >> 32)), [dest] "D" (&storage)
+ #endif
+                 : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC_COMMA "edx", "memory"
+             );
package/boost/0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch deleted +0 -45

45 lines not on this page · raw message

package/boost/0005-fix-test-of-fpe-support.patch new file +119 -0

119 lines not on this page · raw message

package/boost/boost.hash +2 -3
index c4af22e57..7acb059ba 100644
@@ -1,3 +1,2 @@
-# From http://sourceforge.net/projects/boost/files/boost/1.61.0/
-md5	6095876341956f65f9d35939ccea1a9f	boost_1_61_0.tar.bz2
-sha1	f84b1a1ce764108ec3c2b7bd7704cf8dfd3c9d01	boost_1_61_0.tar.bz2
+# From http://www.boost.org/users/history/version_1_63_0.html
+sha256  beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0  boost_1_63_0.tar.bz2
package/boost/boost.mk +1 -1
index bb8d799c4..dbe0f09bc 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BOOST_VERSION = 1.61.0
+BOOST_VERSION = 1.63.0
 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
 BOOST_INSTALL_STAGING = YES
Signature · 1 line
2.12.0
#1 lore raw

PATCH v2 1/1 boost: bump to version 1.63.0

Hello,

Quoted 11 lines · J?rg Krause

Remove getchar() patch which has been applied upstream.

Add recommanded post-release patch from upstream to fix 64-bit atomic operations on 32-bit x86 with gcc versions older than 4.7.

Add a patch from upstream to fix FPE issue with uClibc-based toolchains.

---
v2:
* include FPE patch

Quoted 10 lines
---
 ...ted-register-usage-in-x86-DCAS-asm-blocks.patch |  65 +++++++++++
 ...fix-getchar-with-uclibc-and-gcc-bug-58952.patch |  45 --------
 package/boost/0005-fix-test-of-fpe-support.patch   | 119 +++++++++++++++++++++
 package/boost/boost.hash                           |   5 +-
 package/boost/boost.mk                             |   2 +-
 5 files changed, 187 insertions(+), 49 deletions(-)
 create mode 100644 package/boost/0004-Corrected-register-usage-in-x86-DCAS-asm-blocks.patch
 delete mode 100644 package/boost/0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch
 create mode 100644 package/boost/0005-fix-test-of-fpe-support.patch

Applied to master, thanks. Let's see what the autobuilders have to say :-)

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com