chromium68: fix aarch64 link issuehalibut_7.99.2halibut/7.99.27.99.2

Backport upstream patch:
https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/1390286

Fix this error when linking libcbe.so:
  obj/third_party/ffmpeg/ffmpeg_internal/
    autorename_libavcodec_aarch64_h264idct_neon.o:

  relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol
  `ff_h264_idct8_add_neon' which may bind externally can not be used
  when making a shared object; recompile with -fPIC

Also remove the mksnapshot path override for aarch64, it is not
necessary now we run mksnapshot with qemu. This fixes the install
step.

Bug-AGL: SPEC-2506

Change-Id: Idb90c8c20910ec48ed01f1b02528f14781edc4a3
Signed-off-by: Nick Yamane <nickdiego@igalia.com>
Signed-off-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>

2 files changed, 110 insertions, 1 deletions

diff --git a/meta-html5-framework/recipes-wam/chromium/chromium68/0001-libavcodec-Remove-dynamic-relocs-from-h264idct_neon..patch b/meta-html5-framework/recipes-wam/chromium/chromium68/0001-libavcodec-Remove-dynamic-relocs-from-h264idct_neon..patch
new file mode 100644
index 00000000..a522c771
--- /dev/null
+++ b/meta-html5-framework/recipes-wam/chromium/chromium68/0001-libavcodec-Remove-dynamic-relocs-from-h264idct_neon..patch
@@ -0,0 +1,107 @@
+From 67e9e0337185f05a0d8d362473e63d8a9dfdebed Mon Sep 17 00:00:00 2001
+From: Manoj Gupta <manojgupta@google.com>
+Date: Thu, 27 Dec 2018 11:06:26 -0800
+Subject: [PATCH] libavcodec: Remove dynamic relocs from h264idct_neon.S
+
+Some of the assembly functions e.g. ff_h264_idct_dc_add_neon
+has code like:
+    movrel          x14, X(ff_h264_idct_add_neon)
+
+Linker cannot resolve them fully at link time and emits GOT
+relocations.
+Use explicit labels instead so that no dynamic relocations are
+needed at all.
+
+BUG=chromium:917919
+TEST=lld complains are fixed.
+
+Change-Id: Ie533a10aab1fe3834300599ce650d3673a674f4e
+Reviewed-on: https://chromium-review.googlesource.com/c/1390286
+Reviewed-by: Frank Liberato <liberato@chromium.org>
+---
+ libavcodec/aarch64/h264idct_neon.S | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/src/third_party/ffmpeg/libavcodec/aarch64/h264idct_neon.S b/src/third_party/ffmpeg/libavcodec/aarch64/h264idct_neon.S
+index 825ec49f8c6d..7de44205d39a 100644
+--- a/src/third_party/ffmpeg/libavcodec/aarch64/h264idct_neon.S
++++ b/src/third_party/ffmpeg/libavcodec/aarch64/h264idct_neon.S
+@@ -23,6 +23,7 @@
+ #include "neon.S"
+ 
+ function ff_h264_idct_add_neon, export=1
++.L_ff_h264_idct_add_neon:
+         ld1             {v0.4H, v1.4H, v2.4H, v3.4H},  [x1]
+         sxtw            x2,     w2
+         movi            v30.8H, #0
+@@ -77,6 +78,7 @@ function ff_h264_idct_add_neon, export=1
+ endfunc
+ 
+ function ff_h264_idct_dc_add_neon, export=1
++.L_ff_h264_idct_dc_add_neon:
+         sxtw            x2,  w2
+         mov             w3,       #0
+         ld1r            {v2.8H},  [x1]
+@@ -106,8 +108,8 @@ function ff_h264_idct_add16_neon, export=1
+         mov             w9,  w3         // stride
+         movrel          x7,  scan8
+         mov             x10, #16
+-        movrel          x13, X(ff_h264_idct_dc_add_neon)
+-        movrel          x14, X(ff_h264_idct_add_neon)
++        movrel          x13, .L_ff_h264_idct_dc_add_neon
++        movrel          x14, .L_ff_h264_idct_add_neon
+ 1:      mov             w2,  w9
+         ldrb            w3,  [x7], #1
+         ldrsw           x0,  [x5], #4
+@@ -133,8 +135,8 @@ function ff_h264_idct_add16intra_neon, export=1
+         mov             w9,  w3         // stride
+         movrel          x7,  scan8
+         mov             x10, #16
+-        movrel          x13, X(ff_h264_idct_dc_add_neon)
+-        movrel          x14, X(ff_h264_idct_add_neon)
++        movrel          x13, .L_ff_h264_idct_dc_add_neon
++        movrel          x14, .L_ff_h264_idct_add_neon
+ 1:      mov             w2,  w9
+         ldrb            w3,  [x7], #1
+         ldrsw           x0,  [x5], #4
+@@ -160,8 +162,8 @@ function ff_h264_idct_add8_neon, export=1
+         add             x5,  x1,  #16*4         // block_offset
+         add             x9,  x2,  #16*32        // block
+         mov             w19, w3                 // stride
+-        movrel          x13, X(ff_h264_idct_dc_add_neon)
+-        movrel          x14, X(ff_h264_idct_add_neon)
++        movrel          x13, .L_ff_h264_idct_dc_add_neon
++        movrel          x14, .L_ff_h264_idct_add_neon
+         movrel          x7,  scan8, 16
+         mov             x10, #0
+         mov             x11, #16
+@@ -263,6 +265,7 @@ endfunc
+ .endm
+ 
+ function ff_h264_idct8_add_neon, export=1
++.L_ff_h264_idct8_add_neon:
+         movi            v19.8H,   #0
+         sxtw            x2,       w2
+         ld1             {v24.8H, v25.8H}, [x1]
+@@ -326,6 +329,7 @@ function ff_h264_idct8_add_neon, export=1
+ endfunc
+ 
+ function ff_h264_idct8_dc_add_neon, export=1
++.L_ff_h264_idct8_dc_add_neon:
+         mov             w3,       #0
+         sxtw            x2,       w2
+         ld1r            {v31.8H}, [x1]
+@@ -375,8 +379,8 @@ function ff_h264_idct8_add4_neon, export=1
+         mov             w2,  w3
+         movrel          x7,  scan8
+         mov             w10, #16
+-        movrel          x13, X(ff_h264_idct8_dc_add_neon)
+-        movrel          x14, X(ff_h264_idct8_add_neon)
++        movrel          x13, .L_ff_h264_idct8_dc_add_neon
++        movrel          x14, .L_ff_h264_idct8_add_neon
+ 1:      ldrb            w9,  [x7], #4
+         ldrsw           x0,  [x5], #16
+         ldrb            w9,  [x4, w9, UXTW]
+-- 
+2.21.0
+
diff --git a/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb b/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb
index 70255bf3..28179fd5 100644
--- a/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb
+++ b/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb
@@ -30,6 +30,9 @@ SRCREV_v8 = "1e3af71f1ff3735e8a5b639c48dfca63a7b8a647"
 SRC_URI_append_armv7a = " file://0001-skia-Build-skcms-with-mfp16-format-ieee-on-GCC-ARM-b.patch"
 SRC_URI_append_armv7ve = " file://0001-skia-Build-skcms-with-mfp16-format-ieee-on-GCC-ARM-b.patch"
 
+# Backport of https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/1390286
+SRC_URI_append_aarch64 = " file://0001-libavcodec-Remove-dynamic-relocs-from-h264idct_neon..patch"
+
 # we don't include SRCPV in PV, so we have to manually include SRCREVs in do_fetch vardeps
 do_fetch[vardeps] += "SRCREV_v8"
 SRCREV_FORMAT = "main_v8"
@@ -336,7 +339,6 @@ install_chromium_browser() {
 
 MKSNAPSHOT_PATH = ""
 MKSNAPSHOT_PATH_arm = "clang_x86_v8_arm/"
-MKSNAPSHOT_PATH_aarch64 = "clang_x64_v8_arm64/"
 
 install_webruntime() {
     install -d ${D}${libdir}