[FFmpeg-devel] [FFmpeg-cvslog] avutil/x86/Makefile: Make building and linking of emms.c conditional

[Michael Niedermayer]

On Wed, Apr 08, 2015 at 02:36:48PM -0300, James Almer wrote:
> > ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Wed Apr  8 17:17:24 2015 +0200| [b926f02e81165378e615ca619f1283358dac26e4] | committer: Michael Niedermayer
> >
> > avutil/x86/Makefile: Make building and linking of emms.c conditional
> >
> > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> >
> > > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b926f02e81165378e615ca619f1283358dac26e4
> > ---
> >
> >  libavutil/x86/Makefile |    4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile
> > index ad3bdfc..768ef85 100644
> > --- a/libavutil/x86/Makefile
> > +++ b/libavutil/x86/Makefile
> > @@ -4,8 +4,10 @@ OBJS += x86/cpu.o                                                       \
> >  
> >  OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o                      \
> >  
> > +EMMS_OBJS_$(HAVE_INLINE_MMX)_$(HAVE_EXTERNAL_MMX)_$(HAVE_MM_EMPTY) = x86/emms.o
> 
> HAVE_MMX_INLINE/EXTERNAL.
> 
> > +
> >  YASM-OBJS += x86/cpuid.o                                                \
> > -             x86/emms.o                                                 \
> > +             $(EMMS_OBJS_NO_NO_NO)                                      \
> 
> This is also wrong. AFAICS the variables are never set to "NO", only "yes" (in lowercase) when the relevant configure
> test succeeds. Otherwise they remain unset.
> 
> Also, what is this patch trying to do? emms.asm is used/needed only if HAVE_MM_EMPTY and HAVE_MMX_INLINE
> are not set, and of course can only be assembled if HAVE_EXTERNAL_MMX is set.

it was to avoid the few extra bytes when its not needed / reduce the
amount of unconditionally added code


> Something like $(EMMS_OBJS__yes_) would assemble it only when really needed, but nonetheless this all seems like
> unnecessary complexity to prevent a ~200 bytes object to be assembled and included in the library.

iam fine with $(EMMS_OBJS__yes_), iam also fine with reverting but
its not my patch

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Concerning the gods, I have no means of knowing whether they exist or not
or of what sort they may be, because of the obscurity of the subject, and
the brevity of human life -- Protagoras
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150408/7ee0db76/attachment.asc>