From 5755bc88e51a82dd00897d840df2a688631da768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Tue, 10 Nov 2009 12:57:28 +0000 Subject: [PATCH] Check if PIC is somehow already enabled (e.g. a compiler that enables it by default). This in particular ensures that -DPIC is set appropriately for YASM, which avoids linking failures on x86_64 for compilers that have PIE enabled by default (e.g. hardened Gentoo). It also makes the macho64 special-case hack adding -DPIC to YASMFLAGS obsolete. Originally committed as revision 20497 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 7ad3c2638e..83791fc02b 100755 --- a/configure +++ b/configure @@ -1876,6 +1876,9 @@ esac enable $arch $subarch enabled spic && enable pic +# This is the same check as used in libavutil/internal.h +# to enable RIP-relative addressing for x86_64 inline asm. +check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic # OS specific case $target_os in @@ -2237,7 +2240,6 @@ EOF test -n "$extern_prefix" && append YASMFLAGS "-DPREFIX" case "$objformat" in elf) enabled debug && append YASMFLAGS "-g dwarf2" ;; - macho64) append YASMFLAGS "-DPIC" ;; esac disabled yasm || { check_yasm "pabsw xmm0, xmm0" && enable yasm; }