Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 16:03:15 +0000 (18:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 16:03:19 +0000 (18:03 +0200)
* commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617':
  aarch64: remove optional :pg_hi21: for adrp instruction

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/aarch64/asm.S

index b6798c4..cea564e 100644 (file)
@@ -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