diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-10-18 16:28:18 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-28 16:15:18 +0100 |
| commit | 63b5ba4e55f0e006be9d1045d6fd054bb94531f2 (patch) | |
| tree | 96ec35deec1b7b523745120f0f3f2b682276cad5 | |
| parent | 12119cc1f9b0539c79ee9e0a514b86582e824397 (diff) | |
| download | poky-63b5ba4e55f0e006be9d1045d6fd054bb94531f2.tar.gz | |
boost: update to 1.62.0
Remove backported 0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch
(From OE-Core rev: c31030d87cd1741a4186d711325b8eab9c70b327)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/boost/bjam-native_1.62.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.61.0.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-support/boost/boost-1.62.0.inc (renamed from meta/recipes-support/boost/boost-1.61.0.inc) | 4 | ||||
| -rw-r--r-- | meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch | 60 | ||||
| -rw-r--r-- | meta/recipes-support/boost/boost_1.62.0.bb (renamed from meta/recipes-support/boost/boost_1.61.0.bb) | 1 |
4 files changed, 2 insertions, 63 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.61.0.bb b/meta/recipes-support/boost/bjam-native_1.62.0.bb index 32646d707b..32646d707b 100644 --- a/meta/recipes-support/boost/bjam-native_1.61.0.bb +++ b/meta/recipes-support/boost/bjam-native_1.62.0.bb | |||
diff --git a/meta/recipes-support/boost/boost-1.61.0.inc b/meta/recipes-support/boost/boost-1.62.0.inc index cd9d8a4950..a097ea1144 100644 --- a/meta/recipes-support/boost/boost-1.61.0.inc +++ b/meta/recipes-support/boost/boost-1.62.0.inc | |||
| @@ -13,7 +13,7 @@ BOOST_P = "boost_${BOOST_VER}" | |||
| 13 | 13 | ||
| 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" |
| 15 | 15 | ||
| 16 | SRC_URI[md5sum] = "6095876341956f65f9d35939ccea1a9f" | 16 | SRC_URI[md5sum] = "7ef085456c48c49a7fe8237f07e5f674" |
| 17 | SRC_URI[sha256sum] = "a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640" | 17 | SRC_URI[sha256sum] = "bce80293052e2d6230f1bec9b7524b33412e4fb26e9723460a0f362ac15b7acb" |
| 18 | 18 | ||
| 19 | S = "${WORKDIR}/${BOOST_P}" | 19 | S = "${WORKDIR}/${BOOST_P}" |
diff --git a/meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch b/meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch deleted file mode 100644 index 2b48d0d5dd..0000000000 --- a/meta/recipes-support/boost/boost/0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch +++ /dev/null | |||
| @@ -1,60 +0,0 @@ | |||
| 1 | From 4f19d72ca94418431e068cfd4ffb96ed9b289f6c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com> | ||
| 3 | Date: Wed, 24 Aug 2016 17:34:59 +0100 | ||
| 4 | Subject: [PATCH 3/4] smart_ptr: mips assembly doesn't compile in mips16e mode | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | gcc.compile.c++ <builddir>/boost/bin.v2/libs/date_time/build/gcc-4.3.1/release/threading-multi/gregorian/greg_month.o | ||
| 10 | |||
| 11 | "mipsel-poky-linux-musl-g++" "-mel" "-mabi=32" "-msoft-float" "-march=mips32r2" "-mips16" "-minterlink-compressed" "-mtune=24kec" "-mdsp" "-Wl,-O1" "-Wl,--as-needed" "-fstack-protector-strong" "-Wl,-z,relro,-z,now" "--sysroot=<sysroot>" -ftemplate-depth-128 -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=<srcdir>=/usr/src/debug/boost/1.61.0-r0 -fdebug-prefix-map=<sysroot_host>= -fdebug-prefix-map=<sysroot>= -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -fvisibility-inlines-hidden -O3 -finline-functions -Wno-inline -Wall -pthread -fPIC -DBOOST_ALL_DYN_LINK=1 -DBOOST_ALL_NO_LIB=1 -DDATE_TIME_INLINE -DNDEBUG -I"." -c -o "<builddir>/boost/bin.v2/libs/date_time/build/gcc-4.3.1/release/threading-multi/gregorian/greg_month.o" "libs/date_time/src/gregorian/greg_month.cpp" | ||
| 12 | |||
| 13 | {standard input}: Assembler messages: | ||
| 14 | {standard input}:17603: Warning: the `dsp' extension requires MIPS32 revision 2 or greater | ||
| 15 | {standard input}:17604: Error: unrecognized opcode `ll $3,4($16)' | ||
| 16 | {standard input}:17606: Error: unrecognized opcode `sc $2,4($16)' | ||
| 17 | {standard input}:17734: Error: unrecognized opcode `ll $3,8($16)' | ||
| 18 | {standard input}:17736: Error: unrecognized opcode `sc $2,8($16)' | ||
| 19 | {standard input}:18084: Error: unrecognized opcode `ll $3,4($4)' | ||
| 20 | {standard input}:18086: Error: unrecognized opcode `sc $2,4($4)' | ||
| 21 | {standard input}:18318: Error: unrecognized opcode `ll $3,8($4)' | ||
| 22 | {standard input}:18320: Error: unrecognized opcode `sc $2,8($4)' | ||
| 23 | {standard input}:19921: Error: unrecognized opcode `ll $3,4($2)' | ||
| 24 | {standard input}:19923: Error: unrecognized opcode `sc $3,4($2)' | ||
| 25 | {standard input}:20199: Error: unrecognized opcode `ll $4,4($16)' | ||
| 26 | {standard input}:20201: Error: unrecognized opcode `sc $2,4($16)' | ||
| 27 | {standard input}:23392: Error: unrecognized opcode `ll $4,8($16)' | ||
| 28 | {standard input}:23394: Error: unrecognized opcode `sc $2,8($16)' | ||
| 29 | ...failed updating 1 target... | ||
| 30 | |||
| 31 | boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp | ||
| 32 | contains hand-written MIPS assembly, which is not compatible | ||
| 33 | with the MIPS16e instruction set. | ||
| 34 | |||
| 35 | By not using this file in MIPS16e mode, we fallback to using | ||
| 36 | g++ 4.1+ __sync intrinsics (__sync_fetch_and_add() and | ||
| 37 | __sync_val_compare_and_swap()) which are working fine. | ||
| 38 | |||
| 39 | Signed-off-by: André Draszik <adraszik@tycoint.com> | ||
| 40 | --- | ||
| 41 | Upstream-Status: Backport https://svn.boost.org/trac/boost/ticket/12418 | ||
| 42 | boost/smart_ptr/detail/sp_counted_base.hpp | 2 +- | ||
| 43 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 44 | |||
| 45 | diff --git a/boost/smart_ptr/detail/sp_counted_base.hpp b/boost/smart_ptr/detail/sp_counted_base.hpp | ||
| 46 | index 0addf07..0995ca8 100644 | ||
| 47 | --- a/boost/smart_ptr/detail/sp_counted_base.hpp | ||
| 48 | +++ b/boost/smart_ptr/detail/sp_counted_base.hpp | ||
| 49 | @@ -65,7 +65,7 @@ | ||
| 50 | #elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) ) && !defined(__PATHSCALE__) && !defined( _AIX ) | ||
| 51 | # include <boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp> | ||
| 52 | |||
| 53 | -#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__) | ||
| 54 | +#elif defined( __GNUC__ ) && ( defined( __mips__ ) || defined( _mips ) ) && !defined(__PATHSCALE__) && !defined( __mips16 ) | ||
| 55 | # include <boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp> | ||
| 56 | |||
| 57 | #elif defined( BOOST_SP_HAS_SYNC ) | ||
| 58 | -- | ||
| 59 | 2.9.3 | ||
| 60 | |||
diff --git a/meta/recipes-support/boost/boost_1.61.0.bb b/meta/recipes-support/boost/boost_1.62.0.bb index 40e3870a3d..120d12968b 100644 --- a/meta/recipes-support/boost/boost_1.61.0.bb +++ b/meta/recipes-support/boost/boost_1.62.0.bb | |||
| @@ -7,7 +7,6 @@ SRC_URI += "\ | |||
| 7 | file://boost-CVE-2012-2677.patch \ | 7 | file://boost-CVE-2012-2677.patch \ |
| 8 | file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \ | 8 | file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \ |
| 9 | file://0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch \ | 9 | file://0002-boost-test-execution_monitor.hpp-fix-mips-soft-float.patch \ |
| 10 | file://0003-smart_ptr-mips-assembly-doesn-t-compile-in-mips16e-m.patch \ | ||
| 11 | file://0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch \ | 10 | file://0004-Use-atomic-by-default-when-BOOST_NO_CXX11_HDR_ATOMIC.patch \ |
| 12 | file://boost-math-disable-pch-for-gcc.patch \ | 11 | file://boost-math-disable-pch-for-gcc.patch \ |
| 13 | " | 12 | " |
