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

Clean up deprecated code resulting from migrating to a unified assembler across x86 #4627

Merged
merged 3 commits into from
Feb 7, 2019

Conversation

nbhuiyan
Copy link
Member

@nbhuiyan nbhuiyan commented Feb 6, 2019

This PR removes the MASM assembly files and cleans up the dual (or triple, if you want to count masm2gas) assembler solutions that existed during the transition period.

Closes: #3148

.asm and .inc x86 assembly files are no longer used on Windows,
and the masm2gas script is no longer used to generate GNU assembly
from MASM to be consumed on Linux. NASM is now used throughout x86
OSes instead.

Signed-off-by: Nazim Uddin Bhuiyan <nazimudd@ualberta.ca>
We no longer need to distinguish them from .inc files in MASM format. All
the .inc assembly files are in NASM format.

Signed-off-by: Nazim Uddin Bhuiyan <nazimudd@ualberta.ca>
* Removed .asm file list from the x86 Makefiles as they are no longer
  used.
* Removed makefile rules to handle .asm and .pasm files across x86
* Disabled setting up of masm2gas script on xLinux in the makefiles
* No longer defining NASM_ASSEMBLER macro in asmprotos.h to declare
  NASM-compatible helpers while maintaining support for using
  MASM/GAS, and instead guarding code with x86 platform checks where
  necessary.

Signed-off-by: Nazim Uddin Bhuiyan <nazimudd@ualberta.ca>
@nbhuiyan
Copy link
Member Author

nbhuiyan commented Feb 6, 2019

@0xdaryl ready for review

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 6, 2019

Jenkins test sanity win,xlinux,xlinuxlargeheap jdk11

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 6, 2019

Jenkins test sanity win32 jdk8

@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 6, 2019

Changes look reasonable to me. One unfortunate consequence is that we lose the history on the deleted assembly files without doing a bit of git work to dig it out. However, this probably isn't such a big deal in practice because there isn't much of a history on these assembly files in the 1.5 years this code has been open sourced.

@0dvictor , I'd appreciate a +1 from you too.

@0dvictor
Copy link
Contributor

0dvictor commented Feb 6, 2019

Changes look good to me. I totally agree deleting these deprecated files; they are slowly out-of-sync and likely stop work in the future. Despite the short history of these files, all histories are still in git though it takes more effort retrieving it. I don't anticipate frequent need of these histories.

@0xdaryl 0xdaryl self-assigned this Feb 7, 2019
@0xdaryl
Copy link
Contributor

0xdaryl commented Feb 7, 2019

Jenkins test sanity plinux,zlinux jdk11

@0xdaryl 0xdaryl merged commit 2f4bf3b into eclipse-openj9:master Feb 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants