summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-24 10:48:18 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-04 23:18:16 +0000
commit977047fb997aa243b86dc23f057c0d098cbdc158 (patch)
tree055fa94793a03ec52ac158e9bdea0d941249e042
parente438ede997b781c11630a6f16ff2b19367c6fb1c (diff)
downloadpoky-977047fb997aa243b86dc23f057c0d098cbdc158.tar.gz
gcc-runtime: Add libmpx supprt for x86
Enabling building the Intel Memory Protection Extension library for x86. Leave this disabled in musl builds as it doesn't build there yet. (From OE-Core rev: 4b144b55acbd43b38d92d29829d8ec68ff372e9d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc21
1 files changed, 20 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 745cf74f86..ec8f4a42d0 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -24,8 +24,9 @@ RUNTIMELIBITM_microblaze = ""
24RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ 24RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \
25 ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \ 25 ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \
26" 26"
27RUNTIMETARGET_append_x86 = " libmpx"
28RUNTIMETARGET_remove_libc-musl = "libmpx"
27 29
28# ?
29# libiberty 30# libiberty
30# libmudflap 31# libmudflap
31# libgfortran needs separate recipe due to libquadmath dependency 32# libgfortran needs separate recipe due to libquadmath dependency
@@ -139,6 +140,11 @@ PACKAGES = "\
139 libitm-dev \ 140 libitm-dev \
140 libitm-staticdev \ 141 libitm-staticdev \
141" 142"
143PACKAGES_append_x86 = "\
144 libmpx \
145 libmpx-dev \
146 libmpx-staticdev \
147"
142 148
143# The base package doesn't exist, so we clear the recommends. 149# The base package doesn't exist, so we clear the recommends.
144RRECOMMENDS_${PN}-dbg = "" 150RRECOMMENDS_${PN}-dbg = ""
@@ -243,6 +249,19 @@ SUMMARY_libitm-dev = "GNU transactional memory support library - development fil
243FILES_libitm-staticdev = "${libdir}/libitm.a" 249FILES_libitm-staticdev = "${libdir}/libitm.a"
244SUMMARY_libitm-staticdev = "GNU transactional memory support library - static development files" 250SUMMARY_libitm-staticdev = "GNU transactional memory support library - static development files"
245 251
252
253FILES_libmpx = "${libdir}/libmpx.so.* ${libdir}/libmpxwrappers.so.*"
254SUMMARY_libmpx = "Intel Memory Protection Extension library"
255FILES_libmpx-dev = "\
256 ${libdir}/libmpxwrappers.so \
257 ${libdir}/libmpx.so \
258 ${libdir}/libmpx.la \
259 ${libdir}/libmpx.spec \
260"
261SUMMARY_libmpx-dev = "Intel Memory Protection Extension library - development files"
262FILES_libmpx-staticdev = "${libdir}/libmpx.a ${libdir}/libmpxwrappers.a"
263SUMMARY_libmpx-staticdev = "Intel Memory Protection Extension library - static development files"
264
246do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" 265do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
247do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" 266do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
248do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" 267do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"