959846 - Only build the js/src/assembler/assembler/*.cpp files for the targeted platform

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Till Schneidereit [:till]]

Currently, ARMAssembler.cpp, MacroAssemblerARM.cpp, and MacroAssemblerX86Common.cpp get built for all platforms, resulting in warnings about empty .o files during linking.

Comment 1

[Till Schneidereit [:till]]

Attachment: Only build the js/src/assembler/assembler/*.cpp files for the targeted platform

I hope this is the canonical way of making this conditional on the target

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8360068 [details] [diff] [review]
Only build the js/src/assembler/assembler/*.cpp files for the targeted platform

Review of attachment 8360068 [details] [diff] [review]:
-----------------------------------------------------------------

r+ with nits fixed.

You can probably remove the #if surrounding those file contents.

::: js/src/moz.build
@@ +346,5 @@
>          'yarr/OSAllocatorPosix.cpp',
>      ]
>  
>  if CONFIG['ENABLE_ION'] or CONFIG['ENABLE_YARR_JIT']:
> +    if CONFIG['TARGET_CPU'].find('86') != -1:

'86' in CONFIG['TARGET_CPU']

@@ +350,5 @@
> +    if CONFIG['TARGET_CPU'].find('86') != -1:
> +        SOURCES += [
> +            'assembler/assembler/MacroAssemblerX86Common.cpp',
> +        ]
> +    elif CONFIG['TARGET_CPU'].find('arm') != -1:

CONFIG['TARGET_CPU'].startswith('arm')
or
CONFIG['CPU_ARCH'] == 'arm'

Comment 3

[Till Schneidereit [:till]]

remote:   https://hg.mozilla.org/integration/mozilla-inbound/rev/23917c440e15

> You can probably remove the #if surrounding those file contents.

These files are imported from JSC, so I'd rather not touch them needlessly.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/23917c440e15