1336569 - mingw link step fails with undefined references to ffi_...

Status: RESOLVED FIXED

(Core :: js-ctypes, defect)

Description

[Tom Ritter [:tjr]]

28:20.64     INPUT("StaticXULComponentsEnd/StaticXULComponentsEnd.o")
28:20.64 
28:20.64 ../../js/src/libjs_static.a(ffi.o): In function `ffi_call':
28:20.64 /home/worker/workspace/mingw-w64-build/firefox/js/src/ctypes/libffi/src/x86/ffi.c:390: undefined reference to `ffi_call_win32'
28:20.64 /home/worker/workspace/mingw-w64-build/firefox/js/src/ctypes/libffi/src/x86/ffi.c:418: undefined reference to `ffi_call_win32'
28:20.64 ../../js/src/libjs_static.a(ffi.o): In function `ffi_prep_closure_loc':
28:20.64 /home/worker/workspace/mingw-w64-build/firefox/js/src/ctypes/libffi/src/x86/ffi.c:673: undefined reference to `ffi_closure_SYSV'
28:20.64 /home/worker/workspace/mingw-w64-build/firefox/js/src/ctypes/libffi/src/x86/ffi.c:679: undefined reference to `ffi_closure_FASTCALL'
28:20.64 /home/worker/workspace/mingw-w64-build/firefox/js/src/ctypes/libffi/src/x86/ffi.c:685: undefined reference to `ffi_closure_THISCALL'
28:20.64 /home/worker/workspace/mingw-w64-build/firefox/js/src/ctypes/libffi/src/x86/ffi.c:691: undefined reference to `ffi_closure_STDCALL'
28:20.64 /home/worker/workspace/mingw-w64-build/firefox/js/src/ctypes/libffi/src/x86/ffi.c:698: undefined reference to `ffi_closure_SYSV'
28:20.64 collect2: error: ld returned 1 exit status

Comment 1

[Tom Ritter [:tjr]]

Attachment: Bug 1336569 Define SYMBOL_UNDERSCORE for ffi in the mingw build

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

Comment 2

[Tom Ritter [:tjr]]

The attached patch shows what needs to be fixed, but is not the correct way to do it. Looking at js/src/ctypes/libffi/configure it seems like I need to investigate the sys_symbol_underscore check.

Comment 3

[Tom Ritter [:tjr]]

This was broken by 1262155 and we need to set DEFINES['SYMBOL_UNDERSCORE'] = True for mingw builds in config/external/ffi/moz.build

Comment 4

[Tom Ritter [:tjr]]

Comment on attachment 8833459 [details]
Bug 1336569 Define SYMBOL_UNDERSCORE for ffi in the mingw build

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/109706/diff/1-2/

Comment 5

[Tom Ritter [:tjr]]

Comment on attachment 8833459 [details]
Bug 1336569 Define SYMBOL_UNDERSCORE for ffi in the mingw build

https://reviewboard.mozilla.org/r/109706/#review111678

::: build/moz.configure/toolchain.configure:770
(Diff revision 2)
>      if language == 'C':
> +        set_config(
> +            '%s_TYPE' % var, delayed_getattr(valid_compiler, 'type'))
>          add_old_configure_assignment(
>              '%s_TYPE' % var, delayed_getattr(valid_compiler, 'type'))
>          add_old_configure_assignment(

CC_VERSION is aparently already defined somewhere, since when I added a set_config for it, I got an error saying so. (I couldn't figure out where though...)

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 8833459 [details]
Bug 1336569 Define SYMBOL_UNDERSCORE for ffi in the mingw build

https://reviewboard.mozilla.org/r/109706/#review111838

::: config/external/ffi/moz.build:88
(Diff revision 2)
> +        #MinGW Build for 32 bit
> +        if CONFIG['CC_TYPE'] == 'gcc':
> +            DEFINES['SYMBOL_UNDERSCORE'] = True

Isn't the same needed for 64-bits?

::: config/external/ffi/moz.build:88
(Diff revision 2)
>      elif CONFIG['FFI_TARGET'] == 'X86':
>          ffi_srcs = ('ffi.c', 'sysv.S', 'win32.S')
>      elif CONFIG['FFI_TARGET'] == 'X86_64':
>          ffi_srcs = ('ffi64.c', 'unix64.S', 'ffi.c', 'sysv.S')
>      elif CONFIG['FFI_TARGET'] == 'X86_WIN32':
> +        #MinGW Build for 32 bit

Space after the #.

Comment 7

[Tom Ritter [:tjr]]

Comment on attachment 8833459 [details]
Bug 1336569 Define SYMBOL_UNDERSCORE for ffi in the mingw build

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/109706/diff/2-3/

Comment 8

[Tom Ritter [:tjr]]

(In reply to Mike Hommey [:glandium] from comment #6)
> Isn't the same needed for 64-bits?

Probably. But we're pretty far from doing a 64 bit mingw build, so I don't just want to stick it in there assuming it's what's needed without being able to test it. When we get to the 64 bit build we can put it in.

Comment 9

[Ryan VanderMeulen [:RyanVM]]

Autoland can't push this until all pending issues are marked as resolved in MozReview.

Comment 10

[Tom Ritter [:tjr]]

Fixed, sorry! (I had fixed the nit but didn't mark it as fixed.)

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/9d83651da332
Define SYMBOL_UNDERSCORE for ffi in the mingw build r=glandium

Comment 12

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/9d83651da332

Comment 13

[Tom Ritter [:tjr]]

Comment on attachment 8833459 [details]
Bug 1336569 Define SYMBOL_UNDERSCORE for ffi in the mingw build

[Feature/Bug causing the regression]: mingw build failure in ESR52.

[User impact if declined]: Tor will need to carry another custom patch.

[Is this code covered by automated tests?]: N/A  (It's a compilation problem)

[Has the fix been verified in Nightly?]: N/A (It's a compilation problem)

[Needs manual test from QE? If yes, steps to reproduce]: No.

[List of other uplifts needed for the feature/fix]: None

[Is the change risky?]: No

[Why is the change risky/not risky?]: It only affects gcc compilations of Firefox for Windows.

[String changes made/needed]: None

Comment 14

[Julien Cristau [:jcristau]]

Comment on attachment 8833459 [details]
Bug 1336569 Define SYMBOL_UNDERSCORE for ffi in the mingw build

mingw build fix for beta52.  And probably aurora as well.

Comment 15

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/81a4f7ad1671

Comment 16

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-beta/rev/e33a33688cc9

Comment 17

[Cornel Ionce [:noni] [Hubs QA]]

Setting qe-verify- per comment 13.

Comment 18

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-esr52/rev/e33a33688cc9