X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configurations%2F00-base-templates.conf;h=08782c6842f3dd191885b2764fd52be316ff63f1;hp=c92d640c85b08b4464ae3588ed0cdc4878be8dc5;hb=e6f98ae404344e4aff55c209dc0f91d76e69fb27;hpb=df4439186fb70ce72668d472943dbcd057df8f30

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index c92d640c85..08782c6842 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",
@@ -215,7 +190,6 @@ my %targets=(
     x86_elf_asm => {
 	template	=> 1,
 	inherit_from	=> [ "x86_asm" ],
-	perlasm_scheme	=> "elf"
     },
     x86_64_asm => {
 	template	=> 1,
@@ -241,7 +215,8 @@ my %targets=(
 	aes_asm_src     => "aes_core.c aes_cbc.c aes-ia64.s",
 	sha1_asm_src    => "sha1-ia64.s sha256-ia64.s sha512-ia64.s",
 	modes_asm_src   => "ghash-ia64.s",
-	perlasm_scheme	=> "void"
+	chacha_asm_src  => "chacha-ia64.S",
+	poly1305_asm_src=> "asm/poly1305-ia64.S",
     },
     sparcv9_asm => {
 	template	=> 1,
@@ -255,14 +230,12 @@ my %targets=(
 	cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S",
 	modes_asm_src   => "ghash-sparcv9.S",
 	poly1305_asm_src=> "poly1305-sparcv9.S",
-	perlasm_scheme	=> "void"
     },
     sparcv8_asm => {
 	template	=> 1,
 	cpuid_asm_src   => "",
 	bn_asm_src      => "asm/sparcv8.S",
 	des_asm_src     => "des_enc-sparc.S fcrypt_b.c",
-	perlasm_scheme	=> "void"
     },
     alpha_asm => {
 	template	=> 1,
@@ -270,7 +243,6 @@ my %targets=(
 	bn_asm_src      => "bn_asm.c alpha-mont.S",
 	sha1_asm_src    => "sha1-alpha.S",
 	modes_asm_src   => "ghash-alpha.S",
-	perlasm_scheme	=> "void"
     },
     mips32_asm => {
 	template	=> 1,
@@ -307,7 +279,6 @@ my %targets=(
 	chacha_asm_src  => "chacha-armv4.S",
 	poly1305_asm_src=> "poly1305-armv4.S",
 	keccak1600_asm_src	=> "keccak1600-armv4.S",
-	perlasm_scheme	=> "void"
     },
     aarch64_asm => {
 	template	=> 1,
@@ -329,12 +300,10 @@ my %targets=(
 	sha1_asm_src    => "sha1-parisc.s sha256-parisc.s sha512-parisc.s",
 	rc4_asm_src     => "rc4-parisc.s",
 	modes_asm_src   => "ghash-parisc.s",
-	perlasm_scheme	=> "32"
     },
     parisc20_64_asm => {
 	template	=> 1,
 	inherit_from	=> [ "parisc11_asm" ],
-	perlasm_scheme	=> "64",
     },
     ppc32_asm => {
 	template	=> 1,