Merge commit '6a0fa4d8'

* commit '6a0fa4d8':
  aarch64: remove optional :pg_hi21: for adrp instruction
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavutil/aarch64/asm.S

@@ -61,7 +61,7 @@ ELF     .size   \name, . - \name
         adrp            \rd, \val@PAGE
         add             \rd, \rd, \val@PAGEOFF
 #elif CONFIG_PIC
-        adrp            \rd, :pg_hi21:\val
+        adrp            \rd, \val
         add             \rd, \rd, :lo12:\val
 #else
         ldr             \rd, =\val