Integrated: 8264188: Improve handling of assembly files in the JDK

Magnus Ihse Bursie ihse at
Mon Apr 26 13:00:33 UTC 2021

On Thu, 25 Mar 2021 16:25:32 GMT, Magnus Ihse Bursie <ihse at> wrote:

> We have a handful of assembly files in the JDK. They have long been left aside, with a "if it ain't broken, don't fix it" attitude. 
> In the current panama-vector, there is a lot more assembly files incoming, including for the Windows platforrm, which has not existed for a long time in the JDK. 
> It is time to give assembly files some more love and care. This patch cleans up the handling in the build system, and it unifies between .s and .S files. 
> For historical reasons, .s has been the suffix used in the posix world to signify assembly output as generated by a compiler, and .S to signify "hand-written" precious assembly. One effect of this is that gcc and clang will run the preprocessor on files named .S but not on files named .s. 
> All our files are "hand-written" in this sense, and should have the .S suffix. But not all had. On mac, it was even worse, where the files were named .s but the option `-x assembler-with-cpp` was used to force clang to treat them as .S files instead... This change however made the preprocesser try to parse comments of the form
> # if (a) {
> as preprocessor directives, and balk at them. In one of the files, I had to wrap this in preprocessor comments (`/* ... */`).
> We also had inconsistent handling on dependencies. For preprocessed assembly files, it really makes sense to have dependency tracking, exactly as for C/C++ files. Now the dependency tracking in NativeCompilation is simplified, and applies to all files. (The sole exception is Windows assembly, since masm is unable to output dependency information, even though it is able to include files :-().
> This patch has been partly written by Sandhya Viswanathan <sviswanathan at> for the panama-vector repo.

This pull request has now been integrated.

Changeset: b9f66d93
Author:    Magnus Ihse Bursie <ihse at>
Stats:     78 lines in 12 files changed: 33 ins; 9 del; 36 mod

8264188: Improve handling of assembly files in the JDK

Co-authored-by: Sandhya Viswanathan <sviswanathan at>
Co-authored-by: Magnus Ihse Bursie <ihse at>
Reviewed-by: erikj, vlivanov



More information about the hotspot-compiler-dev mailing list