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. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Jörg Krause
Thomas Petazzoni
parent
4127f3014c
commit
7b9b0e3215
@ -0,0 +1,65 @@
|
||||
From a67cc1b055cf09f371e2eca544884634a1ccc886 Mon Sep 17 00:00:00 2001
|
||||
From: Andrey Semashev <andrey.semashev@gmail.com>
|
||||
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 <joerg.krause@embedded.rocks>
|
||||
---
|
||||
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"
|
||||
);
|
||||
@ -1,45 +0,0 @@
|
||||
From 4f1c6784b37a11c78fe84bb238fb7cc377ce0d36 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Wed, 30 Mar 2016 23:28:33 +0200
|
||||
Subject: [PATCH] Fix for uClibc and gcc <= 4.8.2
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
getchar() is defined as a macro in uClibc. This hits gcc bug 58952 [1] for all
|
||||
gcc version <= 4.8.2 and building boost/test fails:
|
||||
|
||||
./boost/test/impl/unit_test_main.ipp: In function 'int boost::unit_test::unit_test_main(boost::unit_test::init_unit_test_func, int, char**)':
|
||||
./boost/test/impl/unit_test_main.ipp:194:18: error: expected unqualified-id before '(' token
|
||||
|
||||
To allow building boost/test with uClibc based toolchains with gcc <= 4.8.2 use
|
||||
parenthesis for std::getchar.
|
||||
|
||||
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58952
|
||||
|
||||
Upstream status: Pending
|
||||
https://github.com/boostorg/test/pull/97
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
include/boost/test/impl/unit_test_main.ipp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/boost/test/impl/unit_test_main.ipp b/boost/test/impl/unit_test_main.ipp
|
||||
index 1f30c02..db61930 100644
|
||||
--- a/boost/test/impl/unit_test_main.ipp
|
||||
+++ b/boost/test/impl/unit_test_main.ipp
|
||||
@@ -191,7 +191,9 @@ unit_test_main( init_unit_test_func init_func, int argc, char* argv[] )
|
||||
if( runtime_config::get<bool>( runtime_config::WAIT_FOR_DEBUGGER ) ) {
|
||||
results_reporter::get_stream() << "Press any key to continue..." << std::endl;
|
||||
|
||||
- std::getchar();
|
||||
+ // getchar is defined as a macro in uClibc. Use parenthesis to fix
|
||||
+ // gcc bug 58952 for gcc <= 4.8.2.
|
||||
+ (std::getchar)();
|
||||
results_reporter::get_stream() << "Continuing..." << std::endl;
|
||||
}
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user