Martin Storsjö <[email protected]> writes: > This fixes builds on x86_64 darwin. > --- > Due to the duplicated lines, the diff shows the change in a much more > convoluted way than what actually is intended. > > configure | 5 ++++- > libavcodec/x86/fft_mmx.asm | 4 ++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > index aa1856d..7074194 100755 > --- a/configure > +++ b/configure > @@ -2773,7 +2773,10 @@ EOF > enabled pic && append YASMFLAGS "-DPIC" > test -n "$extern_prefix" && append YASMFLAGS "-DPREFIX" > case "$objformat" in > - elf*) enabled debug && append YASMFLAGS $yasm_debug ;; > + elf*) > + enabled debug && append YASMFLAGS $yasm_debug > + append YASMFLAGS "-DELF" > + ;; > esac > > check_yasm "pextrd [eax], xmm0, 1" && enable yasm || > diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm > index 007f5ca..a4f7d4d 100644 > --- a/libavcodec/x86/fft_mmx.asm > +++ b/libavcodec/x86/fft_mmx.asm > @@ -648,11 +648,15 @@ cglobal fft_permute, 2,7,1 > RET > %elif ARCH_X86_64 > %ifdef PIC > +%ifdef ELF > jmp memcpy wrt ..plt > %else > jmp memcpy > %endif > %else > + jmp memcpy > +%endif > +%else
Is there no way to do if PIC && ELF on one line? -- Måns Rullgård [email protected] _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
