X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configurations%2F00-base-templates.conf;h=8bb4de75f90ce7099914702c18af8402d2146b3a;hp=03a1af9ea436f972df2463318021edd345c0f369;hb=b7c9aa645e4eddf5d198d2b20f1c6a74ab96f98e;hpb=9fe2bb77c40f5fd3624b30f1b0c3cd8b791ca615

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 03a1af9ea4..8bb4de75f9 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -1,7 +1,16 @@
+# -*- Mode: perl -*-
 %targets=(
-    BASE => {
+    DEFAULTS => {
 	template	=> 1,
+
+	cflags		=> "",
+	defines		=> [],
+	thread_scheme	=> "(unknown)", # Assume we don't know
+	thread_defines	=> [],
+
+	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",
@@ -22,10 +31,105 @@
 	unistd		=> "<unistd.h>",
 	shared_target	=> "",
 	shared_cflag	=> "",
+	shared_defines	=> [],
 	shared_ldflag	=> "",
+	shared_rcflag	=> "",
 	shared_extension	=> "",
-	build_scheme	=> "unixmake",
-	build_file      => "Makefile",
+
+        build_scheme    => [ "unified", "unix" ],
+        build_file      => "Makefile",
+    },
+
+    BASE_common => {
+	template	=> 1,
+	defines		=>
+	    sub {
+                my @defs = ();
+                push @defs, "ZLIB" unless $disabled{zlib};
+                push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"};
+                return [ @defs ];
+            },
+    },
+
+    BASE_unix => {
+        inherit_from    => [ "BASE_common" ],
+        template        => 1,
+
+        ex_libs         =>
+            sub {
+                unless ($disabled{zlib}) {
+                    if (defined($disabled{"zlib-dynamic"})) {
+                        if (defined($withargs{zlib_lib})) {
+                            return "-L".$withargs{zlib_lib}." -lz";
+                        } else {
+                            return "-lz";
+                        }
+                    }
+                }
+                return (); },
+
+        build_scheme    => [ "unified", "unix" ],
+        build_file      => "Makefile",
+    },
+
+    BASE_Windows => {
+        inherit_from    => [ "BASE_common" ],
+        template        => 1,
+
+        ex_libs         =>
+            sub {
+                unless ($disabled{zlib}) {
+                    if (defined($disabled{"zlib-dynamic"})) {
+                        return $withargs{zlib_lib};
+                    }
+                }
+                return (); },
+
+        ld              => "link",
+        lflags          => "/nologo",
+        loutflag        => "/out:",
+        ar              => "lib",
+        arflags         => "/nologo",
+        aroutflag       => "/out:",
+        rc               => "rc",
+        rcoutflag        => "/fo",
+        mt              => "mt",
+        mtflags         => "-nologo",
+        mtinflag        => "-manifest ",
+        mtoutflag       => "-outputresource:",
+
+        build_file      => "makefile",
+        build_scheme    => [ "unified", "windows" ],
+    },
+
+    BASE_VMS => {
+        inherit_from    => [ "BASE_common" ],
+        template        => 1,
+
+        build_file       => "descrip.mms",
+        build_scheme     => [ "unified", "VMS" ],
+    },
+
+    uplink_common => {
+	template	=> 1,
+	apps_aux_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 => {
@@ -46,6 +150,8 @@
 	cmll_asm_src	=> "cmll-x86.s",
 	modes_asm_src	=> "ghash-x86.s",
 	padlock_asm_src	=> "e_padlock-x86.s",
+	chacha_asm_src	=> "chacha-x86.s",
+	poly1305_asm_src=> "poly1305-x86.s",
     },
     x86_elf_asm => {
 	template	=> 1,
@@ -65,6 +171,8 @@
 	cmll_asm_src    => "cmll-x86_64.s cmll_misc.c",
 	modes_asm_src   => "ghash-x86_64.s aesni-gcm-x86_64.s",
 	padlock_asm_src => "e_padlock-x86_64.s",
+	chacha_asm_src	=> "chacha-x86_64.s",
+	poly1305_asm_src=> "poly1305-x86_64.s",
     },
     ia64_asm => {
 	template	=> 1,
@@ -73,82 +181,89 @@
 	aes_asm_src     => "aes_core.c aes_cbc.c aes-ia64.s",
 	md5_asm_src     => "md5-ia64.s",
 	sha1_asm_src    => "sha1-ia64.s sha256-ia64.s sha512-ia64.s",
-	rc4_asm_src     => "rc4-ia64.s rc4_skey.s",
+	rc4_asm_src     => "rc4-ia64.s rc4_skey.c",
 	modes_asm_src   => "ghash-ia64.s",
 	perlasm_scheme	=> "void"
     },
     sparcv9_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "sparcv9cap.s sparccpuid.s",
-	bn_asm_src      => "bn-sparcv9.s sparcv9-mont.s sparcv9a-mont.s vis3-mont.s sparct4-mont.s sparcv9-gf2m.s",
-        ec_asm_src      => "ecp_nistz256.c ecp_nistz256-sparcv9.s",
-	des_asm_src     => "des_enc-sparc.s fcrypt_b.c dest4-sparcv9.s",
-	aes_asm_src     => "aes_core.c aes_cbc.c aes-sparcv9.s aest4-sparcv9.s",
-	md5_asm_src     => "md5-sparcv9.s",
-	sha1_asm_src    => "sha1-sparcv9.s sha256-sparcv9.s sha512-sparcv9.s",
-	cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.s",
-	modes_asm_src   => "ghash-sparcv9.s",
-	poly1305_obj	=> "poly1305-sparcv9.S",
+	cpuid_asm_src   => "sparcv9cap.c sparccpuid.S",
+	bn_asm_src      => "asm/sparcv8plus.S sparcv9-mont.S sparcv9a-mont.S vis3-mont.S sparct4-mont.S sparcv9-gf2m.S",
+	ec_asm_src      => "ecp_nistz256.c ecp_nistz256-sparcv9.S",
+	des_asm_src     => "des_enc-sparc.S fcrypt_b.c dest4-sparcv9.S",
+	aes_asm_src     => "aes_core.c aes_cbc.c aes-sparcv9.S aest4-sparcv9.S aesfx-sparcv9.S",
+	md5_asm_src     => "md5-sparcv9.S",
+	sha1_asm_src    => "sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S",
+	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      => "sparcv8.s",
-	des_asm_src     => "des_enc-sparc.s fcrypt_b.c",
+	bn_asm_src      => "asm/sparcv8.S",
+	des_asm_src     => "des_enc-sparc.S fcrypt_b.c",
 	perlasm_scheme	=> "void"
     },
     alpha_asm => {
 	template	=> 1,
 	cpuid_asm_src   => "alphacpuid.s",
-	bn_asm_src      => "bn_asm.s alpha-mont.s",
-	sha1_asm_src    => "sha1-alpha.s",
-	modes_asm_src   => "ghash-alpha.s",
+	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,
-	bn_asm_src      => "bn-mips.s mips-mont.s",
+	bn_asm_src      => "bn-mips.S mips-mont.S",
 	aes_asm_src     => "aes_cbc.c aes-mips.S",
 	sha1_asm_src    => "sha1-mips.S sha256-mips.S",
     },
     mips64_asm => {
 	inherit_from	=> [ "mips32_asm" ],
 	template	=> 1,
-	sha1_asm_src    => add("sha512-mips.S")
+	sha1_asm_src    => add("sha512-mips.S"),
+	poly1305_asm_src=> "poly1305-mips.S",
     },
     s390x_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "s390xcap.s s390xcpuid.s",
-	bn_asm_src      => "bn-s390x.s s390x-mont.s s390x-gf2m.s",
+	cpuid_asm_src   => "s390xcap.c s390xcpuid.S",
+	bn_asm_src      => "asm/s390x.S s390x-mont.S s390x-gf2m.s",
 	aes_asm_src     => "aes-s390x.S aes-ctr.fake aes-xts.fake",
-	sha1_asm_src    => "sha1-s390x.s sha256-s390x.s sha512-s390x.s",
+	sha1_asm_src    => "sha1-s390x.S sha256-s390x.S sha512-s390x.S",
 	rc4_asm_src     => "rc4-s390x.s",
-	modes_asm_src   => "ghash-s390x.s",
+	modes_asm_src   => "ghash-s390x.S",
+	chacha_asm_src  => "chacha-s390x.S",
+	poly1305_asm_src=> "poly1305-s390x.S",
     },
     armv4_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "armcap.s armv4cpuid.s",
-	bn_asm_src      => "bn_asm.s armv4-mont.s armv4-gf2m.s",
-	ec_asm_src      => "ecp_nistz256.c ecp_nistz256-armv4.s",
+	cpuid_asm_src   => "armcap.c armv4cpuid.S",
+	bn_asm_src      => "bn_asm.c armv4-mont.S armv4-gf2m.S",
+	ec_asm_src      => "ecp_nistz256.c ecp_nistz256-armv4.S",
 	aes_asm_src     => "aes_cbc.c aes-armv4.S bsaes-armv7.S aesv8-armx.S",
-	sha1_asm_src    => "sha1-armv4-large.s sha256-armv4.s sha512-armv4.s",
-	modes_asm_src   => "ghash-armv4.s ghashv8-armx.s",
+	sha1_asm_src    => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S",
+	modes_asm_src   => "ghash-armv4.S ghashv8-armx.S",
+	chacha_asm_src  => "chacha-armv4.S",
+	poly1305_asm_src=> "poly1305-armv4.S", 
 	perlasm_scheme	=> "void"
     },
     aarch64_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "armcap.s arm64cpuid.s mem_clr.s",
-	ec_asm_src      => "ecp_nistz256.c ecp_nistz256-armv8.s",
-	bn_asm_src      => "bn_asm.s armv8-mont.s",
-	aes_asm_src     => "aes_core.s aes_cbc.s aesv8-armx.s vpaes-armv8.s",
-	sha1_asm_src    => "sha1-armv8.s sha256-armv8.s sha512-armv8.s",
-	modes_asm_src   => "ghashv8-armx.s",
+	cpuid_asm_src   => "armcap.c arm64cpuid.S",
+	ec_asm_src      => "ecp_nistz256.c ecp_nistz256-armv8.S",
+	bn_asm_src      => "bn_asm.c armv8-mont.S",
+	aes_asm_src     => "aes_core.c aes_cbc.c aesv8-armx.S vpaes-armv8.S",
+	sha1_asm_src    => "sha1-armv8.S sha256-armv8.S sha512-armv8.S",
+	modes_asm_src   => "ghashv8-armx.S",
+	chacha_asm_src  => "chacha-armv8.S",
+	poly1305_asm_src=> "poly1305-armv8.S",
     },
     parisc11_asm => {
 	template	=> 1,
 	cpuid_asm_src   => "pariscid.s",
-	bn_asm_src      => "bn_asm.s parisc-mont.s",
+	bn_asm_src      => "bn_asm.c parisc-mont.s",
 	aes_asm_src     => "aes_core.c aes_cbc.c aes-parisc.s",
 	sha1_asm_src    => "sha1-parisc.s sha256-parisc.s sha512-parisc.s",
 	rc4_asm_src     => "rc4-parisc.s",
@@ -160,16 +275,20 @@
 	inherit_from	=> [ "parisc11_asm" ],
 	perlasm_scheme	=> "64",
     },
-    ppc64_asm => {
+    ppc32_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "ppccpuid.s ppccap.s",
+	cpuid_asm_src   => "ppccpuid.s ppccap.c",
 	bn_asm_src      => "bn-ppc.s ppc-mont.s ppc64-mont.s",
 	aes_asm_src     => "aes_core.c aes_cbc.c aes-ppc.s vpaes-ppc.s aesp8-ppc.s",
 	sha1_asm_src    => "sha1-ppc.s sha256-ppc.s sha512-ppc.s sha256p8-ppc.s sha512p8-ppc.s",
 	modes_asm_src   => "ghashp8-ppc.s",
+	chacha_asm_src	=> "chacha-ppc.s",
+	poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s",
     },
-    ppc32_asm => {
-	inherit_from	=> [ "ppc64_asm" ],
-	template	=> 1
+    ppc64_asm => {
+	inherit_from	=> [ "ppc32_asm" ],
+	template	=> 1,
+	ec_asm_src	=> "ecp_nistz256.c ecp_nistz256-ppc64.s",
+
     },
 );