Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index 0933210069d9b3e9aa31e89d0a4351e7371d3420,ed8316fbb7771fb0a95f0c6296721f0691c20146..8006f3bf2622b249c08818ae9e78abf262c5d0d5
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1824,12 -1542,8 +1824,13 @@@ HAVE_LIST=
      libc_msvcrt
      libdc1394_1
      libdc1394_2
 +    makeinfo
 +    makeinfo_html
 +    perl
 +    pod2man
      sdl
+     section_data_rel_ro
 +    texi2html
      threads
      vdpau_x11
      xlib

diff --cc libavcodec/arm/fft_fixed_neon.S
Simple merge

diff --cc libavcodec/arm/fft_neon.S
Simple merge

diff --cc libavcodec/arm/fft_vfp.S
Simple merge

diff --cc libavutil/arm/asm.S
Simple merge