Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'

* commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617':
  aarch64: remove optional :pg_hi21: for adrp instruction

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-03 18:03:15 +02:00
commit 40285d2659

View 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