har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'

Browse Source 
* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
  arm: Use .data.rel.ro for const data with relocations

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-09 11:58:13 +01:00
commit 16e65419ed
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -1829,6 +1829,7 @@ HAVE_LIST="
perl perl
pod2man pod2man
sdl sdl
section_data_rel_ro
texi2html texi2html
threads threads
vdpau_x11 vdpau_x11
@ -3990,6 +3991,7 @@ case $target_os in
;; ;;
android) android)
disable symver disable symver
enable section_data_rel_ro
SLIB_INSTALL_NAME='$(SLIBNAME)' SLIB_INSTALL_NAME='$(SLIBNAME)'
SLIB_INSTALL_LINKS= SLIB_INSTALL_LINKS=
# soname not set on purpose # soname not set on purpose
@ -4138,6 +4140,7 @@ case $target_os in
;; ;;
linux) linux)
enable dv1394 enable dv1394
enable section_data_rel_ro
;; ;;
irix*) irix*)
target_os=irix target_os=irix

2
libavcodec/arm/fft_fixed_neon.S
View File

@ -242,7 +242,7 @@ function ff_fft_fixed_calc_neon, export=1
bx r3 bx r3
endfunc endfunc
const fft_fixed_tab_neon const fft_fixed_tab_neon, relocate=1
.word fft4_neon .word fft4_neon
.word fft8_neon .word fft8_neon
.word fft16_neon .word fft16_neon

2
libavcodec/arm/fft_neon.S
View File

@ -348,7 +348,7 @@ function ff_fft_permute_neon, export=1
pop {r4,pc} pop {r4,pc}
endfunc endfunc
const fft_tab_neon const fft_tab_neon, relocate=1
.word fft4_neon .word fft4_neon
.word fft8_neon .word fft8_neon
.word fft16_neon .word fft16_neon

2
libavcodec/arm/fft_vfp.S
View File

@ -33,7 +33,7 @@ function ff_fft_calc_vfp, export=1
movrel a2, (fft_tab_vfp - 8) movrel a2, (fft_tab_vfp - 8)
ldr pc, [a2, ip, lsl #2] ldr pc, [a2, ip, lsl #2]
endfunc endfunc
const fft_tab_vfp const fft_tab_vfp, relocate=1
.word fft4_vfp .word fft4_vfp
.word fft8_vfp .word fft8_vfp
.word X(ff_fft16_vfp) @ this one alone is exported .word X(ff_fft16_vfp) @ this one alone is exported

6
libavutil/arm/asm.S
View File

@ -89,12 +89,16 @@ FUNC .func \name
.endif .endif
.endm .endm
.macro const name, align=2 .macro const name, align=2, relocate=0
.macro endconst .macro endconst
ELF .size \name, . - \name ELF .size \name, . - \name
.purgem endconst .purgem endconst
.endm .endm
.if HAVE_SECTION_DATA_REL_RO && \relocate
.section .data.rel.ro
.else
.section .rodata .section .rodata
.endif
.align \align .align \align
\name: \name:
.endm .endm