diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 12:37:21 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
| commit | b19fe714e9d4c50dcb33259346f06d3924b337b7 (patch) | |
| tree | 36810ed3f2240d61cd2ebff6d3367da9290b8772 /Configurations/10-main.conf | |
| parent | 0ee7b9fe7f9afadcf566d740e01043faeaa9476e (diff) | |
Configure: add mechanism to specify uplink target architecture
As preparation for moving uplink file specs to build.info files, we
must make sure there is still some base information to help select the
correct files.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'Configurations/10-main.conf')
| -rw-r--r-- | Configurations/10-main.conf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 52b23ce4a3..6a8d839713 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1280,6 +1280,7 @@ my %targets = ( sys_id => "WIN64I", bn_asm_src => sub { return undef unless @_; my $r=join(" ",@_); $r=~s|bn-ia64.s|bn_asm.c|; $r; }, + uplink_arch => 'ia64', perlasm_scheme => "ias", multilib => "-ia64", }, @@ -1293,6 +1294,7 @@ my %targets = ( sys_id => "WIN64A", bn_asm_src => sub { return undef unless @_; my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; }, + uplink_arch => 'x86_64', perlasm_scheme => "auto", multilib => "-x64", }, @@ -1306,6 +1308,7 @@ my %targets = ( asflags => sub { vc_win32_info()->{asflags} }, sys_id => "WIN32", bn_ops => add("BN_LLONG"), + uplink_arch => 'x86', perlasm_scheme => sub { vc_win32_info()->{perlasm_scheme} }, # "WOW" stands for "Windows on Windows", and "VC-WOW" engages # some installation path heuristics in windows-makefile.tmpl... @@ -1387,15 +1390,16 @@ my %targets = ( cflags => "-m32", sys_id => "MINGW32", bn_ops => add("BN_LLONG"), + uplink_arch => 'x86', perlasm_scheme => "coff", shared_rcflag => "--target=pe-i386", multilib => "", }, "mingw64" => { - # As for OPENSSL_USE_APPLINK. Applink makes it possible to use + # As for uplink_arch. Applink makes it possible to use # .dll compiled with one compiler with application compiled with # another compiler. It's possible to engage Applink support in - # mingw64 build, but it's not done, because till mingw64 + # mingw64 build, but it's not done, because until mingw64 # supports structured exception handling, one can't seriously # consider its binaries for using with non-mingw64 run-time # environment. And as mingw64 is always consistent with itself, @@ -1404,6 +1408,7 @@ my %targets = ( cflags => "-m64", sys_id => "MINGW64", bn_ops => add("SIXTY_FOUR_BIT"), + uplink_arch => undef, perlasm_scheme => "mingw64", shared_rcflag => "--target=pe-x86-64", multilib => "64", |