build, tools, win: add .S files support to GYP #24553

bzoz · 2018-11-21T13:29:48Z

Makes GYP properly handle .S files.

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

Makes GYP properly handle .S files. Fixes: nodejs/node-v8#89

nodejs-github-bot · 2018-11-21T13:29:50Z

@bzoz build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/1665/pipeline

targos · 2018-11-21T13:32:57Z

Tentative CI on top of canary-base: https://ci.nodejs.org/job/node-test-commit-windows-fanned/22588/

Edit: rebase cannot work ofc. Let me apply it manually...

Edit: https://ci.nodejs.org/job/node-test-commit-windows-fanned/22589/ (on https://github.com/targos/node/commits/test-24553)

refack

LGTM % nit

refack · 2018-11-21T13:35:30Z

tools/gyp/pylib/gyp/generator/msvs.py

@@ -2171,6 +2171,9 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
  elif ext == '.asm':
    group = 'masm'
    element = 'MASM'
+  elif ext == '.S':


I'd suggest doing it like this

Suggested change

elif ext == '.S':

elif ext.lower() in ['.asm', '.s']:

Is that equivalent? On Unices the convention is that .S should be run through cpp whereas .s should not. I don't know if that's applicable to usually-case-insensitive Windows.

AFAICT .s nor .S are standard for MSVS. It's more common to see .asm.
And in this case while the file indeed has .S semantics on Unices, cl.exe doesn't except it.

Seems like we have the same bug in ninja.py, so maybe the fix should be in v8.gyp, changing the extension to .asm iff Windows.

node/tools/gyp/pylib/gyp/generator/ninja.py

Lines 1038 to 1047 in 0c64816

elif ext == 'c' or (ext == 'S' and self.flavor != 'win'):

command = 'cc'

elif ext == 's' and self.flavor != 'win': # Doesn't generate .o.d files.

command = 'cc_s'

elif (self.flavor == 'win' and ext == 'asm' and

not self.msvs_settings.HasExplicitAsmRules(spec)):

command = 'asm'

# Add the _asm suffix as msvs is capable of handling .cc and

# .asm files of the same name without collision.

obj_ext = '_asm.obj'

targos · 2018-11-21T17:12:37Z

The canary CI failed on 32bit but maybe it's unrelated?

https://ci.nodejs.org/job/node-compile-windows/22547/label=win-vs2017-x86/console

refack · 2018-11-21T18:56:07Z

The canary CI failed on 32bit but maybe it's unrelated?

Error seems unrelated as it refers to an .h file. Also it's in v8_base_2 which is a dependency of v8_snapshot so it should be present in the job stated yesterday and refereed in nodejs/node-v8#89 - https://ci.nodejs.org/job/node-compile-windows/22413/label=win-vs2017-x86/console:

08:44:22 c:\workspace\node-compile-windows\deps\v8\src/ia32/assembler-ia32-inl.h(282): error C2440: '?': cannot convert from 'v8::internal::Code' to 'bool' (compiling source file ..\src\snapshot\startup-deserializer.cc) [c:\workspace\node-compile-windows\deps\v8\gypfiles\v8_base_2.vcxproj]
08:44:22   c:\workspace\node-compile-windows\deps\v8\src/ia32/assembler-ia32-inl.h(282): note: Ambiguous user-defined-conversion (compiling source file ..\src\snapshot\startup-deserializer.cc)
08:44:22 c:\workspace\node-compile-windows\deps\v8\src/ia32/assembler-ia32-inl.h(281): error C2660: 'v8::internal::Assembler::set_target_address_at': function does not take 2 arguments (compiling source file ..\src\snapshot\startup-deserializer.cc) [c:\workspace\node-compile-windows\deps\v8\gypfiles\v8_base_2.vcxproj]

bzoz · 2018-11-22T10:34:10Z

Updated to support both lower and upper cases, PTAL.

bzoz · 2018-11-29T07:46:15Z

CI: https://ci.nodejs.org/job/node-test-pull-request/19029/

bzoz · 2018-11-29T09:56:56Z

Failures are unrelated.

bzoz · 2018-11-29T10:10:35Z

Landed in 9920dbc

Makes GYP properly handle .S files. Fixes: nodejs/node-v8#89 PR-URL: nodejs#24553 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

Makes GYP properly handle .S files. Fixes: nodejs/node-v8#89 PR-URL: #24553 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

Makes GYP properly handle .S files. Fixes: nodejs/node-v8#89 PR-URL: nodejs#24553 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

Makes GYP properly handle .S files. Fixes: nodejs/node-v8#89 PR-URL: #24553 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

build, tools, win: add .S files support to GYP

160d2d2

Makes GYP properly handle .S files. Fixes: nodejs/node-v8#89

nodejs-github-bot added build Issues and PRs related to build files or the CI. tools Issues and PRs related to the tools directory. labels Nov 21, 2018

bzoz mentioned this pull request Nov 21, 2018

Broken build on Windows nodejs/node-v8#89

Closed

refack approved these changes Nov 21, 2018

View reviewed changes

refack added the gyp Issues and PRs related to the GYP tool and .gyp build files label Nov 21, 2018

richardlau approved these changes Nov 21, 2018

View reviewed changes

refack changed the base branch from master to canary-base November 21, 2018 13:37

refack changed the base branch from canary-base to master November 21, 2018 13:38

addaleax approved these changes Nov 21, 2018

View reviewed changes

fixup: support both upper and lower case filenames

2fed1a3

refack approved these changes Nov 22, 2018

View reviewed changes

bzoz closed this Nov 29, 2018

BridgeAR mentioned this pull request Dec 5, 2018

v11.4.0 proposal #24854

Merged

4 tasks

BethGriggs mentioned this pull request Feb 12, 2019

v10.15.3 proposal #26063

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build, tools, win: add .S files support to GYP #24553

build, tools, win: add .S files support to GYP #24553

bzoz commented Nov 21, 2018

nodejs-github-bot commented Nov 21, 2018

targos commented Nov 21, 2018 •

edited

Loading

refack left a comment

refack Nov 21, 2018 •

edited

Loading

bnoordhuis Nov 21, 2018

refack Nov 21, 2018

refack Nov 21, 2018

targos commented Nov 21, 2018

refack commented Nov 21, 2018

bzoz commented Nov 22, 2018

bzoz commented Nov 29, 2018

bzoz commented Nov 29, 2018

bzoz commented Nov 29, 2018

	elif ext == 'c' or (ext == 'S' and self.flavor != 'win'):
	command = 'cc'
	elif ext == 's' and self.flavor != 'win': # Doesn't generate .o.d files.
	command = 'cc_s'
	elif (self.flavor == 'win' and ext == 'asm' and
	not self.msvs_settings.HasExplicitAsmRules(spec)):
	command = 'asm'
	# Add the _asm suffix as msvs is capable of handling .cc and
	# .asm files of the same name without collision.
	obj_ext = '_asm.obj'

build, tools, win: add .S files support to GYP #24553

build, tools, win: add .S files support to GYP #24553

Conversation

bzoz commented Nov 21, 2018

Checklist

nodejs-github-bot commented Nov 21, 2018

targos commented Nov 21, 2018 • edited Loading

refack left a comment

Choose a reason for hiding this comment

refack Nov 21, 2018 • edited Loading

Choose a reason for hiding this comment

bnoordhuis Nov 21, 2018

Choose a reason for hiding this comment

refack Nov 21, 2018

Choose a reason for hiding this comment

refack Nov 21, 2018

Choose a reason for hiding this comment

targos commented Nov 21, 2018

refack commented Nov 21, 2018

bzoz commented Nov 22, 2018

bzoz commented Nov 29, 2018

bzoz commented Nov 29, 2018

bzoz commented Nov 29, 2018

targos commented Nov 21, 2018 •

edited

Loading

refack Nov 21, 2018 •

edited

Loading