Add two new build targets to enable the possibility of using clang-cl as an assembler for Windows on Arm #19523
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openssl-machine
added
the
hold: cla required
levitte
requested changes
Oct 28, 2022
Configurations/50-win-onecore.conf
Outdated
| @@ -82,7 +82,35 @@ my %targets = ( | |||
| ex_libs => "onecore.lib", | |||
| multilib => "-arm64", | |||
| }, | |||
|
|
|||
| "VC-WIN64-CLANGASM-ARM" => { | |||
There was a problem hiding this comment.
I would rather have your definitions in a separate file, say Configurations/50-win-clang-cl.conf
levitte
reviewed
Oct 28, 2022
Configurations/windows-makefile.tmpl
Outdated
| return <<"EOF"; | ||
| if(($config{CC} !~ /clang-cl/) and ($config{AS} =~ /clang-cl/)) | ||
| { | ||
| return <<"EOF"; |
There was a problem hiding this comment.
This is unnecessary, as the added /D__ASSEMBLER__ can be used with cl.exe too, without harm.
Configurations/windows-makefile.tmpl
Outdated
Comment on lines
785
to
793
| } else { | ||
| return <<"EOF"; | ||
| $target: "$gen0" $deps | ||
| cmd /C "set "ASM=\$(AS)" & $generator \$@.S" | ||
| \$(CPP) $incs $cppflags $defs \$@.S > \$@.i | ||
| move /Y \$@.i \$@ | ||
| del /Q \$@.S | ||
| EOF | ||
| } |
Configurations/windows-makefile.tmpl
Outdated
| $target: "$gen0" $deps | ||
| cmd /C "set "ASM=\$(AS)" & $generator \$@.S" | ||
| \$(CPP) $incs $cppflags $defs \$@.S > \$@.i | ||
| \$(CPP) /D__ASSEMBLER__ /E $incs $cppflags $defs \$@.S > \$@.i |
There was a problem hiding this comment.
Drop /E, as it's already present (well, /EP is...). Also, don't convert the initial TAB to spaces.
everton1984
force-pushed
the
clclang_cl
branch
3 times, most recently
from
6ef59ec
to
3c8d25d
Compare
|
@levitte Hi! Think I covered all the changes you mentioned, hopefully. Thanks a lot for the review. If you could be so kind to take a look and see what you think while I figure out how to sort the CLA issue. |
t8m
added
branch: master
|
@levitte Do you have further comments for this PR please? Thanks a lot for all the comments. |
paulidale
approved these changes
Nov 22, 2022
paulidale
added
approval: review pending
|
This needs to be rebased on top of fresh master branch. |
an assembler for Windows on Arm builds and also clang-cl as the compiler as well. Make appropriate changes to armcap source and peralsm scripts.
everton1984
force-pushed
the
clclang_cl
branch
from
3c8d25d
to
449bbab
Compare
openssl-machine
removed
the
hold: cla required
|
@t8m Just rebased and retested. Thanks. |
t8m
approved these changes
Nov 22, 2022
|
@paulidale still OK? |
paulidale
approved these changes
Nov 23, 2022
paulidale
added
approval: done
openssl-machine
added
approval: ready to merge
|
This pull request is ready to merge |
|
Merged to master and 3.1. Thank you. |
openssl-machine
pushed a commit
that referenced
this pull request
Nov 24, 2022
an assembler for Windows on Arm builds and also clang-cl as the compiler as well. Make appropriate changes to armcap source and peralsm scripts. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from #19523)
openssl-machine
pushed a commit
that referenced
this pull request
Nov 24, 2022
an assembler for Windows on Arm builds and also clang-cl as the compiler as well. Make appropriate changes to armcap source and peralsm scripts. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from #19523) (cherry picked from commit b863e1e)
beldmit
pushed a commit
to beldmit/openssl
that referenced
this pull request
Dec 26, 2022
an assembler for Windows on Arm builds and also clang-cl as the compiler as well. Make appropriate changes to armcap source and peralsm scripts. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Hugo Landau <hlandau@openssl.org> (Merged from openssl#19523)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently it is not possible to use the assembler files for Windows on Arm as there is no NASM for aarch64. This patch makes the appropriate changes to use
clang-clas an assembler along with the possibility of also using it as a compiler. Forcibly adding__ASSEMBLER__was required as cl does not add it by itself.