1248016 - Make ASFILES rules work with .s or .asm files

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[(not currently active) Ted Mielczarek]

Currently our rules to compile ASFILES only work for ASM_SUFFIX, which varies by platform:
https://dxr.mozilla.org/mozilla-central/rev/576a6dcde5b68c2ea45324ed5ce1dabb7d833d09/config/rules.mk#239

A bunch of Makefiles (mostly those using yasm) wind up having to override this in Makefiles to make things work:
https://dxr.mozilla.org/mozilla-central/search?q=ASM_SUFFIX

We should just support .s or .asm for ASFILES like we do .cc/.cpp for CPPSRCS.

Comment 1

[(not currently active) Ted Mielczarek]

Attachment: MozReview Request: bug 1248016 - make ASFILES rules work with .s/.asm, get rid of ASM_SUFFIX. r?mshal

Review commit: https://reviewboard.mozilla.org/r/37909/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/37909/

Comment 2

[(not currently active) Ted Mielczarek]

This patch wound up being pretty straightforward. I took the time to remove ASM_SUFFIX entirely while I was there.

Comment 3

[Michael Shal [:mshal]]

Comment on attachment 8726293 [details]
MozReview Request: bug 1248016 - make ASFILES rules work with .s/.asm, get rid of ASM_SUFFIX. r?mshal

https://reviewboard.mozilla.org/r/37909/#review34569

Just some optional nits. Looks good!

::: media/libvpx/moz.build:37
(Diff revision 1)
> -            "!%s.%s" % (f, CONFIG['VPX_ASM_SUFFIX'])
> +            "!%s.s" % f

Now that this line is shorter, it might be a little easier to read if you put this in one line:

"!%s.s" % f if f.endswith('.asm') else f for f in arm_asm_files

::: media/libvpx/moz.build:39
(Diff revision 1)
>              for f in sorted(arm_asm_files)

I don't think you need sorted here since the result is sorted anyway, which will also make the line a little shorter to fit in 80 characters.

Comment 4

[(not currently active) Ted Mielczarek]

https://hg.mozilla.org/integration/mozilla-inbound/rev/36b8d3c16c1776711703f1498902402b0bacf828
bug 1248016 - make ASFILES rules work with .s/.asm, get rid of ASM_SUFFIX. r=mshal

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/36b8d3c16c17