Mercurial > mplayer.hg
changeset 29835:f1b71fa008e8
Use configure code to define PIC instead of duplicating the check in mangle.h.
While it is currently not necessary, it might be a good idea to move this outside
the x86-only block in configure, as well as adding -pie to LDFLAGS.
| author | reimar |
|---|---|
| date | Tue, 10 Nov 2009 13:08:36 +0000 |
| parents | ab492a250f35 |
| children | c9c1f9aaaff8 |
| files | configure mangle.h |
| diffstat | 2 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Nov 10 11:51:22 2009 +0000 +++ b/configure Tue Nov 10 13:08:36 2009 +0000 @@ -2580,14 +2580,13 @@ pic=no cat > $TMPC << EOF int main(void) { -// keep in sync with mangle.h and libavutil/internal.h #if !(defined(__PIC__) || defined(__pic__) || defined(PIC)) #error PIC not enabled #endif return 0; } EOF -cc_check && pic=yes +cc_check && pic=yes && extra_cflags="$extra_cflags -DPIC" echores $pic echocheck "yasm"
--- a/mangle.h Tue Nov 10 11:51:22 2009 +0000 +++ b/mangle.h Tue Nov 10 13:08:36 2009 +0000 @@ -31,10 +31,6 @@ #define attribute_used #endif -// keep in sync with configure PIC check and libavutil/internal.h -#if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC) -# define PIC -#endif #if ARCH_X86_64 && defined(PIC) #define MANGLE(a) EXTERN_PREFIX #a "(%%rip)" #else