1846703 - libavcodec/x86/mathops.h:125: Error: operand type mismatch for ` shr'

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Mike Hommey [:glandium]]

When building with a recent binutils, the build fails with:

/<<PKGBUILDDIR>>/media/ffvpx/libavcodec/x86/mathops.h: Assembler messages:
/<<PKGBUILDDIR>>/media/ffvpx/libavcodec/x86/mathops.h:125: Error: operand type mismatch for `shr'
/<<PKGBUILDDIR>>/media/ffvpx/libavcodec/x86/mathops.h:125: Error: operand type mismatch for `shr'
/<<PKGBUILDDIR>>/media/ffvpx/libavcodec/x86/mathops.h:125: Error: operand type mismatch for `shr'
/<<PKGBUILDDIR>>/media/ffvpx/libavcodec/x86/mathops.h:125: Error: operand type mismatch for `shr'
/<<PKGBUILDDIR>>/media/ffvpx/libavcodec/x86/mathops.h:125: Error: operand type mismatch for `shr'
/<<PKGBUILDDIR>>/media/ffvpx/libavcodec/x86/mathops.h:125: Error: operand type mismatch for `shr'
make[5]: *** [/<<PKGBUILDDIR>>/config/rules.mk:585: atsc_a53.o] Error 1

This is caused by this change in binutils: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=c34d1cc9200ae24dc7572aaf77d80276c0490e9b and discussed in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108941 (also filed in https://sourceware.org/bugzilla/show_bug.cgi?id=30578)

Eventually, it was fixed in ffmpeg's source: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=effadce6c756247ea8bae32dc13bb3e6f464f0eb

We should take this fix and uplift it to esr115.

Comment 1

[Paul Adenot (:padenot)]

I'm landing a big ffmpeg update today, and then I can update us to current tip tomorrow. We can backport this.

Comment 2

[Paul Adenot (:padenot)]

Attachment: Bug 1846703 - Update vendored ffmpeg to d9d56953. r?alwu

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/28b456c4e5da
Update vendored ffmpeg to d9d56953. r=alwu

Comment 4

[Natalia Csoregi [:nataliaCs]]

https://hg.mozilla.org/mozilla-central/rev/28b456c4e5da

Comment 5

[msirringhaus]

I can confirm that the individual commit mentioned above applies cleanly and fixes the broken build for ESR 115.
Could we get this uplifted?

Comment 6

[Paul Adenot (:padenot)]

Comment on attachment 9348390 [details]
Bug 1846703 - Update vendored ffmpeg to d9d56953. r?alwu

ESR Uplift Approval Request

• If this is not a sec:{high,crit} bug, please state case for ESR consideration: This fixes the build on Linux when building with a recent binutils.
• User impact if declined: Downstream might not be able to build
• Fix Landed on Version: 118
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): We've been running this code for some time on more recent versions. We can also cherry pick the fix.

Comment 7

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 9348390 [details]
Bug 1846703 - Update vendored ffmpeg to d9d56953. r?alwu

Can we get a cherry-pick patch of just the one upstream commit and an approval request on that? We can't graft this entire ffmpeg update to ESR115. It doesn't apply cleanly and is way too large of an update to take.

Comment 8

[Paul Adenot (:padenot)]

Attachment: Bug 1846703 - Backport a single revision from ffmpeg into our vendored copy, to fix the build with recent binutils. r?glandium

Because this library is a rather complex, manually trimmed, subset of ffmpeg,
this doesn't use updatebot. We're currently investigating moving to it to at
least fix some manual work needed, but that hasn't happened yet. In lieu of
adding the new patch to a yaml file, I'm modified the Mozilla-specific README.

Comment 9

[Paul Adenot (:padenot)]

Comment on attachment 9356071 [details]
Bug 1846703 - Backport a single revision from ffmpeg into our vendored copy, to fix the build with recent binutils. r?glandium

ESR Uplift Approval Request

• If this is not a sec:{high,crit} bug, please state case for ESR consideration: See https://bugzilla.mozilla.org/show_bug.cgi?id=1846703#c6 -- this is only the change required to fix the build.
• User impact if declined:
• Fix Landed on Version:
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky):

Comment 10

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 9356071 [details]
Bug 1846703 - Backport a single revision from ffmpeg into our vendored copy, to fix the build with recent binutils. r?glandium

Approved for 115.4esr, thanks.

Comment 11

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 9356071 [details]
Bug 1846703 - Backport a single revision from ffmpeg into our vendored copy, to fix the build with recent binutils. r?glandium

Whoops, waiting for the formal r+ first.

Comment 12

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 9356071 [details]
Bug 1846703 - Backport a single revision from ffmpeg into our vendored copy, to fix the build with recent binutils. r?glandium

Approved for 115.4esr.

Comment 13

[Pulsebot]

https://hg.mozilla.org/releases/mozilla-esr115/rev/e024fe4fd62c