Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

engine: Rename the magic slice assembly file #38021

Merged
merged 1 commit into from
Jun 4, 2019

Conversation

bdarnell
Copy link
Contributor

@bdarnell bdarnell commented Jun 4, 2019

Assembly files are supposed to be run through the preprocessor only
when they end in a captial .S. On the linux build, it appears to run
through the preprocessor anyway, but this is not the case for the
windows build (note that our windows binary is cross-compiled from
linux; this is not about case-insensitivity of the windows
filesystem). The windows build is broken when this file has a
lowercase .s.

Renames that consist only of case changes are poorly supported by git
and other tools, so also change the base name of the file. Some tools
support a .sx extension for a less-subtle version of this distinction,
but go does not.

Release note: None

Assembly files are supposed to be run through the preprocessor only
when they end in a captial .S. On the linux build, it appears to run
through the preprocessor anyway, but this is not the case for the
windows build (note that our windows binary is cross-compiled from
linux; this is not about case-insensitivity of the windows
filesystem). The windows build is broken when this file has a
lowercase .s.

Renames that consist only of case changes are poorly supported by git
and other tools, so also change the base name of the file. Some tools
support a .sx extension for a less-subtle version of this distinction,
but go does not.

Release note: None
@bdarnell bdarnell requested review from jordanlewis, petermattis and a team June 4, 2019 20:29
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@jordanlewis
Copy link
Member

LGTM.

@bdarnell
Copy link
Contributor Author

bdarnell commented Jun 4, 2019

bors r=jordanlewis

On the linux build, it appears to run through the preprocessor anyway

Oh, it's not going through the preprocessor but the assembler (at least this assembler) recognizes both // and # as comments. So it's just ignoring the preprocessor directives, which on linux would have exactly the same effect.

craig bot pushed a commit that referenced this pull request Jun 4, 2019
38021: engine: Rename the magic slice assembly file r=jordanlewis a=bdarnell

Assembly files are supposed to be run through the preprocessor only
when they end in a captial .S. On the linux build, it appears to run
through the preprocessor anyway, but this is not the case for the
windows build (note that our windows binary is cross-compiled from
linux; this is not about case-insensitivity of the windows
filesystem). The windows build is broken when this file has a
lowercase .s.

Renames that consist only of case changes are poorly supported by git
and other tools, so also change the base name of the file. Some tools
support a .sx extension for a less-subtle version of this distinction,
but go does not.

Release note: None

Co-authored-by: Ben Darnell <[email protected]>
@craig
Copy link
Contributor

craig bot commented Jun 4, 2019

Build succeeded

@craig craig bot merged commit 416f500 into cockroachdb:master Jun 4, 2019
@bdarnell bdarnell deleted the rename-slice branch June 4, 2019 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants