Skip to contentSkip to conversation

insane.bbclass: BPF objects may mismatch in endianness and bitness too

PATCH New Khem Raj 1 participant 2 messages Dec 10, 2018

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 insane.bbclass: BPF objects may mismatch in endianness and bitness too

This ensures that bitness and endianness is ignored for BPF objects Fixes QA issues like

Bit size did not match (32 to 64) kernel-selftest on /work/qemumips-yoe-linux/kernel-selftest/1.0-r0/packages-split/kernel-selftest/usr/kernel-selftest/bpf/test_btf_nokv.o

---
 meta/classes/insane.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/insane.bbclass +2 -2
index dbe9cc6162..6411884f92 100644
@@ -307,10 +307,10 @@ def package_qa_check_arch(path,name,d, elf, messages):
     if not ((machine == elf.machine()) or is_32 or is_bpf):
         package_qa_add_message(messages, "arch", "Architecture did not match (%s, expected %s) on %s" % \
                  (oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine), package_qa_clean_path(path,d)))
-    elif not ((bits == elf.abiSize()) or is_32):
+    elif not ((bits == elf.abiSize()) or is_32 or is_bpf):
         package_qa_add_message(messages, "arch", "Bit size did not match (%d to %d) %s on %s" % \
                  (bits, elf.abiSize(), bpn, package_qa_clean_path(path,d)))
-    elif not littleendian == elf.isLittleEndian():
+    elif not ((littleendian == elf.isLittleEndian()) or is_bpf):
         package_qa_add_message(messages, "arch", "Endiannes did not match (%d to %d) on %s" % \
                  (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d)))
 
Signature · 1 line
2.20.0
author
#1 lore raw

PATCH 2/2 webkitgtk: Link compiler-rt for clang specific built-ins

When using clang, its increasingly using its own runtime which means libgcc is not enough to find all primitives its using.

Fixes errors like recipe-sysroot/usr/lib/libwebkit2gtk-4.0.so: undefined reference to `__mulodi4'

---
 meta/recipes-sato/webkit/webkitgtk_2.22.4.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-sato/webkit/webkitgtk_2.22.4.bb +2 -0
index 60f1b3ea5d..196122002b 100644
@@ -98,6 +98,8 @@ EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF "
 SECURITY_CFLAGS_remove_aarch64 = "-fpie"
 SECURITY_CFLAGS_append_aarch64 = " -fPIE"
 
+LDFLAGS_append_toolchain-clang = " -rtlib=compiler-rt"
+
 FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
 
 RRECOMMENDS_${PN} += "ca-certificates shared-mime-info"
Signature · 1 line
2.20.0