diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-02 09:34:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-02 14:45:02 +0100 |
| commit | b756967d28f2ee726d947ca7a6e1075df616b300 (patch) | |
| tree | 5badb5e0012ebc534e8b2c900dd7ee3ef5af6429 /Configurations | |
| parent | dc22d6b37e8058a4334e6f98932c2623cd3d8d0d (diff) | |
| download | openssl-b756967d28f2ee726d947ca7a6e1075df616b300.zip openssl-b756967d28f2ee726d947ca7a6e1075df616b300.tar.gz openssl-b756967d28f2ee726d947ca7a6e1075df616b300.tar.bz2 | |
Make uplink auxiliary source separate from cpuid source
There are cases, for example when configuring no-asm, that the added
uplink source files got in the way of the cpuid ones. The best way to
solve this is to separate the two.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 7a20867..4251a6c 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -14,6 +14,7 @@ apps_aux_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", @@ -45,23 +46,23 @@ uplink_common => { template => 1, apps_aux_src => add("../ms/applink.c"), - cpuid_asm_src => add("../ms/uplink.c"), + uplink_aux_src => add("../ms/uplink.c"), shared_defines => add("OPENSSL_USE_APPLINK", { separator => undef }), }, x86_uplink => { inherit_from => [ "uplink_common" ], template => 1, - cpuid_asm_src => add("uplink-x86.s"), + uplink_aux_src => add("uplink-x86.s"), }, x86_64_uplink => { inherit_from => [ "uplink_common" ], template => 1, - cpuid_asm_src => add("uplink-x86_64.s"), + uplink_aux_src => add("uplink-x86_64.s"), }, ia64_uplink => { inherit_from => [ "uplink_common" ], template => 1, - cpuid_asm_src => add("uplink-ia64.s"), + uplink_aux_src => add("uplink-ia64.s"), }, x86_asm => { |