Closed Bug 1299959 Opened 4 years ago Closed 3 years ago

Find a cleaner solution for preprocessed assembly files on Windows

Categories

(Firefox Build System :: General, defect)

defect
Not set
normal

Tracking

(firefox58 fixed)

RESOLVED FIXED
mozilla58
Tracking Status
firefox58 --- fixed

People

(Reporter: chmanchester, Assigned: ted)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

In the patches for bug 1262155 we're still using libffi's msvcc.sh for assembly sources on Windows because they expect to be pre-processed. We should implement a cleaner solution for this in moz.build.
This script isn't working in my WSL build, so I might as well fix this.
Assignee: nobody → ted
Blocks: wsl-build
Comment on attachment 8908147 [details]
bug 1299959 - use GENERATED_FILES for libffi's preprocessed assembly files.

https://reviewboard.mozilla.org/r/179838/#review185616

::: config/external/ffi/preprocess_libffi_asm.py:1
(Diff revision 1)
> +#!/usr/bin/env python

License header?
Attachment #8908147 - Flags: review?(cmanchester) → review+
(In reply to Ted Mielczarek [:ted.mielczarek] from comment #4)
> https://treeherder.mozilla.org/#/
> jobs?repo=try&revision=63460429cf7af5fb453045dca21ce03eecb6d082

So the patch here worked for my local Win64 build, but was broken in several ways that made it break almost everywhere else. :)

I screwed up the blocks in the moz.build file and had my changes in the "non-windows x86" block. I think I was thrown off by the presence of win32.S there. I was also using 'CC' in the Python script, but on automation builds that expands to 'sccache.exe cl.exe' which doesn't work as the first argument to process invocation. I fixed that by using 'CPP' instead, which is always a list.
(In reply to Ted Mielczarek [:ted.mielczarek] from comment #5)
> https://treeherder.mozilla.org/#/
> jobs?repo=try&revision=e66c9a2ca1eca34c1183902dd6ef9d5f269b0782

I missed one other bit here--I needed `-safeseh` in ASFLAGS. I don't know why we don't default to that on Win32. :-/

One last try push to make sure the Win32 builds work with that!
OK, the Win32 builds on that last try push are green.
Comment on attachment 8908147 [details]
bug 1299959 - use GENERATED_FILES for libffi's preprocessed assembly files.

Chris: can you take another look at this? I had to fix a few things as described in previous comments.
Attachment #8908147 - Flags: review+ → review?(cmanchester)
Comment on attachment 8908147 [details]
bug 1299959 - use GENERATED_FILES for libffi's preprocessed assembly files.

https://reviewboard.mozilla.org/r/179838/#review195614
Attachment #8908147 - Flags: review?(cmanchester) → review+
https://hg.mozilla.org/integration/mozilla-inbound/rev/80acc252947941171929d39a03f3e4c6b14f1064
bug 1299959 - use GENERATED_FILES for libffi's preprocessed assembly files. r=chmanchester
https://hg.mozilla.org/mozilla-central/rev/80acc2529479
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla58
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.