summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-30 15:08:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-31 10:10:29 +0100
commit6897b33abe7bd0a186db64a1969991b3ec3e387a (patch)
tree822e5c8186ce675743eaa35d81267bf7aee1c751
parent69ac4e284da3870df7e8ebb3492601dc5593f03f (diff)
downloadpoky-6897b33abe7bd0a186db64a1969991b3ec3e387a.tar.gz
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. (From OE-Core rev: 4690cd8e34fc23de10400cc1c178b2c73c7690c7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc17
1 files changed, 17 insertions, 0 deletions
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 () {
140 ${D}/lib/ld-linux-aarch64_be.so.1 140 ${D}/lib/ld-linux-aarch64_be.so.1
141 fi 141 fi
142 fi 142 fi
143 do_install_armmultilib
143} 144}
144 145
146do_install_append_arm () {
147 do_install_armmultilib
148}
149
150do_install_armmultilib () {
151
152 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
153 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
154 oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/string.h bits/typesizes.h
155
156 oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h
157
158 oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h
159}
160
161
145LOCALESTASH = "${WORKDIR}/stashed-locale" 162LOCALESTASH = "${WORKDIR}/stashed-locale"
146bashscripts = "mtrace sotruss xtrace" 163bashscripts = "mtrace sotruss xtrace"
147 164