From 4690cd8e34fc23de10400cc1c178b2c73c7690c7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 30 Mar 2017 15:08:33 +0100 Subject: glibc-package: Allow 32 and 64 bit headers to exist on arm With this change (combined with the previous linux-libc-header fix), a combined sysroot for 32 and 64 bit arm works meaning our SDK works correctly for that multilib setup. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'meta/recipes-core/glibc') diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 6e548cb581..2ca56662d5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -140,8 +140,25 @@ do_install_append_aarch64 () { ${D}/lib/ld-linux-aarch64_be.so.1 fi fi + do_install_armmultilib } +do_install_append_arm () { + do_install_armmultilib +} + +do_install_armmultilib () { + + oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h + oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/sem.h bits/semaphore.h bits/setjmp.h + oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/string.h bits/typesizes.h + + oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h + + oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h +} + + LOCALESTASH = "${WORKDIR}/stashed-locale" bashscripts = "mtrace sotruss xtrace" -- cgit 1.2.3-korg