Commit f963f803 authored by Martin Storsjö's avatar Martin Storsjö

arm: Use .data.rel.ro for const data with relocations

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 3c01039e
...@@ -1543,6 +1543,7 @@ HAVE_LIST=" ...@@ -1543,6 +1543,7 @@ HAVE_LIST="
libdc1394_1 libdc1394_1
libdc1394_2 libdc1394_2
sdl sdl
section_data_rel_ro
threads threads
vdpau_x11 vdpau_x11
xlib xlib
...@@ -3415,6 +3416,7 @@ case $target_os in ...@@ -3415,6 +3416,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
...@@ -3549,6 +3551,7 @@ case $target_os in ...@@ -3549,6 +3551,7 @@ case $target_os in
;; ;;
linux) linux)
enable dv1394 enable dv1394
enable section_data_rel_ro
;; ;;
irix*) irix*)
target_os=irix target_os=irix
......
...@@ -242,7 +242,7 @@ function ff_fft_fixed_calc_neon, export=1 ...@@ -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
......
...@@ -348,7 +348,7 @@ function ff_fft_permute_neon, export=1 ...@@ -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
......
...@@ -33,7 +33,7 @@ function ff_fft_calc_vfp, export=1 ...@@ -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
......
...@@ -89,12 +89,16 @@ FUNC .func \name ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment