diff options
author | Richard Levitte <levitte@openssl.org> | 2019-06-16 12:56:21 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
commit | 989b2ad786ee43438bbb8b33f857ba0ce6e10082 (patch) | |
tree | c151998c5fa3114d713ec4b6e649502f9cfb3dcc /Configurations | |
parent | b19fe714e9d4c50dcb33259346f06d3924b337b7 (diff) |
Move uplink file information to build.info files
This file information was hidden in config target files, when they
should really be part of build.info like any other file we build
from. With build.info variables, the task became much easier.
We take the opportunity to move apps_init_src and apps_aux_src to
apps/build.info as well, and to clean up apps/build.info.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/00-base-templates.conf | 25 | ||||
-rw-r--r-- | Configurations/10-main.conf | 18 | ||||
-rw-r--r-- | Configurations/50-masm.conf | 3 | ||||
-rw-r--r-- | Configurations/README | 8 |
4 files changed, 6 insertions, 48 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 20298c25dd..a6856d5ed5 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -14,10 +14,7 @@ my %targets=( thread_scheme => "(unknown)", # Assume we don't know thread_defines => [], - apps_aux_src => "", - apps_init_src => "", cpuid_asm_src => "mem_clr.c", - uplink_aux_src => "", bn_asm_src => "bn_asm.c", ec_asm_src => "", des_asm_src => "des_enc.c fcrypt_b.c", @@ -169,28 +166,6 @@ my %targets=( perl_platform => 'VMS', }, - uplink_common => { - template => 1, - apps_init_src => add("../ms/applink.c"), - uplink_aux_src => add("../ms/uplink.c"), - defines => add("OPENSSL_USE_APPLINK"), - }, - x86_uplink => { - inherit_from => [ "uplink_common" ], - template => 1, - uplink_aux_src => add("uplink-x86.s"), - }, - x86_64_uplink => { - inherit_from => [ "uplink_common" ], - template => 1, - uplink_aux_src => add("uplink-x86_64.s"), - }, - ia64_uplink => { - inherit_from => [ "uplink_common" ], - template => 1, - uplink_aux_src => add("uplink-ia64.s"), - }, - x86_asm => { template => 1, cpuid_asm_src => "x86cpuid.s", diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 6a8d839713..8d52aa1650 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1216,7 +1216,6 @@ my %targets = ( shared_target => "win-shared", # meaningless except it gives Configure a hint thread_scheme => "winthreads", dso_scheme => "win32", - apps_aux_src => add("win32_init.c"), bn_ops => "EXPORT_VAR_AS_FN", perl_platform => 'Windows::MSVC', # additional parameter to build_scheme denotes install-path "flavour" @@ -1272,8 +1271,7 @@ my %targets = ( bn_ops => add("SIXTY_FOUR_BIT"), }, "VC-WIN64I" => { - inherit_from => [ "VC-WIN64-common", asm("ia64_asm"), - sub { $disabled{uplink} ? () : "ia64_uplink" } ], + inherit_from => [ "VC-WIN64-common", asm("ia64_asm") ], AS => "ias", ASFLAGS => "-d debug", asoutflag => "-o ", @@ -1285,8 +1283,7 @@ my %targets = ( multilib => "-ia64", }, "VC-WIN64A" => { - inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), - sub { $disabled{uplink} ? () : "x86_64_uplink" } ], + inherit_from => [ "VC-WIN64-common", asm("x86_64_asm") ], AS => sub { vc_win64a_info()->{AS} }, ASFLAGS => sub { vc_win64a_info()->{ASFLAGS} }, asoutflag => sub { vc_win64a_info()->{asoutflag} }, @@ -1299,8 +1296,7 @@ my %targets = ( multilib => "-x64", }, "VC-WIN32" => { - inherit_from => [ "VC-noCE-common", asm("x86_asm"), - sub { $disabled{uplink} ? () : "uplink_common" } ], + inherit_from => [ "VC-noCE-common", asm("x86_asm") ], CFLAGS => add("/WX"), AS => sub { vc_win32_info()->{AS} }, ASFLAGS => sub { vc_win32_info()->{ASFLAGS} }, @@ -1308,7 +1304,7 @@ my %targets = ( asflags => sub { vc_win32_info()->{asflags} }, sys_id => "WIN32", bn_ops => add("BN_LLONG"), - uplink_arch => 'x86', + uplink_arch => 'common', 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... @@ -1379,13 +1375,11 @@ my %targets = ( shared_target => "mingw-shared", shared_cppflags => add("_WINDLL"), shared_ldflag => "-static-libgcc", - apps_aux_src => add("win32_init.c"), perl_platform => 'mingw', }, "mingw" => { - inherit_from => [ "mingw-common", asm("x86_asm"), - sub { $disabled{uplink} ? () : "x86_uplink" } ], + inherit_from => [ "mingw-common", asm("x86_asm") ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), cflags => "-m32", sys_id => "MINGW32", @@ -1730,8 +1724,6 @@ my %targets = ( disable => add('pinshared'), - apps_aux_src => "vms_term_sock.c vms_decc_argv.c", - apps_init_src => "vms_decc_init.c", }, # From HELP CC/POINTER_SIZE: diff --git a/Configurations/50-masm.conf b/Configurations/50-masm.conf index 345a2402ef..ae7a9b7fc4 100644 --- a/Configurations/50-masm.conf +++ b/Configurations/50-masm.conf @@ -9,8 +9,7 @@ my %targets = ( "VC-WIN64A-masm" => { - inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), - sub { $disabled{shared} ? () : "x86_64_uplink" } ], + inherit_from => [ "VC-WIN64-common", asm("x86_64_asm") ], AS => "ml64", ASFLAGS => "/nologo /Zi", asoutflag => "/Fo", diff --git a/Configurations/README b/Configurations/README index 9d7c67d53c..72eb2b3215 100644 --- a/Configurations/README +++ b/Configurations/README @@ -238,14 +238,6 @@ In each table entry, the following keys are significant: export vars as accessor functions. - apps_aux_src => Extra source to build apps/openssl and other - apps, as needed by the target and that can be - collected in a library. - apps_init_src => Init source to build apps/openssl and other - apps, as needed by the target. This code - cannot be placed in a library, as the rest - of the code isn't expected to link to it - explicitly. cpuid_asm_src => assembler implementation of cpuid code as well as OPENSSL_cleanse(). Default to mem_clr.c |