X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=Configurations%2F00-base-templates.conf;h=515cf00e20af867a67ee6deeeeffd40599e32c47;hb=8e89e85f556f549f05d3b49f5408a217ac5e3700;hp=3424f1208920c5d2cbbff318a3232437ff1ca955;hpb=d2b2221a04053578911d34a45026543e4c39ce0c;p=openssl.git

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 3424f12089..515cf00e20 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -5,11 +5,7 @@
 
 	cflags		=> "",
 	defines		=> [],
-	debug_cflags	=> "",
-	debug_defines	=> [],
-	release_cflags	=> "",
-	release_defines => [],
-	thread_cflags	=> "",
+	thread_scheme	=> "(unknown)", # Assume we don't know
 	thread_defines	=> [],
 
 	apps_aux_src	=> "",
@@ -40,18 +36,39 @@
 	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,
 
-        build_scheme    => "unixmake",
+        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",
     },
 
@@ -59,7 +76,24 @@
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
-        build_scheme    => [ "mk1mf" ],
+        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:",
+
+        build_file      => "makefile",
+        build_scheme    => [ "unified", "windows" ],
     },
 
     BASE_VMS => {
@@ -74,7 +108,7 @@
 	template	=> 1,
 	apps_aux_src	=> add("../ms/applink.c"),
 	uplink_aux_src	=> add("../ms/uplink.c"),
-	shared_defines	=> add("OPENSSL_USE_APPLINK", { separator => undef }),
+	defines		=> add("OPENSSL_USE_APPLINK"),
     },
     x86_uplink => {
 	inherit_from	=> [ "uplink_common" ],
@@ -148,14 +182,14 @@
     sparcv9_asm => {
 	template	=> 1,
 	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",
+	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",
+	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",
+	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"
     },
@@ -169,9 +203,9 @@
     alpha_asm => {
 	template	=> 1,
 	cpuid_asm_src   => "alphacpuid.s",
-	bn_asm_src      => "bn_asm.c 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 => {
@@ -183,11 +217,12 @@
     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.c s390xcpuid.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",
@@ -210,7 +245,7 @@
     },
     aarch64_asm => {
 	template	=> 1,
-	cpuid_asm_src   => "armcap.c arm64cpuid.S mem_clr.c",
+	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",