RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-01 12:23:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'

Browse Source 
* 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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/aarch64/asm.S
View File

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