diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-09 11:58:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-09 11:58:13 +0100 |
| commit | 16e65419ed3e654a04091616bd81b8c96c79c268 (patch) | |
| tree | 46e91a52bd14f4eee55c144675c321249d78ef98 /configure | |
| parent | 99bf26fc6b17c05e9e1ec598a714c5efe1b978f6 (diff) | |
| parent | f963f80399deb1a2b44c1bac3af7123e8a0c9e46 (diff) | |
| download | ffmpeg-16e65419ed3e654a04091616bd81b8c96c79c268.tar.gz | |
Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'
* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
arm: Use .data.rel.ro for const data with relocations
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1829,6 +1829,7 @@ HAVE_LIST=" perl pod2man sdl + section_data_rel_ro texi2html threads vdpau_x11 @@ -3990,6 +3991,7 @@ case $target_os in ;; android) disable symver + enable section_data_rel_ro SLIB_INSTALL_NAME='$(SLIBNAME)' SLIB_INSTALL_LINKS= # soname not set on purpose @@ -4138,6 +4140,7 @@ case $target_os in ;; linux) enable dv1394 + enable section_data_rel_ro ;; irix*) target_os=irix |