Merge commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e'

* commit 'fd2981ea92d9a776fcb1a13377dce1c8a7db7b5e':
  aarch64: add darwin style PAGE/PAGEOFF relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-03 17:30:24 +02:00
commit ab9afcdf04

View File

@ -57,7 +57,10 @@ ELF .size \name, . - \name
.endm
.macro movrel rd, val
#if CONFIG_PIC
#if CONFIG_PIC && defined(__APPLE__)
adrp \rd, \val@PAGE
add \rd, \rd, \val@PAGEOFF
#elif CONFIG_PIC
adrp \rd, :pg_hi21:\val
add \rd, \rd, :lo12:\val
#else