diff options
| author | Everton Constantino <everton.constantino@linaro.org> | 2022-10-27 15:07:48 -0300 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2022-11-24 06:37:39 +0000 |
| commit | 0703f3f9dff447a98cba53a06278ba8c82d466ce (patch) | |
| tree | 55edc8f452a942c2cd8f116c03353a03634e59a3 | |
| parent | bf8365842f27ebb7cbef3b24903248011b1574d9 (diff) | |
Add two new build targets to enable the possibility of using clang-cl as
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 https://github.com/openssl/openssl/pull/19523)
(cherry picked from commit b863e1e4c69068e4166bdfbbf9f04bb07991dd40)
| -rw-r--r-- | Configurations/50-win-clang-cl.conf | 35 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 | ||||
| -rw-r--r-- | crypto/armcap.c | 25 | ||||
| -rwxr-xr-x | crypto/perlasm/arm-xlate.pl | 11 |
4 files changed, 70 insertions, 3 deletions
diff --git a/Configurations/50-win-clang-cl.conf b/Configurations/50-win-clang-cl.conf new file mode 100644 index 0000000000..cfc96ef159 --- /dev/null +++ b/Configurations/50-win-clang-cl.conf @@ -0,0 +1,35 @@ +## -*- mode: perl; -*- +# Windows on Arm clang-cl targets. +# + +my %targets = ( + "VC-WIN64-CLANGASM-ARM" => { + inherit_from => [ "VC-noCE-common" ], + defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE", + "OPENSSL_SYS_WIN_CORE"), + bn_ops => "SIXTY_FOUR_BIT RC4_CHAR", + multilib => "-arm64", + asm_arch => "aarch64", + AS => "clang-cl.exe", + ASFLAGS => "/nologo /Zi", + asflags => "/c", + asoutflag => "/Fo", + perlasm_scheme => "win64", + uplink_arch => 'armv8', + }, + "VC-CLANG-WIN64-CLANGASM-ARM" => { + CC => "clang-cl", + inherit_from => [ "VC-noCE-common" ], + defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE", + "OPENSSL_SYS_WIN_CORE"), + bn_ops => "SIXTY_FOUR_BIT RC4_CHAR", + multilib => "-arm64", + asm_arch => "aarch64", + AS => "clang-cl.exe", + ASFLAGS => "/nologo /Zi", + asflags => "/c", + asoutflag => "/Fo", + perlasm_scheme => "win64", + uplink_arch => 'armv8', + }, +); diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 5d41af41bc..f9c58eae94 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -780,7 +780,7 @@ EOF } return <<"EOF"; $target: "$gen0" $deps - \$(CPP) $incs $cppflags $defs "$gen0" > \$@.i + \$(CPP) /D__ASSEMBLER__ $incs $cppflags $defs "$gen0" > \$@.i move /Y \$@.i \$@ EOF } elsif ($gen0 =~ m|^.*\.in$|) { diff --git a/crypto/armcap.c b/crypto/armcap.c index 0aa11baed4..a43f17304b 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -17,15 +17,36 @@ #include <sys/sysctl.h> #endif #include "internal/cryptlib.h" +#ifndef _WIN32 #include <unistd.h> - +#else +#include <windows.h> +#endif #include "arm_arch.h" unsigned int OPENSSL_armcap_P = 0; unsigned int OPENSSL_arm_midr = 0; unsigned int OPENSSL_armv8_rsa_neonized = 0; -#if __ARM_MAX_ARCH__<7 +#ifdef _WIN32 +void OPENSSL_cpuid_setup(void) +{ + OPENSSL_armcap_P |= ARMV7_NEON; + OPENSSL_armv8_rsa_neonized = 1; + if (IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE)) { + // These are all covered by one call in Windows + OPENSSL_armcap_P |= ARMV8_AES; + OPENSSL_armcap_P |= ARMV8_PMULL; + OPENSSL_armcap_P |= ARMV8_SHA1; + OPENSSL_armcap_P |= ARMV8_SHA256; + } +} + +uint32_t OPENSSL_rdtsc(void) +{ + return 0; +} +#elif __ARM_MAX_ARCH__<7 void OPENSSL_cpuid_setup(void) { } diff --git a/crypto/perlasm/arm-xlate.pl b/crypto/perlasm/arm-xlate.pl index a90885905c..df10ddc7fa 100755 --- a/crypto/perlasm/arm-xlate.pl +++ b/crypto/perlasm/arm-xlate.pl @@ -22,6 +22,7 @@ my $dotinlocallabels=($flavour=~/linux/)?1:0; ################################################################ my $arch = sub { if ($flavour =~ /linux/) { ".arch\t".join(',',@_); } + elsif ($flavour =~ /win64/) { ".arch\t".join(',',@_); } else { ""; } }; my $fpu = sub { @@ -37,6 +38,7 @@ my $rodata = sub { }; my $hidden = sub { if ($flavour =~ /ios/) { ".private_extern\t".join(',',@_); } + elsif ($flavour =~ /win64/) { ""; } else { ".hidden\t".join(',',@_); } }; my $comm = sub { @@ -85,6 +87,15 @@ my $type = sub { "#endif"; } } + elsif ($flavour =~ /win64/) { if (join(',',@_) =~ /(\w+),%function/) { + # See https://sourceware.org/binutils/docs/as/Pseudo-Ops.html + # Per https://docs.microsoft.com/en-us/windows/win32/debug/pe-format#coff-symbol-table, + # the type for functions is 0x20, or 32. + ".def $1\n". + " .type 32\n". + ".endef"; + } + } else { ""; } }; my $size = sub { |